Den 20:16 16. februar 2012 skrev Jeff Johnson <j...@rpm5.org> følgende: > RPM Package Manager, CVS Repository > http://rpm5.org/cvs/ > ____________________________________________________________________________ > > Server: rpm5.org Name: Jeff Johnson > Root: /v/rpm/cvs Email: j...@rpm5.org > Module: rpm Date: 16-Feb-2012 20:16:11 > Branch: rpm-5_4 Handle: 2012021619161001 > > Modified files: (Branch: rpm-5_4) > rpm CHANGES Makefile.am > rpm/scripts Makefile.am > > Log: > - autofu: make peace with automake-1.11.2. > > Summary: > Revision Changes Path > 1.3501.2.191+1 -0 rpm/CHANGES > 2.263.2.6 +3 -2 rpm/Makefile.am > 1.75.2.12 +3 -2 rpm/scripts/Makefile.am > ____________________________________________________________________________ > > patch -p0 <<'@@ .' > Index: rpm/CHANGES > ============================================================================ > $ cvs diff -u -r1.3501.2.190 -r1.3501.2.191 CHANGES > --- rpm/CHANGES 15 Feb 2012 20:35:04 -0000 1.3501.2.190 > +++ rpm/CHANGES 16 Feb 2012 19:16:10 -0000 1.3501.2.191 > @@ -1,4 +1,5 @@ > 5.4.4 -> 5.4.5: > + - jbj: autofu: make peace with automake-1.11.2. > - jbj: hkp: default to standard SKS pool for now, todo++. > - jbj: rpmdb: upgrade to db-5.3.15, todo++. > - jbj: start rpm-5.4.5 development. > @@ . > patch -p0 <<'@@ .' > Index: rpm/Makefile.am > ============================================================================ > $ cvs diff -u -r2.263.2.5 -r2.263.2.6 Makefile.am > --- rpm/Makefile.am 9 May 2011 04:06:33 -0000 2.263.2.5 > +++ rpm/Makefile.am 16 Feb 2012 19:16:10 -0000 2.263.2.6 > @@ -104,8 +104,9 @@ > done > endif > > -pkglibdir = @USRLIBRPM@ > -pkglib_DATA = rpmpopt macros/macros macros/macros.rpmbuild cpuinfo.yaml > +# XXX automake-1.11.2 is stricter > +Xpkglibdir = @USRLIBRPM@ > +Xpkglib_DATA = rpmpopt macros/macros macros/macros.rpmbuild cpuinfo.yaml Notice how you forgot to update $(pkglibdir) below: > pkgbindir = $(pkglibdir)/bin > pkgbin_SCRIPTS = install-sh mkinstalldirs This results in files being installed into $pkglibdir, which now will be /usr/lib64/rpm.. :|
I chose to use a more "appropriate" new name as well in my fix: http://svn.mandriva.com/viewvc/packages/cooker/rpm/current/SOURCES/rpm-5.4.5-automake-1.11.2-fix.patch?view=markup -- Regards, Per Øyvind ______________________________________________________________________ RPM Package Manager http://rpm5.org Developer Communication List rpm-devel@rpm5.org
