- workaround pkglibdir sanity checks introduced in Automake 1.11.2

- rel. 8

Changed files:
    am.patch -> 1.1
    gjs.spec -> 1.35

diff --git a/am.patch b/am.patch
new file mode 100644 (file)
index 0000000..2859d89
--- /dev/null
+++ b/am.patch
@@ -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

diff --git a/gjs.spec b/gjs.spec
index f19f2276f2ef4e1340b80dac8e3e2c810df36c9a..44b43869fa5db05b579cec51f5fdc8563e1d9046 100644 (file)
--- a/gjs.spec
+++ b/gjs.spec
@@ -2,12 +2,13 @@ Summary:      JavaScript bindings for GNOME
 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
@@ -53,6 +54,7 @@ Pliki nagłówkowe biblioteki gjs.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}