From 03f9004218421d04ac2a0ee3bbf8a7fca59a58fa Mon Sep 17 00:00:00 2001 From: akdengi Date: Tue, 17 Jul 2012 15:43:26 +0400 Subject: [PATCH] fix spec --- rpm.spec | 1312 +----------------------------------------------------- 1 file changed, 5 insertions(+), 1307 deletions(-) diff --git a/rpm.spec b/rpm.spec index 4900c25..c6e31d5 100644 --- a/rpm.spec +++ b/rpm.spec @@ -49,7 +49,6 @@ %define libver 5.4 %define minorver 9 %define srcver %{libver}.%{minorver} -#define prereldate 20110712 %define librpmname %mklibname rpm %{libver} %define librpmnamedevel %mklibname -d rpm @@ -60,7 +59,7 @@ Name: rpm Epoch: 1 Version: %{libver}.%{minorver} License: LGPLv2.1+ -Release: %{?prereldate:0.%{prereldate}.}7 +Release: 8 Epoch: 1 Group: System/Configuration/Packaging URL: http://rpm5.org/ @@ -352,7 +351,6 @@ BuildRequires: libxml2-devel >= 2.7.8 #BuildRequires: pkgconfig(lua) # needed by internal lua BuildRequires: expat-devel -======= Patch23: rpm-5.3.12-fix-verify-segfault.patch Patch24: rpm-5.3.12-cve-2012-0815,0060,0061.patch Patch25: rpm-5.3.12.vendor.ROSA.patch @@ -367,7 +365,6 @@ BuildRequires: neon0.27-devel rpm-%{_target_vendor}-setup-build %{?rpmsetup_vers BuildRequires: readline-devel ncurses-devel openssl-devel BuildRequires: liblzma-devel lua-devel pcre-devel acl-devel BuildRequires: magic-devel popt-devel >= 1.15 ->>>>>>> 6baaed7aaa24cbce8ef4879e057bc4f6b8aae017 %ifarch %{ix86} x86_64 ppc ppc64 ia64 BuildRequires: pkgconfig(libcpuinfo) %endif @@ -598,13 +595,10 @@ This package contains the RPM API documentation generated in HTML format. %patch5 -p1 -b .distpatt~ %patch15 -p1 -b .trigger_once~ %endif -<<<<<<< HEAD -#%%patch21 -p1 -b .loop_warnings~ -#%%patch22 -p1 -b .55810~ -#patch27 -p1 -b .mdv~ + %patch29 -p1 -b .specfile~ %patch31 -p1 -b .rpm_qa~ -#%%patch32 -p1 -b .clean~ + %patch34 -p1 -b .ordering~ %patch37 -p1 -b .drop_deps~ %patch40 -p1 -b .pc_paths~ @@ -691,9 +685,10 @@ This package contains the RPM API documentation generated in HTML format. %patch144 -p1 -b .urpm~ %patch146 -p1 -b .nosig~ %patch147 -p1 -b .disable_int_gen_dep + #required by P55, P80, P81, P94.. ./autogen.sh -======= + %patch19 -p1 -b .doxygen~ %patch20 -p1 -b .syslog~ %patch21 -p1 -b .loop_warnings~ @@ -701,7 +696,6 @@ This package contains the RPM API documentation generated in HTML format. %patch23 -p1 -b .verify-segfault~ %patch24 -p1 -b .cve-2012~ %patch25 -p1 ->>>>>>> 6baaed7aaa24cbce8ef4879e057bc4f6b8aae017 mkdir -p cpu-os-macros tar -zxf %{SOURCE3} -C cpu-os-macros @@ -1151,1301 +1145,5 @@ install -d %{buildroot}%(linux32 rpm -E %%{multiarch_includedir}) %changelog -<<<<<<< HEAD * Wed Jun 13 2012 Alexader Kazancev 1:5.4.9-2 - initial import for ROSA 2012.1 -======= -* Tue Jul 12 2011 Per Øyvind Karlsen 1:5.3.12-0.20110712.2 -+ Revision: 689772 -- revert a previous commit of mine which broke deps without distepoch (rushed) - -* Tue Jul 12 2011 Per Øyvind Karlsen 1:5.3.12-0.20110712.1 -+ Revision: 689687 -- change errors on dependency loops to warnings -- update to new cvs snapshot: - o fixes issues with upgrading packages of same EVR, but different - distepoch - o fix /usr/lib/rpm/bin/dbconvert segfaulting when no root is provided - o automatically install gstreamer.sh dep genereator - -* Wed Jul 06 2011 Per Øyvind Karlsen 1:5.3.12-0.20110625.3 -+ Revision: 689009 -- install gstreamer.sh dependency generator - -* Mon Jul 04 2011 Per Øyvind Karlsen 1:5.3.12-0.20110625.2 -+ Revision: 688659 -- add a conflicts on older beecrypt version to fix upgrade from 2009.0 -- add a conflicts on older elfutils to handle upgrade from 2009.0 - -* Sat Jun 25 2011 Per Øyvind Karlsen 1:5.3.12-0.20110625.1 -+ Revision: 687193 -- new cvs snapshot -- add a suggests on db51-utils -- fix broken %%optflags for i686-linux macros (#63517) - - + Matthew Dawkins - - added arm support for rpm5, cpuinfo doesn't support arm - -* Wed Jun 01 2011 Per Øyvind Karlsen 1:5.3.11-0.20110525.3 -+ Revision: 682280 -- add a null pointer check for nvra disttag hack, otherwise we'll easily segfault -- update javascript enabler to pass the right arguments -- come up with a better hack for querying rpmdb for nvra with disttag (ie. urpme - on plf packages with disttag should now *finally* be working properly..;) -- add buildrequires on db51-utils (required by testsuite) - -* Wed May 25 2011 Per Øyvind Karlsen 1:5.3.11-0.20110525.1 -+ Revision: 679105 -- reenable regression checks -- fix too hasty merged syslog patch (P20) -- don't package *.{a,la} files for python module -- drop '-DXP_UNIX=1' from CPPFLAGS, leftover from internal js build... -- follow s/ossp_uuid/ossp-uuid/ package name change -- update to latest cvs snapshot (for cleaning and also fixes #63318) - -* Mon May 16 2011 Per Øyvind Karlsen 1:5.3.10-0.20110422.4 -+ Revision: 675030 -- fix c++ compatibility in rpmdb.h api (P22) -- fix build of dbconvert & install it by default (P21) -- update doxygen input file paths for api docs (P20) -- workaround doxygen 1.7.4 issue blocking build (P19 from pcpa) -- fix assertion error when trying to extract archives without required perms - -* Mon May 02 2011 Per Øyvind Karlsen 1:5.3.10-0.20110422.3 -+ Revision: 662260 -- move multiarch-dispatch to main package (#63160) - - + Funda Wang - - move multiarch-dispath into main rpm package (bug#63160) - -* Mon Apr 25 2011 Funda Wang 1:5.3.10-0.20110422.2 -+ Revision: 658722 -- fix wrong path of mkmultiarch script - -* Sun Apr 24 2011 Per Øyvind Karlsen 1:5.3.10-0.20110422.1 -+ Revision: 658161 -- drop redundant %%defattr usage & buildroot cleaning at beginning of %%install -- don't load arch specific macros from rpm-mandriva-setup anymore, they've been - merged into the standard arch specific macros for rpm -- obsolete multiarch-utils -- new cvs snapshot - -* Sun Apr 10 2011 Per Øyvind Karlsen 1:5.3.9-0.20110330.7 -+ Revision: 652164 -- fix filetriggers firing multiple times hack (P19) - -* Thu Apr 07 2011 Per Øyvind Karlsen 1:5.3.9-0.20110330.6 -+ Revision: 651738 -- add proper fix for i18n descriptions from Jeff -- fix %%_arch to be canonical - -* Tue Apr 05 2011 Per Øyvind Karlsen 1:5.3.9-0.20110330.5 -+ Revision: 650797 -- fix translated descriptions not being added to packages (P18, #62979) -- add /etc/rpm/sysinfo dir - -* Fri Apr 01 2011 Per Øyvind Karlsen 1:5.3.9-0.20110330.4 -+ Revision: 649644 -- fix stupid typo that managed to sneak itself back in again to mess up db log dir -- don't ship find-provides & find-requires, we're using our own version anyways.. -- enable acl support -- drop unused expat-devel buildrequires -- s/tetex/texlive/ (pcpa) -- fix --without docs -- disable sqlite & docs build for bootstrap builds - -* Wed Mar 30 2011 Per Øyvind Karlsen 1:5.3.9-0.20110330.3 -+ Revision: 649239 -- bah, fix incorrect package name in conflicts on db5.1 - -* Wed Mar 30 2011 Per Øyvind Karlsen 1:5.3.9-0.20110330.2 -+ Revision: 649233 -- add versioned buildrequires & conflicts to ensure >= db 5.1.25 - -* Wed Mar 30 2011 Per Øyvind Karlsen 1:5.3.9-0.20110330.1 -+ Revision: 649206 -- new cvs snapshot -- add rpm-helper>rpm to _dependency_whiteout_mandriva -- fix typo messing up bdb log dir used.. -- update cvs snapshot (pulls in fix for ie. #62822 among other things) -- drop redundant --with-sqlite -- fix duplicate %%clean section (thx andrey for noticing!) -- fix mess happening while merging file trigger workaround upstream (#62865) - -* Fri Mar 25 2011 Per Øyvind Karlsen 1:5.3.9-0.20110324.1 -+ Revision: 648434 -- drop %%clean now that it's enabled by default -- enable build of augeas support -- build with uuid support -- new cvs snapshot - -* Sun Mar 06 2011 Per Øyvind Karlsen 1:5.3.9-0.20110303.2 -+ Revision: 642259 -- drop duplicates of of package first independent of distepoch (P16) - -* Thu Mar 03 2011 Per Øyvind Karlsen 1:5.3.9-0.20110303.1 -+ Revision: 641499 -- new cvs snapshot -- get rid of some compile warnings for ugly distepoch pattern hack.. - - + Funda Wang - - rebuild to obsolete old packages - -* Mon Feb 21 2011 Per Øyvind Karlsen 1:5.3.8-0.20110125.5 -+ Revision: 639230 -- work around file triggers firing multiple times and a related critical memleak -- set count in rpmmiCount() rather than rpmmiNext() for iterators with db cursor - set to reduce unnecessary overhead - -* Tue Feb 15 2011 Per Øyvind Karlsen 1:5.3.8-0.20110125.4 -+ Revision: 637879 -- accept NULL as argument for rootDir with mandriva filetriggers (#62395) -- fix issue with uninstall triggers always being run during upgrade (#62267) -- reset db cursor to NULL at end of rpmmiCount() so iterator won't break (#62279) -- drop feeble attempt to hack around disttag/distepoch issues by undefining it... - -* Thu Feb 10 2011 Per Øyvind Karlsen 1:5.3.8-0.20110125.3 -+ Revision: 637195 -- fix typo in russian translation (#62333) -- fix %%__dbi_sqlconfig typo (#62386) - -* Sat Feb 05 2011 Per Øyvind Karlsen 1:5.3.8-0.20110125.2 -+ Revision: 636294 -- revert st00pid conflicts->obsoletes change which broke upgrades... -- replace conflict on perl-RPM4 with an obsolete -- don't try adding files awaiting file triggers when --test is used (P9) - - + Funda Wang - - add python link patch - - link python module with python lib - -* Mon Jan 31 2011 Per Øyvind Karlsen 1:5.3.8-0.20110125.1 -+ Revision: 634521 -- fix problem with ignored signals causing rpmbuild to break with gnome-terminal - (fixes #62262, P7 from Theerud Lawtrakul/Jeff Johnson) ---Denne lnjoen og de som er under vil bli ignorert-- - A SOURCES/rpm-5.3.8-rpmsq-ignored-signal-return-value.patch - M SPECS/rpm.spec -- remove no longer need Requires(post) on db51-utils which sed -- replace conflicts on librpm < 5.3 with obsoletes -- fix wrong tool path macros (#62322) -- fix regression tests and enable all of them in %%check from now on -- new cvs snapshot, drop patches merged upstream -- fix regression in rpmdsCompare() patch -- ignore -mdv2011.0 (disttag/distepoch) when querying package names for now - - + Funda Wang - - really fix tool path - -* Sun Jan 23 2011 Per Øyvind Karlsen 1:5.3.8-0.20110109.11 -+ Revision: 632404 -- d'oh, missed a line in previous patch.. - -* Sun Jan 23 2011 Per Øyvind Karlsen 1:5.3.8-0.20110109.10 -+ Revision: 632396 -- replace rpmdsCompare() patch with a simpler and less intrusive for now -- if distsuffix is defined, use it for disttag (from Anssi) -- fix handling of missing values when using 'rpm' directly as well (#55810 again) -- drop bootstrap.spec to workaround bs issue.. -- fix inverted logic of %%_legacy_compat_non_pre_scripts_dont_fail -- don't do conversion in %%posttrans anymore, it will be handled by urpmi now -- change non-pre-scripts-dont-fail patch to be macro enabled -- gather all legacy compatibility hacks into legacy_compat.macros -- add back macro-enabled no-doc-conflicts patch -- always set log dir as a transaction log will always be created independent of whether setting DB_INIT_LOG or not -- add a dependency on perl-IO-String for perl-RPM (#61709) -- disable fsync call per file causing heavy performane penalties (P8, from eugeni) -- handle missing distepoch in version comparision (P7) -- increase max number of bdb locks -- don't fail package install on scriptlet failure, except for %%pre -- remove ppc macro symlink for now.. -- fix install of dependency_whiteout.macros -- fix typo -- add more dependency loops to %%depency_whiteout and move out to separate file -- use %%_dependency_whiteout to fix some dependency loops for now.. -- be sure that /var/lib/rpm/log exists before using it.. -- don't make path to rpm absolute... -- be sure to set a default logdir for bdb, otherwise it won't be set for empty - chroots -- fix use of no longer existing binaries such as 'rpmquery' (thx Dick Gevers) -- add provide/obsolete on %%{_lib}rpmconstant-devel -- fix typo in perl bindings giving issues with 'mdvsys' on missing buildrequires -- rpmconstant is part of rpm5, so obsolete/provide this.. - -* Sun Jan 09 2011 Per Øyvind Karlsen 1:5.3.8-0.20110109.3mdv2011.0 -+ Revision: 630755 -- use default directory for %%setup -- add missing errno.h header to rpm4compat.h (P0) - -* Sun Jan 09 2011 Per Øyvind Karlsen 1:5.3.8-0.20110109.2mdv2011.0 -+ Revision: 630735 -- add back conflicts: librpm < 5.3 now that 'abrt' is linked against this version - -* Sun Jan 09 2011 Per Øyvind Karlsen 1:5.3.8-0.20110109.1mdv2011.0 -+ Revision: 630713 -- new cvs snapshot -- get rid of doc-copy workarond and duplication of docs in 'rpm-build' -- disable conflicts on older librpm again awaiting 'abrt' in main/release rebuild -- fix path ppc-* -> powerpc-* symlink path, and always create it... -- fix 'rpm -qf' to work on owned files (#62148) -- reenable conflict on older librpm versions -- merge 5.3 branch - -* Sat Nov 27 2010 Funda Wang 1:4.6.1-5mnb2 -+ Revision: 601652 -- rebuild for liblzma 5 - -* Fri Oct 29 2010 Michael Scherer 1:4.6.1-4mnb2 -+ Revision: 589999 -- rebuild for python 2.7 - -* Mon Oct 18 2010 Per Øyvind Karlsen 1:4.6.1-3mnb2 -+ Revision: 586616 -- automatically handle ruby gem extraction in %%setup - -* Thu Oct 07 2010 Per Øyvind Karlsen 1:4.6.1-2mnb2 -+ Revision: 583901 -- fix regression introduced with %%exclude change in previous release (fixes #61207) - -* Wed Sep 29 2010 Per Øyvind Karlsen 1:4.6.1-1mnb2 -+ Revision: 582007 -- add '~' suffix to backup files created when using %%apply_patches -- finally put copyright & serial tags to death for real -- reapply fix for rmpvercmp with missing values & conflicts behaviour fix(#55810) -- update to to more recent debugedit that handles '.debug_pubtypes' section -- "New" release: 4.6.1 (while awaiting decission on where to go next...) -- fix %%exclude's behaviour to *only* mean exclude from %%files, not from check - of unpackaged files. This brings back the behaviour we had in the past with - rpm 4.4.8, and will require files not to be packaged to be deleted in %%install, - and breaks building of any packages which incorrectly uses %%exclude for this - purpose. Please fix any packages doing so! (P1016) - -* Fri Aug 20 2010 Christophe Fergeau 1:4.6.0-15mnb2 -+ Revision: 571456 -- drop Pascal's patch for now -- fix "canonicalization unexpectedly shrank by one character" errors, patch by Anssi -- drop patch 135 which looks dubious -- revert previous commit, we don't want to diverge too much from rpm 4.x, we can - readd it *after* this patch is upstreamed in rpm 4.x - - + Pascal Terjan - - Refuse to build a rpm with 2 identical triggers (#60699) - - + Per Øyvind Karlsen - - reapply fix for #55i810 (if not fully comprehended, those of us who wrote it - does, ao removing out of ignorance and lack of insight will not e tolerated. - -* Mon May 17 2010 Christophe Fergeau 1:4.6.0-14mnb2 -+ Revision: 544968 -- use db 4.8 -- fix default perms in debug packages, #59083 - - + Pascal Terjan - - Check chroot return code before running external script - - Check chroot return code before running lua script - -* Fri Apr 16 2010 Christophe Fergeau 1:4.6.0-12mnb2 -+ Revision: 535522 -- fix file trigger hang when several filetrigger scripts are run in parallel (#57878) - - + Oden Eriksson - - rebuilt against nss-3.12.6 - -* Wed Feb 17 2010 Christophe Fergeau 1:4.6.0-10mnb2 -+ Revision: 507168 -- don't diverge from upstream wrt EVR comparisons - -* Tue Feb 16 2010 Funda Wang 1:4.6.0-9mnb2 -+ Revision: 506733 -- rebuild for libpopt file path change - - + Per Øyvind Karlsen - - fix broken bitwise operator usage (thx to anssi for noticing) - - do a new fix for #55810 that doesn't cause same regressions as the previously - revert fix and hopefully no other regressions either.. ;) - (P1010, http://rpm5.org/community/rpm-devel/4011.html) - -* Fri Nov 20 2009 Per Øyvind Karlsen 1:4.6.0-8mnb2 -+ Revision: 467682 -- revert previous change as it'll break == dependencies on version only - (which even requires-on-release policy requires) :/ - -* Fri Nov 20 2009 Per Øyvind Karlsen 1:4.6.0-7mnb2 -+ Revision: 467652 -- don't skip release comparision when checking conflicts if release value is - missing (P1011 from Jeff Johnson, fixes #55810) - - + Michael Scherer - - fix unowned directory, reported by bitshuffler on irc, causing problem - when installing rpm and using the wrong umask - -* Fri Sep 25 2009 Olivier Blin 1:4.6.0-6mnb2 -+ Revision: 448653 -- remove n32 support for now (not actually used) -- handle n32 ABI in find-requires and find-provides (from Arnaud Patard) -- switch to armv5tl (from Arnaud Patard) - There are little chances that we'll have armv4tl. Doesn't use - armv5tel as some SoC have broken instructions in the "e" extension -- fix %%_isa rpm macros for ARM (from Arnaud Patard) -- mips build fixes: define __isa* macros otherwise rpm doesn't work - (from Arnaud Patard) -- fix stack-protector check: -fstack-protector doesn't error if it's - not supported but issues a warning, building test case with -Werror - the test case fixes the issue (from Arnaud Patard) -- add %%mips macro define all mips abi (from Arnaud Patard) - -* Sun Aug 23 2009 Anssi Hannula 1:4.6.0-5mnb2 -+ Revision: 419760 -- fix ignored Requires(pre) and (post) when they have a plain Requires - counterpart (rpm-fix-corequisites.patch backported from upstream 4.7.1) -- fix legacy prereq detection (rpm-fix-islegacyprereq.patch backported - from upstream 4.7.1) -- map prereq to Requires(pre,preun) instead of nothingness when building - (rpm-map-prereq.patch backported from upstream 4.7.1) - - + Per Øyvind Karlsen - - Avoid adding Lua sources/patches twice when recursing (P1010, git backport) - -* Fri Jul 24 2009 Anssi Hannula 1:4.6.0-4mnb2 -+ Revision: 399298 -- fix filetriggers to be called on package removal as well (regression - introduced in 4.6.0 package because of an error in rediffing of - filetriggers.patch; fixes bug #52333) - -* Tue Jun 30 2009 Thierry Vignaud 1:4.6.0-3mnb2 -+ Revision: 391017 -- bump release so that cooker's rpm is newer than 2009.1's one - -* Thu Jun 11 2009 Christophe Fergeau 1:4.6.0-2mnb2 -+ Revision: 385093 -- add missing calls to rpmluaPop to patch 159, might fix #50579 -- Revert switch to db4.7 - - + Per Øyvind Karlsen - - Expose packagecolor tag and add new tags from rpm5 as rpm otherwise will break - when these unknown tags might be found in the rpmdb. Notice that this will only - make rpm recognize these, not implement actual support for them.. (P1008) - - build against bdb 4.7 - - build against db4.7 rather than db4.6 from now on - - + Arnaud Patard - - define apply_patches if not already done. This fix bootstrapping issues - (eg building current rpm on older rpm or building rpm on a system without - rpm) - - fix dependency on patch as rpm-build is now using "patch -U" which has - been introduced in version 2.5.9-7mdv2009.1. - -* Fri Feb 13 2009 Christophe Fergeau 1:4.6.0-1mnb2 -+ Revision: 340115 -- Update to rpm 4.6.0 - -* Thu Jan 29 2009 Pixel 1:4.6.0-0.rc3.7mnb2 -+ Revision: 335221 -- add %%apply_patches: it can be used to replace all "%%patchN" lines, - but it forces all patches to be "-p1". -- call %%_patch and %%_after_setup for use in rpm-mandriva-setup-build - (useful for "--with git_repository") - - + Per Øyvind Karlsen - - don't wipe out $DOCDIR when using %%doc as it will wipe out any files that would - happen to be installed during %%install. (P1008) - -* Tue Jan 20 2009 Pixel 1:4.6.0-0.rc3.6mnb2 -+ Revision: 331759 -- replace nss-inithack patch with upstream patch - (which is more complete, esp fixes rpmresign in perl-RPM4) -- add patch fixing rpmdsMerge on rpmdsSingle (fixes 07dep.t in perl-RPM4) -- fix segfault triggered by perl-RPM4 tests - - + Per Øyvind Karlsen - - fix internal enum value for xz (noticed by jnovy, thx!) - - oops, fix a minor glitch with a final api change - - add versioned requires on liblzma-devel since we *really* need latest api - changes :) - - update lzma payload support to add support for new xz format in parallel(P1007) - -* Wed Dec 24 2008 Funda Wang 1:4.6.0-0.rc3.5mnb2 -+ Revision: 318370 -- temporarily disable graphviz BR - - + Michael Scherer - - rebuild for new python - - + Pixel - - add conflict on urpmi-recover since rpm 4.6.0 dropped support for --repackage - -* Thu Dec 18 2008 Pixel 1:4.6.0-0.rc3.3mnb2 -+ Revision: 315608 -- add patch153: "fix" segfault in mdkapplet (#46323) -- add patch154: fix compilation with Werror=format-security -- merge patch91 (check-dupl-files) into patch111 (check-files fix for "//" in buildroot) - -* Mon Dec 15 2008 Pixel 1:4.6.0-0.rc3.2mnb2 -+ Revision: 314562 -- enable sqlite (was disabled after rpm-4.6.0 switch) - -* Fri Dec 12 2008 Pixel 1:4.6.0-0.rc3.1mnb2 -+ Revision: 313584 -- 4.6.0-rc3 -- drop patch153 (buildroot-subpackage), fixed upstream - -* Thu Dec 11 2008 Pixel 1:4.6.0-0.rc2.2mnb2 -+ Revision: 312890 -- rediff patch71, patch83, patch91, patch140, patch145, patch147, patch1005 -- fix patch2002 (python-writeHdlist), was broken with rpm 4.6 API - -* Tue Dec 09 2008 Pixel 1:4.6.0-0.rc2.1mnb2 -+ Revision: 312303 -- use %%configure (so that libdir is correctly on x86_64) -- 4.6.0-rc2 -- add patch152: fix build -- add patch153: buildroot with subpackages issue -- drop already unused %%buildnptl (obsolete since rpm uses system libdb) -- drop patch134 (defaultbuildroot), so %%defaultbuildroot is no more used, - global %%buildroot is used, and BuildRoot is no more handled -- drop patch56 (ppc32). hopefully now unneeded -- drop patch44 (amd64-x86_64 compat). hopefully now unneeded -- drop patch112 (dont-use-rpmio-to-read-file-for-script), only needed on rpm 4.4.8? -- drop patch1002 (default-topdir--usr-src-rpm). it is now /root/rpmbuild -- drop patch1003: drop support for "suggests" the way rpm >= 4.4.7 do it - (all Mandriva packages uses the new "suggests" nowadays) -- drop patch139 (do-not-allow-fileconflict-between-non-colored-file), - since partially applied upstream (47c85270631de173d873b98bc79727e2db203007) -- drop popt (it is no more internal), drop patch1004, patch2004 -- drop patch3 ("file" is no more internal) -- drop patch149 (upstream has already got rid of internal db) -- drop patch1450 (problem fixed upstream, though differently) -- drop patch132 (extcond), patch133 has been simplified (butchered) to work without it -- drop patch1133 (integrated in patch133 (weakdeps)) -- drop patch100 (rpmbuild-missing), no more needed since we have rpmb_deprecated -- drop patch142, patch143, patch144, patch150 applied upstream -- simplify patch1001 since most is upstream, create patch1006 containing the - PayloadIsLzma compat issue -- adapt patch137 (headerIconv) -- adapt patch31 (syslog) -- adapt/simplify patch114: only specifically read macros.d/*.macros -- adapt patch2000, patch2001 (serial/copyright tag) -- adapt patch133 (weakdeps), drop --suggests/--recommends difference -- rediff patch49, patch64, patch70, patch141, patch146, patch147, patch148, - patch151, patch2002, patch2005 - -* Sun Oct 19 2008 Per Øyvind Karlsen 1:4.4.2.3-22mnb2 -+ Revision: 295367 -- rebuild against liblzma which I had to bump the major of yet again -- actually remember to bump popt release as well this time (popt should REALLY - be split out!!!) - -* Sat Oct 18 2008 Per Øyvind Karlsen 1:4.4.2.3-21mnb2 -+ Revision: 294824 -- fix build with new liblzma (updates P1001) - - + Pixel - - failing triggers must not block an update (otherwise both packages are kept) - -* Wed Oct 01 2008 Pixel 1:4.4.2.3-20mnb2 -+ Revision: 290443 -- protect-against-non-robust-futex patch: remove the ugly error messages - when non-root - -* Wed Oct 01 2008 Pixel 1:4.4.2.3-19mnb2 -+ Revision: 290325 -- ensure stale futex locks do not block (#41868) - -* Thu Sep 11 2008 Pixel 1:4.4.2.3-18mnb2 -+ Revision: 283690 -- fix broken cpio for hardlink on softlink (#43737) -- remove /usr/lib/libpopt.so.0 symlink (unneeded) - -* Sat Sep 06 2008 Pixel 1:4.4.2.3-17mnb2 -+ Revision: 281842 -- use external libdb-4.6.so instead of internal one (was DB 4.3.27: December 22, 2004). - (hopefully fixing #41868) - -* Tue Aug 26 2008 Pixel 1:4.4.2.3-16mnb2 -+ Revision: 276212 -- add patch148 which ensures chroot errors are not ignored - (the bug occured on mandriva build system, the files - were installed on the non rooted system) - -* Tue Aug 05 2008 Frederic Crozat 1:4.4.2.3-15mnb2 -+ Revision: 263799 -- bump popt release too -- Bump minimal version of rpm-mandriva-setup, to ensure filetriggers - are enabled during upgrade from older distributions - -* Thu Jul 17 2008 Oden Eriksson 1:4.4.2.3-14mnb2 -+ Revision: 237798 -- bump release for popt as well -- fix deps and rebuild against latest neon-devel - -* Fri Jul 04 2008 Pixel 1:4.4.2.3-13mnb2 -+ Revision: 231680 -- fix memory leak in patch124 (regression introduced on 2008-06-23) -- fix detecting wether filetriggers are activated (through %%_filetriggers_dir) - -* Thu Jun 26 2008 Pixel 1:4.4.2.3-12mnb2 -+ Revision: 229317 -- fix --testing errors introduced by filetriggers - -* Tue Jun 24 2008 Pixel 1:4.4.2.3-11mnb2 -+ Revision: 228550 -- nicely handle /etc/rpm/macros.cdb disappearance (esp. for people having %%_dbapi set there) - -* Mon Jun 23 2008 Pixel 1:4.4.2.3-10mnb2 -+ Revision: 228082 -- enhance patch124 to use "Dirnames" db before using "Packages" db - (hence much less db accesses in the pathological "COPYING" case) -- rpm must feature PayloadIsLzma = 4.4.2-1 to be the most compatible (?!) - (with SuSE, and with temporary cooker packages with PayloadIsLzma <= 4.4.2.2-1) - -* Sun Jun 22 2008 Pixel 1:4.4.2.3-8mnb2 -+ Revision: 227894 -- PayloadIsLzma version must be at least 4.4.6-1 to be compatible with mdv2008.0 -- fix segfault when transaction fails - -* Fri Jun 20 2008 Pixel 1:4.4.2.3-7mnb2 -+ Revision: 227396 -- drop our old macros.cdb, which was forcing old values, - esp "verify" which forcing rpm to verify db after each changes - (which was making rpm quite slow when rpmdb was not in cache) -- cleanup: drop not applied global-RPMLOCK patch - -* Thu Jun 19 2008 Pixel 1:4.4.2.3-6mnb2 -+ Revision: 226213 -- fix filetriggers (librpm was exiting in case of sigpipe in filetrigger script) -- checks on "non packaged binary packages" now depend on %%_missing_subpackage_terminate_build (patch147) -- checks on "non packaged binary packages" only done on "mdv" packages (patch147) - - + Per Øyvind Karlsen - - fix version typo - - switch to use liblzma for lzma payload (P1000, partly derived from rpm5.org & OpenSuSE) - -* Wed Jun 11 2008 Pixel 1:4.4.2.3-4mnb2 -+ Revision: 218093 -- rpmbuild: add patch to ensure some parse errors are really fatal as they should - -* Mon Jun 09 2008 Pixel 1:4.4.2.3-3mnb2 -+ Revision: 217217 -- add new fatal errors (during package build): - o disallow scriptlets for non packaged binary packages - o "%%files foo" for subpackages is now mandatory -- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers -- replace "%%post -p ldconfig" hack with a full featured generic solution: - filetriggers (cf http://wiki.mandriva.com/en/Rpm_filetriggers) -- "#%%define foo bar" is now a fatal error -- handle "%%posttrans -p ..." with no script body (eg: %%posttrans -p /sbin/ldconfig) -- add "requires tar" in rpm-build -- fix build of debugedit (patch143) - -* Tue May 13 2008 Thierry Vignaud 1:4.4.2.3-1mnb2 -+ Revision: 206778 -- fix build on x86_64 - - + Pixel - - 4.4.2.3 - - add patch142 which ensures chroot errors are not ignored - (the bug occured on mandriva build system, the files from package binutils - were installed on the non rooted system) - - drop patches applied upstream: 136, 138 - - rediff patch17 - -* Tue Apr 01 2008 Pixel 1:4.4.2.3-0.rc1.7mnb1 -+ Revision: 191469 -- postpone and group ldconfig %%post in %%posttrans instead of wrongly skipping ldconfig - -* Fri Mar 28 2008 Pixel 1:4.4.2.3-0.rc1.6mnb1 -+ Revision: 190842 -- rebuild with fixed libneon0.26-devel - -* Mon Mar 17 2008 Pixel 1:4.4.2.3-0.rc1.5mnb1 -+ Revision: 188330 -- add support for "suggests" and "enhances" in rpmds (needed for "sophie") (nanardon) -- use %%_vendor instead of %%vendor (thanks-to/required-by nanardon) -- fix typo in recent commit -- fix broken symlink (due to %%rpmversion != %%srcver for rc1) -- trivial fix for Russian translation (#38713) - - + Toshihiro Yamagishi - - get rid of _host_vendor definition. It should be defined by rpm-xxx-macros. - - use original find-requires,find-provides,find-lang when build with turbolinux. - -* Sat Mar 01 2008 Pixel 1:4.4.2.3-0.rc1.3mnb1 -+ Revision: 177474 -- fix file conflicts wrongly allowed on x86_64 -- when dropping requires during tsort, do not display "PreReq" when it really is "Requires" -- rpm-mandriva-setup and rpm-mandriva-setup-build requires are only on Mandriva -- add buildlang patch which unsets locales when building packages (for Turbolinux) - - + Thierry Vignaud - - replace %%mkrel with %%manbo_mkrel for Manbo Core 1 - -* Thu Feb 14 2008 Pixel 1:4.4.2.3-0.rc1.2mdv2008.1 -+ Revision: 167788 -- use rpmrc and rpmpopt from rpm-manbo-setup -- get best lang from rpm HEADERI18NTABLE, instead of getting first fuzzy match - (eg: zh_TW matches zh_CN whereas zh_TW entry is available) -- debugedit: remove a wrong check in case %%_topdir is /RPM (from Turbolinux) -- add japanese popt translations -- add Turbolinux specific patches: - o re-allow "Serial" and "Copyright" (aliases of "Epoch" and "License") - (to ease Turbolinux migration) - o add writeHeaderListTofile function into python binding - (needed by Turbolinux buildman build system) - - + Toshihiro Yamagishi - - headerIconv.patch: check realloc() value - - convert the data to a specific encoding which used in the selected locale. - -* Mon Jan 28 2008 Pixel 1:4.4.2.3-0.rc1.1mdv2008.1 -+ Revision: 159090 -- 4.4.2.3 adds ix86 macros files to x86_64 -- new release 4.4.2.3-rc1 -- libpopt needs a release number different from rpm so that we can reset rpm's - release and increase libpopt's -- drop applied patches: patch82 (ordering), patch98 (bad pointer), - patch108 (dgettext), patch116 (qv), patch119 (without-O2), - patch121 (timeout 60secs), patch127 (rpmbuild --quiet), - patch128 (rpm -K segfault), patch136 (macro on last line), - patch1006 (triggerprein), patch1007 (russian), - patch1008 (display Requires found), -- drop patch135 (truncated rpmProblemString): no more needed, workarounded - upstream - -* Wed Jan 23 2008 Pixel 1:4.4.2.2-7mdv2008.1 -+ Revision: 157054 -- fix rpmbuild not printing Requires after build (fix backported from 4.4.8) (#36672) -- allow doc conflict in same transaction (#37040) - (it was already allowed in different transactions) -- fix russian translation (#36974) - -* Sat Jan 12 2008 Anssi Hannula 1:4.4.2.2-6mdv2008.1 -+ Revision: 149522 -- allow conflicting ghost file types as sometimes the same ghost file - is a file in one package and a symlink in another package (modifies - rpm-4.4.2.2-allow-conflicting-ghost-files.patch) - -* Tue Jan 08 2008 Pixel 1:4.4.2.2-5mdv2008.1 -+ Revision: 146377 -- %triggerprein were missing in 4.4.2.2, adding them - -* Thu Dec 20 2007 Pixel 1:4.4.2.2-4mdv2008.1 -+ Revision: 135996 -- fix multiline macro handling on last line of spec file (#27417) -- fix truncated "file conflict" error message in russian (#31680) - -* Tue Dec 18 2007 Pixel 1:4.4.2.2-3mdv2008.1 -+ Revision: 132430 -- re-introduce temporarily BuildRoot so that rpm builds -- drop patch for SOURCEPACKAGE (unneeded in rpm 4.4.2.2 which keeps compatibility) -- fix defaultbuildroot patch (fix building with %%defaultbuildroot and subpackages) -- allow conflicting %%ghost files (as used to be in rpm >= 4.4.6) -- modify patch no-doc-conflicts instead of patching it -- for compatibility with rpm 4.4.8, allow conflicting doc files in - /usr/share/man, /usr/share/gtk-doc/html /usr/share/gnome/html - -* Mon Dec 17 2007 Pixel 1:4.4.2.2-2mdv2008.1 -+ Revision: 125038 -- patch134 introduces %%defaultbuildroot to use instead of %%buildroot in our global macros -- keep libpopt.so versioning from 4.4.8 (to avoid warnings) -- fix URL -- switch to 4.4.2.2 (using epoch: 1) -- add patch132 and patch133 to handle "Suggests" via RPMTAG_SUGGESTSNAME -- add patches to be compatible with >= 4.4.8 : - o patch1000: handle %%buildroot macro - o patch1001: handle suggests via RPMTAG_REQUIRENAME + RPMSENSE_MISSINGOK - o patch1001: lzma-support (integrates patch130 (lzma-fixes), patch131 (lzma_alone)) - o patch1002: default %%_topdir is /usr/src/rpm - o patch1003: handle RPMSENSE_MISSINGOK (integrates patch129 (do-not-cache-unsatisfied-suggest)) -- drop unneeded patches: - o applied: patch63 (applied in lib/package.c), patch68, patch72, - patch77 (%%_srcdefattr), patch92 (newtar), patch94 (rpmv3-support), - patch113 (%%_docdir_fmt), patch123 (find-lang omf) - o patch1 (no builtin zlib) - o patch2 (rpm is dynamically linked by default) - o patch85 (no more perl module) - o patch87 (was disabling dirname require introduced in 4.4.6) - o patch89 (>= 4.4.6 specific compilation issue) - o patch107 (fixed differently in changeset 6799:446988cfb9c1) - o 4.4.8 specific: patch109, patch117 (dont-replace-config-not-in-db), - patch118 (lowercase platform), patch120 (segfault fix), patch122 (fix - crash with buggy rpm and FILELINKTOS), patch125 (popt.h fix), patch126 - (platform32 support) - o 4.4.8 specific?: patch115 (dont-clean-buildroot-in-install) -- adapt patches: - o rediff: patch31 (syslog), patch64 (vendor popt), patch84 (rpmqv-ghost), - patch116 (qv-use-same-indentation), patch49, patch56, patch82, patch86, - patch112, patch119 - o patch3 (prefer-pic in "file" lib .la) - o patch17 (keep enhancements from upstream version) - o patch114 (read our macros files) - o patch124 (speedup-by-not-checking-same-files-with-different-paths-through-symlink) - and add patch1124 (revert-unused-skipDir-functionality) needed by patch124 -- use autoreconf and don't do it in db/dist (it fails) -- drop perl-RPM (unused and no more in rpm 4.4.2.2) -- drop now unneeded perldirs patch85 -- don't build apidocs since we don't bundle them -- drop patch78 (Do not use futex, but fcntl) which is not doing anything anymore - - + Per Øyvind Karlsen - - use LZMA_Alone file format, even with newer versions (P131, from cvs) - - be more consistent and use unlzma in stead of lzma -d -c in rpm2cpio.sh (lzma patch) - - drop unused leftover macros for lzma patch.. - - final fix of lzma payload patch, it can now be used properly same way as gzip and bzip2 - - correctify lzma fix patch - - switch to patch from cvs for lzma fixes - - update arguments for lzma utils as current old arguments breaks it - - I suck, don't move man pages around at all and stop messing:p - - move man page for perl module to perl-RPM package - - + Olivier Blin - - do not expand _install_langs macro in default /etc/rpm/macros - - fix typo in default /etc/rpm/macros - - explicitely require neon-devel 0.26 (does not build with neon 0.27) - -* Tue Oct 02 2007 Pixel 4.4.8-22mdv2008.0 -+ Revision: 94448 -- fix rpm allowing to remove a package which is both suggested and required (#34342) - -* Fri Sep 28 2007 Pixel 4.4.8-21mdv2008.0 -+ Revision: 93603 -- remove global RPMLOCK, it doesn't seem to fix rpmdb issues, and may cause - installer to crash - -* Thu Sep 27 2007 Pixel 4.4.8-20mdv2008.0 -+ Revision: 93272 -- patch global-RPMLOCK: - o fix rebuilddb (#34181) - o don't lock when querying the db as non-superuser - o fix locking in shared mode (ie fix typo) - o remove message "RPMLOCK_NOWAIT should have been set!" - which can't be done reliably - o more debug messages about RPMLOCK - -* Wed Sep 26 2007 Pixel 4.4.8-19mdv2008.0 -+ Revision: 93120 -- patch global-RPMLOCK: - o allow rpm to not wait on lock when RPMLOCK_NOWAIT is set - o ensure we don't have a dead-lock in package scriptlets which call "rpm -q" - (eg: dkms). but it will die with an error - o do create /var/lib/rpm directory when needed (as done in rpmdb/db3.c) - o use flock instead of fcntl+F_SETLK - (so that we really ensure the same process doesn't open twice the db) - (still need not to lock when accessing in shared mode with not enough rights - to write RPMLOCK) -- fix creating /RPMLOCK instead of /var/lib/rpm/RPMLOCK - -* Mon Sep 24 2007 Pixel 4.4.8-18mdv2008.0 -+ Revision: 92580 -- do not use __db* files anymore, make them private -- (re-)add a global lock to ensure everything is correct - (to ensure doing "rpm -qa" is always correct even if an upgrade is in - progress) -- fix rpm -K segfaulting on corrupted header (#33735) - -* Mon Sep 10 2007 Pixel 4.4.8-17mdv2008.0 -+ Revision: 84150 -- make "rpm -bb --quiet" quiet as should be - -* Thu Sep 06 2007 Pixel 4.4.8-16mdv2008.0 -+ Revision: 81086 -- bug fix release, fix stupid typo in /etc/platform32 reading patch - -* Thu Sep 06 2007 Pixel 4.4.8-15mdv2008.0 -+ Revision: 80965 -- really allow to use "linux32 rpm -bb" instead of "linux32 rpm -bb --target x86_64" - (it uses /etc/rpm/platform32) - -* Wed Sep 05 2007 Pixel 4.4.8-13mdv2008.0 -+ Revision: 79852 -- allow to use "linux32 rpm -bb" instead of "linux32 rpm -bb --target x86_64" - (for this to work, %%{_host_cpu32} must be set in rpm-mandriva-setup) - -* Thu Aug 30 2007 Pixel 4.4.8-12mdv2008.0 -+ Revision: 75298 -- fix popt.h (remove N_) (#31397) - -* Wed Aug 29 2007 Pixel 4.4.8-11mdv2008.0 -+ Revision: 74355 -- add patch to speedup simple "rpm -e" or "rpm -U" -- make find-lang --with-gnome picks up omf files (rhbz#251400) (rpm.org patch) -- add the bug number fixed - -* Tue Aug 21 2007 Pixel 4.4.8-10mdv2008.0 -+ Revision: 68566 -- patch fixing parse_hdlist (and so genhdlist2) on heavy loaded boxes -- fix segfault on weird rpm that used to work (#32102) -- remove recursive %%_mandir (and don't keep it, it's not needed anymore) - - + Thierry Vignaud - - replace %%{_datadir}/man by %%{_mandir}! - - replace %%_datadir/man by %%_mandir! - -* Sat Aug 18 2007 Oden Eriksson 4.4.8-9mdv2008.0 -+ Revision: 65549 -- don't provide these files twice: - /usr/lib/rpm/rpmdb_deadlock - /usr/lib/rpm/rpmdb_dump - /usr/lib/rpm/rpmdb_load - /usr/lib/rpm/rpmdb_loadcvt - /usr/lib/rpm/rpmdb_stat - /usr/lib/rpm/rpmdb_svc - /usr/lib/rpm/rpmdb_verify - they are now only provided in the main rpm package, and not - also in the devel package. that is the way to go according to - jbj. - - + Thierry Vignaud - - fix URL - -* Mon Aug 06 2007 Pixel 4.4.8-8mdv2008.0 -+ Revision: 59505 -- do not use nptl on any arch (since x86_64 specific issues seem to disappear - when using same locking mechanism as x86) (may fix #32102) -- fix segfault occuring with some old rpm v3 from urpmi test cases -- allow building --with debug -- restore do-check-free-size-when-bavail-is-0 patch (after rediff) - -* Wed Jul 25 2007 Olivier Thauvin 4.4.8-7mdv2008.0 -+ Revision: 55450 -- fix #31535: lowercase OS tag to compare against platform -- use upstream patch - - + Per Øyvind Karlsen - - add requires on lzma - -* Fri Jul 06 2007 Olivier Thauvin 4.4.8-6mdv2008.0 -+ Revision: 48984 -- fix config file replace when not yet in db -- kill not bad macros definition -- find-lang is now a perl script - -* Fri Jun 22 2007 Anssi Hannula 4.4.8-5mdv2008.0 -+ Revision: 42672 -- require arch-specific libpopt and libpopt-devel -- add back dropped librpm-devel and libpopt-devel provides - -* Wed Jun 20 2007 Olivier Thauvin 4.4.8-4mdv2008.0 -+ Revision: 41943 -- fix buildreq for autoconf/automake -- apply new devel policy - -* Tue Jun 19 2007 Olivier Thauvin 4.4.8-3mdv2008.0 -+ Revision: 41414 -- kill coloring patch, buggy, and not so usefull -- patch116: fix rpm -V output (#31287) - -* Sun Jun 10 2007 Olivier Thauvin 4.4.8-2mdv2008.0 -+ Revision: 37847 -- patch115: avoid breakage of conectiva --without bm feature -- remove patch 110, add patch114: do no longer use rpmrc, using only macros instead, so requiring latest rpm-mandriva-setup to have /etc/rpm/platform -- fix perl module release -- patch to backport _docdir_fmt macro -- 4.4.8 - o rediff patch 72, 87, 49, 62, 17, 56, 64 - o kill patch (merge or fix upstream, woot): - 57, 80, 90, 93, 193, 95, 96, 97, 99, 103, 104, 105, 109, 110, 111, - 112, 114, 115, 101, 102, 107 - o kill patch 69, hard to maintain, will be merge upstream - o Patch109: workaround specfile parsing check, - http://rpm5.org/cvs/tktview?tn=6 - o Patch110: still read rpmrc (this should die one day) - o Patch111: trim twice / in buildroot, making unpackaged files check failing - o Patch112: avoid a very issue regarding Fopen() - - + Per Øyvind Karlsen - - use %%{ix86} & %%{sunsparc} macros for x86 & sparc - - use %%{sunsparc} macro to ensure sparcv9 gets included too - - + Pixel - - make it explicit that older perl-URPM are not compatible with 4.4.8 - - add patches 112 113 114 115 from both rpm 4.4.9 and hg.rpm.org - - cleanup provides-obsoleted.patch, moving other fixes into rebuilddb-with-root.patch - - more complete fix-segfault-on-header-without-RPMTAG_NAME patch (from upstream) - - don't segfault on header without RPMTAG_NAME - - add requires pkgconfig in rpm-build (#30632) - (it is needed for performing automatic computation of pkgconfig files - dependencies, see /usr/lib/rpm/mandriva/pkgconfigdeps.sh) - - add patch (ensure-uninst-callback-is-called-for-empty-packages) - to allow urpmi to display "remove package foo" when removing an empty package - -* Wed Apr 25 2007 Adam Williamson 4.4.6-22mdv2008.0 -+ Revision: 18290 -- rebuild against new beecrypt - - -* Wed Feb 14 2007 Pixel 4.4.6-21mdv2007.1 -+ Revision: 120751 -- fix parsing ")" (for if statements in spec files for example) -- rpm handles nicely failing %%pre, but it doesn't handle the rest -- patch to use dgettext instead of gettext to allow progs like urpmi to use - their own textdomain and still have rpm translations -- fix checking available free space when "non-superuser free space" is 0 - - + Gwenole Beauchesne - - requires newer rpm-mandriva-setup for rtld(GNU_HASH) notes - -* Fri Jan 12 2007 Pixel 4.4.6-19mdv2007.1 -+ Revision: 108072 -- P98: security fix for CVE-2006-5466 --mv8 which is deprecated and no longer valid (Per Oyvind, #26501) - - + Thierry Vignaud - - provides with unexpanded macros aren't that nice - -* Mon Jan 08 2007 Pixel 4.4.6-18mdv2007.1 -+ Revision: 105990 -- fix bug 27987 where sslexplorer rpm has "Source RPM: (none)" and so rpm - thought it is a src.rpm. the fix is only done for old v3 rpms -- "rpm -i --root" as user can't work, don't silently ignore the failing chroot() -- fix --root rpm option failing for non-root users (Christiaan Welvaart) -- really commit the patch -- fix segfault on weird buggy rpm header -- fix query format xml on rpm header with tag 265 which has no name (#27108) - -* Fri Dec 08 2006 Gwenole Beauchesne 4.4.6-12mdv2007.1 -+ Revision: 93842 -- generate PIC code for static objects that can be built into a DSO -- remove (obsolete) arch-dependent flags -- don't build statically linked executables -- Fix zlib tree to parallel build, propagate optflags to there too. -- Introduce new ppc32 arch, fix ppc64 bi-arch builds, fix ppc builds on newer CPUs. -- fix build on ppc64 - - + Pixel - - fix segfault on some old format rpms (#27263) - -* Thu Nov 30 2006 Pixel 4.4.6-11mdv2007.1 -+ Revision: 88894 -- rebuild for python 2.5 -- add patches fixing #26545: - o don't leave behind /usr/X11R6/lib/X11/app-defaults;456ac510 on error - o fix segfault -- ignore getcwd failing (db_abshome will not be set, - it may affect db/log/log_archive.c, but that should be ok) (#20897) -- fix "rpm -bs t.spec" returning buggy error message - "t.spec: No such file or directory" when rpm-build is not installed -- fix free on invalid pointer after displaying "Unable to open temp file" (#27260) -- have a nice error message when chroot fails - (instead of the dreaded: "enterChroot: Assertion `xx == 0' failed.") - - + Gwenole Beauchesne - - Extend #27260 fix to its root cause as there are other instances of a - similar bug in other sources (yet, unexposed/reported). - -* Fri Sep 15 2006 Rafael Garcia-Suarez 4.4.6-10mdv2007.0 -+ Revision: 61429 -- Bump release number -- Improve previous patch: make it conditional on the environment variable RPM_IGNORE_SCRIPTLETS_FAILURE -- Allow preinstall scriptlets to fail and not interrupting the installation. - This is a workaround for bug 25598. - -* Sat Aug 19 2006 Olivier Thauvin 4.4.6-9mdv2007.0 -+ Revision: 56766 -- bump release -- revert to my own chroot patch, thee second one is broken - -* Sun Aug 13 2006 Olivier Thauvin 4.4.6-8mdv2007.0 -+ Revision: 55706 -- bump release -- buildrequires lua-devel -- import mailscanner -- update patch with C. Welvaart fixes - - + Rafael Garcia-Suarez - - Fix typos - -* Sat Jul 29 2006 Olivier Thauvin 4.4.6-7mdv2007.0 -+ Revision: 42481 -- bump release -- add upstream patch97: fix dbenv -- patch96: fix #23774 - -* Thu Jul 27 2006 Olivier Thauvin 4.4.6-6mdv2007.0 -+ Revision: 42186 -- fix rpmv3 patch: rpm version in the lead in 3 for both rpm 3 and 4 -- fix #23075: patch 95, use tee -a - -* Wed Jul 26 2006 Olivier Thauvin 4.4.6-5mdv2007.0 -+ Revision: 42052 -- patch93: support rpm v3 -- bump release -- ensure leaveChroot can't be run by another function which is not the the caller of enterChroot -- remove changelog from spec -- add patch 93 (disable by default, need tests) to fix issue in rpmdb when mixing 'rpm --root' and 'chroot rpm' -- update macros in the spec -- provide some /etc/rpm files -- -3mdv release -- fix patch in patch -- better rpmdb.h c++ fix -- Patch90: fix unchecked end of line in macro expand -- patch 89: make rpmdb.h compliant -- file in /etc are %%config -- patch 88: readd SOURCEPACKAGE tag to source rpm -- make no_dirname_dep patch configurable with a macro -- bunzip patch, merge rpm 4.4.6 -- initial import of rpm -- initial import of rpm - - + Rafael Garcia-Suarez - - 4.4.6-4mdk - - Patch by Pixel to use --wildcards when using tar to list all specfiles in a tar - ball (this fixes rpm -t). - - Add patch 91: avoids taking into account duplicates in file list - when checking for unpackaged files - -* Wed Jul 12 2006 Rafael Garcia-Suarez 4.4.6-4mdv2007.0 -- Fix rpm -ta (Pixel) - -* Thu Jun 22 2006 Olivier Thauvin 4.4.6-3mdv2007.0 -- patchs: - - fix rpmdb.h c++ compilation (C. Welvaart) - - fix unchecked end of string in macro expand (O. Thauvin) - - fix check unpackaged files script (R. Garcia-Suarez) -- update macros provide by the spec used for bootstraping -- set some /etc/rpm/macros.* as config(noreplace) - -* Mon Jun 12 2006 Olivier Thauvin 4.4.6-2mdv2007.0 -- Patch88: readd SOURCEPACKAGE tag into src.rpm - -* Fri May 26 2006 Olivier Thauvin 4.4.6-1mdv2007.0 -- 4.4.6 -- rediff patches -- add patch to disable dirnames dependencies for now - -* Tue Mar 21 2006 Rafael Garcia-Suarez 4.4.5-2mdk -- Require latest rpm-mandriva-setup - -* Tue Mar 14 2006 Rafael Garcia-Suarez 4.4.5-1mdk -- 4.4.5 -- Remove patches 41 and 87, merged upstream -- Rediff patches 69 and 78 -- Make rpm-build require libtool-base instead of libtool (bug #21162) -- Turn the triggerun in post scriptlet - -* Tue Mar 07 2006 Rafael Garcia-Suarez 4.4.4-4mdk -- Patch 87 - -* Tue Feb 07 2006 Rafael Garcia-Suarez 4.4.4-3mdk -- Move popt(3) man page into libpopt-devel (bug 18161) -- Add coreutils in prerequisites (bug 19144) -- Fix dangling symlink (bug 6788) - -* Tue Jan 17 2006 Rafael Garcia-Suarez 4.4.4-2mdk -- Patch 86: don't cache Depends DB (Olivier Thauvin) -- Bump requires on rpm-mandriva-setup - -* Thu Jan 05 2006 Rafael Garcia-Suarez 4.4.4-1mdk -- New version 4.4.4 -- Rediff patches 31, 49, 62, 69, 71, 78, 82, 84 -- Remove patch 66 (fixed upstream) -- Remove patch 74 (no longer necessary, no legacy prereqs anymore) -- Remove patch 76 (should be unnecessary now that RH bug 151255 is fixed) -- Remove patch 79 (applied upstream) -- Remove patch 81 (does nothing) -- New subpackage perl-RPM, and patch 85 to install it in vendor dir -- Use static libneon, libsqlite3 and libopenssl -- Update condition for triggerun -- Add conditional BuildRequires on nptl-devel -- Disable popt tests -- Remove selinux -- Requires recent rpm-mandriva-setup for _rpmlock_path macro - -* Sun Nov 13 2005 Olivier Thauvin 4.4.2-6mdk -- rebuild for openssl (ask by Oden) - -* Sun Oct 23 2005 Olivier Thauvin 4.4.2-5mdk -- Fix #19392 - -* Fri Sep 16 2005 Gwenole Beauchesne 4.4.2-4mdk -- buildrequires: rpm-mandriva-setup-build -- fix simple coloring patch, aka merge it correctly -- re-add the no-doc-conflicts patch for colored packages - -* Tue Aug 30 2005 Olivier Thauvin 4.4.2-3mdk -- patch 80: fix #17774 -- patch 81, 82: should fix ordering issue -- BuildRequires: bzip2-devel (thanks Christian) - -* Sat Aug 20 2005 Frederic Lepied 4.4.2-2mdk -- 79: fix deadlock from RedHat bug #146549. - -* Fri Jul 22 2005 Olivier Thauvin 4.4.2-1mdk -- 4.4.2 -- remove patch: - 52: merged upstream - 67: fixed upstream - 73: merged upstream - 78: merged upstream - 79: merged upstream - 32, 33, 36: no more need hack -- rename rpm-python to python-rpm -- use fnctl when not using futex -- use nptl only on few arches (ppc* x86_64 pentium3,4/Athlon) - -* Thu Jun 23 2005 Olivier Thauvin 4.4.1-10mdk -- add requires to rpm-build after the rpm-mandriva-setup split - -* Tue Jun 21 2005 Olivier Thauvin 4.4.1-9mdk -- Enable NPTL and co -- rework patch77: allow %%_srcdefattr as macro for src.rpm -- Patch78: reread few macro between build -- Patch79: fix rpm --eval '%%' overflow - -* Fri Jun 17 2005 Rafael Garcia-Suarez 4.4.1-8mdk -- Move dependencies on unzip, make and elfutils from rpm to rpm-build - -* Sun Jun 05 2005 Olivier Thauvin 4.4.1-7mdk -- patch77: allow to set root/root as owner of files in src.rpm -- rebuild with neon 0.24 as it moved in main instead 0.25 - -* Thu Jun 02 2005 Rafael Garcia-Suarez 4.4.1-6mdk -- Patch 76 : allow to rebuild db with --root option - -* Wed May 18 2005 Olivier Thauvin 4.4.1-5mdk -- update french translation -- disable NPTL system + --with to enable it -- --w/o pyhton switch -- remove db_private patch as it breaks concurrent access - -* Mon May 16 2005 Olivier Thauvin 4.4.1-4mdk -- really apply patch (I sucks) -- some cleaning - -* Mon May 16 2005 Olivier Thauvin 4.4.1-3mdk -- Patch71: Ordering transaction on erasure -- Patch72: rpm -[Ui] check files conflicts -- Patch73,74: Fedora patch, fixing bug - -* Fri May 13 2005 Olivier Thauvin 4.4.1-2mdk -- patch70: allow rpm -bb --short-circuit -- conflicts man-pages-pl < 0.4-9mdk -- move spec mode for emacs into rpm-mandriva-setup -- buildrequires -- remove locales files from libpopt - -* Wed May 11 2005 Rafael Garcia-Suarez 4.4.1-1mdk -- Adapt part of the coloring patch (patch 62) -- Fix a few French translations (patch 69) -- Require libneon 0.25 - -* Mon May 09 2005 Olivier Thauvin 4.4.1-0.7mdk -- BuildRequires readline-devel (P.O. Karlsen) -- --disable-{posixmutexes,pthreadsmutexes} on sparc (P.O. Karlsen) -- patch68: being able to read old rpms -- update source url -- fix file list for ppc (C. Welvaart) - -* Fri May 06 2005 Olivier Thauvin 4.4.1-0.6mdk -- use system sqlite -- force -fPIC on amd64 (for popt) -- perform test for popt -- patch67 fix build with gcc4 - -* Wed May 04 2005 Olivier Thauvin 4.4.1-0.5mdk -- workaround make -j - -* Wed May 04 2005 Olivier Thauvin 4.4.1-0.4mdk -- 4.4.1 -- remove biarch, use mklibname (see 4.2.3-10mdk) -- do no longer patch the config, use /usr/lib/rpm/VENDOR/rpmrc instead -- require rpm-mandriva-setup -- remove many obsoletes patch -- do not longer provide update-alternative -- more defined macros in the spec, less hardcode patch - -* Tue May 03 2005 Pixel 4.2.3-11mdk -- emacs spec mode: - - use rpm-find-spec-version-with-shell by default, and enhance it - - handle release built using mkrel macro (in rpm-increase-release-tag) - -* Thu Apr 28 2005 Olivier Thauvin 4.2.3-10mdk -- split libs into separated package to make rpm update easier for URPM - -* Thu Mar 10 2005 Gwenole Beauchesne 4.2.3-9mdk -- bump multiarch-utils requires -- ignore conflicts in gnome-doc html files, install the latest files - -* Wed Mar 09 2005 Frederic Lepied 4.2.3-8mdk -- fix tr call in mono patch (bug #14449) -- fix bzip2 call (bug #7663) -- encode ru man pages in KOI8-R (bug #10219 and #12613) - -* Fri Feb 25 2005 Gwenole Beauchesne 4.2.3-8mdk -- hack to always install the latest arch-independent gtk-doc html - files and man pages, aka. don't conflict on biarch platforms - -* Fri Feb 25 2005 Gwenole Beauchesne 4.2.3-7mdk -- popt is now a biarch package - -* Thu Feb 24 2005 Gwenole Beauchesne 4.2.3-6mdk -- requires multiarch-utils >= 1.0.7-1mdk -- RPM_INSTALL_LANG support is obsolete for MDK >= 10.2 (rafael) - -* Tue Feb 08 2005 Frederic Lepied 4.2.3-5mdk -- added mkrel macro (Buchan) -- changed group System/X11 from System/XFree86 - -* Thu Jan 27 2005 Gwenole Beauchesne 4.2.3-4mdk -- newer multiarch-utils requires -- generate package script autoreqs only if requested (#13268) -- don't install .delta.rpm directly, use applydeltarpm first (SuSE) - -* Mon Jan 24 2005 Gwenole Beauchesne 4.2.3-3mdk -- minor cleanups -- check for files that ought to be marked as %%multiarch - -* Thu Jan 20 2005 Gwenole Beauchesne 4.2.3-2mdk -- newer multiarch-utils requires -- enable and improve file coloring - * use file colors even if still using the external dependencies generator - * assign a color to *.so symlinks to mix -devel packages - * assign a color to *.a archives to mix -{static,}-devel packages - -* Fri Jan 14 2005 Gwenole Beauchesne 4.2.3-1mdk -- multiarch-utils autoreq -- allow build of 32-bit RPMs on x86-64 -- ppc64 fixes -- update from 4.2-branch - * auto-relocation fixes on ia64 - * change default behavior to resolve file conflicts as LIFO - * generate debuginfo for setuid binaries - -* Fri Jan 07 2005 Frederic Lepied 4.2.2-19mdk -- compile --with-glob to avoid a problem with the internal glob code. - -* Thu Jan 06 2005 Rafael Garcia-Suarez 4.2.2-18mdk -- Add patch 60 (Guillaume Rousse): make find-requires ignore dependencies on - linux-incompatible perl modules. (bug #12695) - -* Mon Dec 06 2004 Rafael Garcia-Suarez 4.2.2-17mdk -- Add patch 59, necessary for the smart package manager (new function - rpmSingleHeaderFromFD() in the python bindings) - -* Sat Dec 04 2004 Frederic Lepied 4.2.2-16mdk -- rebuild for python 2.4 - -* Fri Aug 06 2004 Frederic Lepied 4.2.2-15mdk -- use system zlib - -* Thu Jul 29 2004 Frederic Lepied 4.2.2-14mdk -- fix mono patch (bug #7201) - -* Wed Jul 28 2004 Frederic Lepied 4.2.2-13mdk -- use mono-find-requires and mono-find-provides if present (Götz Waschk) (bug #7201) - -* Wed Jul 28 2004 Frederic Lepied 4.2.2-12mdk -- use a correct implementation of cpuid (Gwenole) -- return None instead of [] in rpm-python (Paul Nasrat) -- add /var/spool/repackage (bug #9874) -- handle /usr/lib/gcc/ directories for devel() deps too (Gwenole) - -* Thu May 20 2004 Gwenole Beauchesne 4.2.2-10mdk -- switch back to x86_64 packages on 64-bit extended platforms - -* Fri May 14 2004 Gwenole Beauchesne 4.2.2-9mdk -- fix /usr/lib/rpmpopt symlink -- use -mtune=pentiumpro on any MDK >= 10.0 - -* Fri Apr 16 2004 Rafael Garcia-Suarez 4.2.2-8mdk -- When unlocking the RPMLOCK file, don't forget to close(2) it too. ->>>>>>> 6baaed7aaa24cbce8ef4879e057bc4f6b8aae017