- 0.7.4

- Fix path to libmozjs.so, since it's in /usr/lib/xulrunner/

Changed files:
    gjs-rpath.patch -> 1.1
    gjs.spec -> 1.10

diff --git a/gjs-rpath.patch b/gjs-rpath.patch
new file mode 100644 (file)
index 0000000..8477c87
--- /dev/null
+++ b/gjs-rpath.patch
@@ -0,0 +1,33 @@
+diff -ur gjs-0.7.4-o//configure.ac gjs-0.7.4/configure.ac
+--- gjs-0.7.4-o//configure.ac  2010-10-04 14:05:05.000000000 -0600
++++ gjs-0.7.4/configure.ac     2010-10-14 23:12:27.000000000 -0600
+@@ -116,14 +116,14 @@
+     FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE`
+     FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE`
+ 
+-    ## Ubuntu does not set libdir in mozilla-js.pc
++    ## PLD does not set libdir in mozilla-js.pc
+     if test x"$FIREFOX_JS_LIBDIR" = x ; then
+-       ## Ubuntu returns xulrunner-devel as the sdkdir, but for the
++       ## PLD returns xulrunner-devel as the sdkdir, but for the
+        ## libdir we want the runtime location on the target system,
+        ## so can't use -devel.
+        ## The library is in the non-devel directory also.
+        ## Don't ask me why it's in two places.
+-       FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'`
++       FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-sdk//g'`
+ 
+        if ! test -d "$FIREFOX_JS_LIBDIR" ; then
+            FIREFOX_JS_LIBDIR=
+diff -ur gjs-0.7.4-o//Makefile-gi.am gjs-0.7.4/Makefile-gi.am
+--- gjs-0.7.4-o//Makefile-gi.am        2010-09-17 06:49:48.000000000 -0600
++++ gjs-0.7.4/Makefile-gi.am   2010-10-14 23:06:07.000000000 -0600
+@@ -10,7 +10,7 @@
+         libgjs.la                     \
+         $(GJS_GI_LIBS)
+ libgjs_gi_la_LDFLAGS = \
+-      -export-symbols-regex "^[^_].*" -version-info 0:0:0 -rdynamic -no-undefined
++      -export-symbols-regex "^[^_].*" -version-info 0:0:0 -rdynamic -no-undefined -R $(FIREFOX_JS_LIBDIR)
+ 
+ nobase_gjsgiinclude_HEADERS = \
+       gi/arg.h        \

diff --git a/gjs.spec b/gjs.spec
index be368a969ad679202081b4e16862e0103a717f33..c4a083964fcf91950b24a1975f289fdc5463c1eb 100644 (file)
--- a/gjs.spec
+++ b/gjs.spec
@@ -1,12 +1,13 @@
 Summary:       JavaScript bindings for GNOME
 Summary(pl.UTF-8):     Wiązania JavaScript dla GNOME
 Name:          gjs
-Version:       0.7.1
+Version:       0.7.4
 Release:       1
 License:       MIT and (MPL v1.1 / GPL v2+ / LGPL v2+)
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gjs/0.7/%{name}-%{version}.tar.bz2
-# Source0-md5: 3235be92281ba534f86c1c481058d105
+# Source0-md5: e9205b087d0174b2440c30af9e8872b4
+Patch0:                %{name}-rpath.patch
 URL:           http://live.gnome.org/Gjs
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
@@ -46,6 +47,7 @@ Pliki nagłówkowe biblioteki gjs.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -88,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/gjs-1.0/cairoNative.so
 %attr(755,root,root) %{_libdir}/gjs-1.0/console.so
 %attr(755,root,root) %{_libdir}/gjs-1.0/dbusNative.so
-%attr(755,root,root) %{_libdir}/gjs-1.0/debugger.so
+#%attr(755,root,root) %{_libdir}/gjs-1.0/debugger.so
 %attr(755,root,root) %{_libdir}/gjs-1.0/gettextNative.so
 %attr(755,root,root) %{_libdir}/gjs-1.0/gi.so
 %attr(755,root,root) %{_libdir}/gjs-1.0/langNative.so