- fix build with automake 1.11.2

Changed files:
    am-pkglib.patch -> 1.1
    poldek.spec -> 1.433

diff --git a/am-pkglib.patch b/am-pkglib.patch
new file mode 100644 (file)
index 0000000..e53cf2d
--- /dev/null
+++ b/am-pkglib.patch
@@ -0,0 +1,25 @@
+--- poldek-0.30/Makefile.am~   2012-01-26 11:30:31.000000000 +0200
++++ poldek-0.30/Makefile.am    2012-01-26 11:31:12.502250375 +0200
+@@ -21,7 +21,7 @@
+ 
+ libpoldek_la_LDFLAGS = -version-info $(libVERINFO)
+ libpoldek_la_SOURCES = \
+-        compiler.h    \       
++        compiler.h    \
+         log.c log.h      \
+         poldek_term.c poldek_term.h   \
+         minfo.c                           \
+@@ -74,10 +74,11 @@
+ 
+ LDADD_              = @INTLLIBS@
+ 
+-pkglib_SCRIPTS      = zlib-in-rpm.sh vfjuggle vfcompr vfsmb poldekuser-setup.sh
++vfscriptsdir = $(libdir)/$(PACKAGE_NAME)
++vfscripts_SCRIPTS = zlib-in-rpm.sh vfjuggle vfcompr vfsmb poldekuser-setup.sh
+ 
+ EXTRA_DIST = \
+-           $(pkglib_SCRIPTS) \
++           $(vfscripts_SCRIPTS) \
+            Makefile.extra \
+            poldek.spec \
+            package-set.sample vfjugglerc.sample \

diff --git a/poldek.spec b/poldek.spec
index f2681c29f94347ac718c42a1e231ab855f0fa2f5..2a07599e0337e0ae88661a944b46abdb723317e3 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -44,6 +44,7 @@ Patch0:               %{name}-vserver-packages.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-size-type.patch
 Patch3:                %{name}-Os-fail-workaround.patch
+Patch4:                am-pkglib.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -204,6 +205,7 @@ Moduły języka Python dla poldka.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 rm -f m4/libtool.m4 m4/lt*.m4