packages: gjs/gjs.spec, gjs/am.patch (NEW) - workaround pkglibdir sanity ch...

[wiget]

Author: wiget                        Date: Tue Dec 27 15:23:26 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- workaround pkglibdir sanity checks introduced in Automake 1.11.2
- rel. 8

---- Files affected:
packages/gjs:
   gjs.spec (1.34 -> 1.35) , am.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gjs/gjs.spec
diff -u packages/gjs/gjs.spec:1.34 packages/gjs/gjs.spec:1.35
--- packages/gjs/gjs.spec:1.34	Thu Dec 22 08:07:01 2011
+++ packages/gjs/gjs.spec	Tue Dec 27 16:23:21 2011
@@ -3,12 +3,13 @@
 Summary(pl.UTF-8):	Wiązania JavaScript dla GNOME
 Name:		gjs
 Version:	1.30.0
-Release:	7
+Release:	8
 License:	MIT and (MPL v1.1 / GPL v2+ / LGPL v2+)
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gjs/1.30/%{name}-%{version}.tar.xz
 # Source0-md5:	908c1c8654d141d64aac07d57de9a457
 Patch0:		%{name}-rpath.patch
+Patch1:		am.patch
 URL:		http://live.gnome.org/Gjs
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
@@ -54,6 +55,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -124,6 +126,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2011/12/27 15:23:21  wiget
+- workaround pkglibdir sanity checks introduced in Automake 1.11.2
+- rel. 8
+
 Revision 1.34  2011/12/22 07:07:01  arekm
 - release 7
 

================================================================
Index: packages/gjs/am.patch
diff -u /dev/null packages/gjs/am.patch:1.1
--- /dev/null	Tue Dec 27 16:23:26 2011
+++ packages/gjs/am.patch	Tue Dec 27 16:23:21 2011
@@ -0,0 +1,12 @@
+--- gjs-1.30.0/Makefile.am.wiget	2011-12-27 16:13:38.169339140 +0100
++++ gjs-1.30.0/Makefile.am	2011-12-27 16:16:48.684343724 +0100
+@@ -167,7 +167,8 @@ include Makefile-gjs-dbus.am
+ include Makefile-modules.am
+ include Makefile-examples.am
+ 
+-pkglib_DATA = $(INTROSPECTION_GIRS) $(INTROSPECTION_GIRS:.gir=.typelib)
++typelibdir = $(pkglibdir)
++typelib_DATA = $(INTROSPECTION_GIRS) $(INTROSPECTION_GIRS:.gir=.typelib)
+ 
+ ########################################################################
+ bin_PROGRAMS += gjs-console
================================================================

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