packages (DEVEL): gjs/gjs-rpath.patch, gjs/gjs.spec - 1.29.17

[patrys]

Author: patrys                       Date: Thu Sep  1 20:51:49 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- 1.29.17

---- Files affected:
packages/gjs:
   gjs-rpath.patch (1.1.2.1 -> 1.1.2.2) , gjs.spec (1.25.2.1 -> 1.25.2.2) 

---- Diffs:

================================================================
Index: packages/gjs/gjs-rpath.patch
diff -u packages/gjs/gjs-rpath.patch:1.1.2.1 packages/gjs/gjs-rpath.patch:1.1.2.2
--- packages/gjs/gjs-rpath.patch:1.1.2.1	Fri Jul 29 18:33:19 2011
+++ packages/gjs/gjs-rpath.patch	Thu Sep  1 22:51:43 2011
@@ -2,20 +2,20 @@
 --- 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`
+         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=
-         fi
+-        ## 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=
+             fi

================================================================
Index: packages/gjs/gjs.spec
diff -u packages/gjs/gjs.spec:1.25.2.1 packages/gjs/gjs.spec:1.25.2.2
--- packages/gjs/gjs.spec:1.25.2.1	Fri Jul 29 18:33:19 2011
+++ packages/gjs/gjs.spec	Thu Sep  1 22:51:43 2011
@@ -2,12 +2,12 @@
 Summary:	JavaScript bindings for GNOME
 Summary(pl.UTF-8):	Wiązania JavaScript dla GNOME
 Name:		gjs
-Version:	1.29.15
+Version:	1.29.17
 Release:	1
 License:	MIT and (MPL v1.1 / GPL v2+ / LGPL v2+)
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gjs/1.29/%{name}-%{version}.tar.bz2
-# Source0-md5:	01aa4dfb422975d22a031295b9cbc299
+# Source0-md5:	3b06ff3f9f7a09b7b611d59acb606670
 Patch0:		%{name}-rpath.patch
 URL:		http://live.gnome.org/Gjs
 BuildRequires:	autoconf >= 2.61
@@ -17,7 +17,7 @@
 BuildRequires:	dbus-glib-devel
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.18.0
-BuildRequires:	gobject-introspection-devel >= 1.29.16
+BuildRequires:	gobject-introspection-devel >= 1.29.17
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
@@ -42,7 +42,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	dbus-devel
 Requires:	glib2-devel >= 1:2.16.0
-Requires:	gobject-introspection-devel >= 1.29.16
+Requires:	gobject-introspection-devel >= 1.29.17
 Requires:	xulrunner-devel
 
 %description devel
@@ -122,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25.2.2  2011/09/01 20:51:43  patrys
+- 1.29.17
+
 Revision 1.25.2.1  2011/07/29 16:33:19  patrys
 - 1.29.15
 - left introspection data unpackaged (install rule seems bogus)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gjs/gjs-rpath.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gjs/gjs.spec?r1=1.25.2.1&r2=1.25.2.2&f=u