packages: gjs/gjs.spec, gjs/gjs-rpath.patch (NEW) - 0.7.4 - Fix path to lib...

[aredridel]

Author: aredridel                    Date: Fri Oct 15 05:14:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.7.4
- Fix path to libmozjs.so, since it's in /usr/lib/xulrunner/

---- Files affected:
packages/gjs:
   gjs.spec (1.9 -> 1.10) , gjs-rpath.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gjs/gjs.spec
diff -u packages/gjs/gjs.spec:1.9 packages/gjs/gjs.spec:1.10
--- packages/gjs/gjs.spec:1.9	Thu Jul 22 23:56:08 2010
+++ packages/gjs/gjs.spec	Fri Oct 15 07:14:38 2010
@@ -2,12 +2,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
@@ -47,6 +48,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -89,7 +91,7 @@
 %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
@@ -116,6 +118,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/10/15 05:14:38  aredridel
+- 0.7.4
+- Fix path to libmozjs.so, since it's in /usr/lib/xulrunner/
+
 Revision 1.9  2010/07/22 21:56:08  patrys
 - 0.7.1
 

================================================================
Index: packages/gjs/gjs-rpath.patch
diff -u /dev/null packages/gjs/gjs-rpath.patch:1.1
--- /dev/null	Fri Oct 15 07:14:44 2010
+++ packages/gjs/gjs-rpath.patch	Fri Oct 15 07:14:38 2010
@@ -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	\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gjs/gjs.spec?r1=1.9&r2=1.10&f=u