- updated to 5.2.0

Changed files:
    rpm-configure-autoconf.patch -> 1.2
    rpm-macros.patch -> 1.48
    rpm-old-fileconflicts-behaviour.patch -> 1.4
    rpm.spec -> 1.927

diff --git a/rpm-configure-autoconf.patch b/rpm-configure-autoconf.patch
index 2879d05d35d2bd193e56ea65a8a3ad51b66a341b..c76b8b4819e3bcc0d208acbcd8bc3fc0bcd3b0be 100644 (file)
--- a/rpm-configure-autoconf.patch
+++ b/rpm-configure-autoconf.patch
@@ -1,11 +1,11 @@
---- rpm-5.1.9/configure.ac     2009-04-18 18:47:02.000000000 +0200
-+++ rpm-5.1.9/configure.ac.new 2010-04-08 23:26:48.148666508 +0200
-@@ -8,7 +8,7 @@
+--- rpm-5.2.0/configure.ac.wiget       2010-04-25 23:03:56.000000000 +0200
++++ rpm-5.2.0/configure.ac     2010-04-25 23:04:35.190129911 +0200
+@@ -8,7 +8,7 @@ dnl ##
  
- AC_PREREQ(2.60)
+ AC_PREREQ(2.63)
  AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [rpm-devel@rpm5.org])
--AC_INIT(rpm, [5.1.9], [PACKAGE_BUGREPORT_DEFAULT])
-+AC_INIT(rpm, [5.1.9], PACKAGE_BUGREPORT_DEFAULT)
- PACKAGE_TIMESTAMP="2009-04-18" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
+-AC_INIT([rpm],[5.2.0],[PACKAGE_BUGREPORT_DEFAULT])
++AC_INIT([rpm],[5.2.0],PACKAGE_BUGREPORT_DEFAULT)
+ PACKAGE_TIMESTAMP="2009" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
  AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
  

diff --git a/rpm-macros.patch b/rpm-macros.patch
index eb923fc75ed6f6f6f453054776ff680b0eb97ee6..a22032089147a11cb31c1650d7effe5cd42f202c 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,7 +1,6 @@
-diff -urN rpm.org/macros.in rpm/macros.in
---- rpm.org/macros.in  2007-10-02 20:46:56.430390000 +0200
-+++ rpm/macros.in      2007-10-02 20:49:01.480941544 +0200
-@@ -213,7 +213,7 @@
+--- rpm-5.2.0/macros.in.wiget  2010-04-24 18:05:03.413900239 +0200
++++ rpm-5.2.0/macros.in        2010-04-24 18:06:23.963891557 +0200
+@@ -220,7 +220,7 @@ pakietu oraz przy odpluskwianiu samego p
  %endif\
  %{nil}
  
@@ -10,9 +9,12 @@ diff -urN rpm.org/macros.in rpm/macros.in
  
  #     The path to the pgp executable (legacy, use %{__pgp} instead).
  %_pgpbin              %{__pgp}
-@@ -242,12 +242,12 @@
- #     The directory where newly built source packages will be written.
- %_srcrpmdir           %{_topdir}/SRPMS
+@@ -253,14 +253,14 @@ pakietu oraz przy odpluskwianiu samego p
+ %_buildrootdir                @BUILDROOTDIR_MACRO@
+ 
+ #       Build root path, where %install installs the package during build.
+-%buildroot              %{_buildrootdir}/%{name}-root
++%buildroot            %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
  
 -#     Directory where temporaray files can be created.
 -%_tmppath             %{_var}/tmp
@@ -25,19 +27,10 @@ diff -urN rpm.org/macros.in rpm/macros.in
 +%_topdir              %(echo $HOME)/rpm
  
  #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -257,7 +257,7 @@
- #     Configurable build root path, same as BuildRoot: in a specfile.
- #     (Note: the configured macro value will override the spec file value).
- #
--%buildroot            %{_tmppath}/%{name}-root
-+%buildroot            %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
- 
- #     The sub-directory (relative to %{_builddir}) where sources are compiled.
- #     This macro is set after processing %setup, either explicitly from the
-@@ -356,8 +356,8 @@
- #             "w9.bzdio"      bzip2 level 9.
- #             "w9.lzdio"      lzma level 9.
+ # ---- Optional macros.
+@@ -367,8 +367,8 @@ pakietu oraz przy odpluskwianiu samego p
+ #             "w6.lzdio"      lzma level 6 (legacy, stable).
+ #             "w6.xzdio"      xz level 6 (obsoletes lzma, unstable).
  #
 -#%_source_payload     w9.gzdio
 -#%_binary_payload     w9.gzdio
@@ -46,7 +39,7 @@ diff -urN rpm.org/macros.in rpm/macros.in
  
  #     Archive formats to use for source/binary package payloads.
  #             "cpio"          cpio archive (default)
-@@ -1224,17 +1224,17 @@
+@@ -1411,17 +1411,17 @@ print (t)\
  %_exec_prefix         %{_prefix}
  %_bindir              %{_exec_prefix}/bin
  %_sbindir             %{_exec_prefix}/sbin
@@ -69,8 +62,8 @@ diff -urN rpm.org/macros.in rpm/macros.in
 +%_mandir              %{_prefix}/share/man
  %_localedir           %{_datadir}/locale
  
- #==============================================================================
-@@ -1535,7 +1535,33 @@
+ %_initrddir           %{_sysconfdir}/rc.d/init.d
+@@ -1755,7 +1755,33 @@ PreReq: python >= %{python_version}, pyt
  # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
  #%__executable_provides       %{_rpmhome}/executabledeps.sh --provides
  #%__executable_requires       %{_rpmhome}/executabledeps.sh --requires

diff --git a/rpm-old-fileconflicts-behaviour.patch b/rpm-old-fileconflicts-behaviour.patch
index ad163a69db7f76edab0535aa838893b0b55230f8..f10ad1af2e7f41c44ec3afdee27e7f706beb889a 100644 (file)
--- a/rpm-old-fileconflicts-behaviour.patch
+++ b/rpm-old-fileconflicts-behaviour.patch
@@ -1,23 +1,11 @@
---- rpm/lib/poptI.c.orig       2007-07-24 16:36:47.000000000 +0200
-+++ rpm/lib/poptI.c    2007-10-02 15:11:29.213848100 +0200
-@@ -17,7 +17,7 @@
+--- rpm-5.2.0/lib/poptI.c.wiget        2009-04-12 03:25:45.000000000 +0200
++++ rpm-5.2.0/lib/poptI.c      2010-04-25 22:59:14.467664549 +0200
+@@ -21,7 +21,7 @@ extern time_t get_date(const char * p, v
  /*@-fullinitblock@*/
  /*@unchecked@*/
  struct rpmQVKArguments_s rpmIArgs = {
--    .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
-+    .probFilter = 0,
- };
- /*@=fullinitblock@*/
- 
-@@ -275,10 +275,6 @@
-       N_("skip files with leading component <path> "),
-       N_("<path>") },
- 
-- { "fileconflicts", '\0', POPT_BIT_CLR, &rpmIArgs.probFilter,
--      (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
--      N_("detect file conflicts between packages"), NULL},
--
-  { "freshen", 'F', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags,
-       (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL),
-       N_("upgrade package(s) if already installed"),
-
+-#if defined(RPM_VENDOR_MANDRIVA) /* dont-filter-install-file-conflicts */
++#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) /* dont-filter-install-file-conflicts */
+     .probFilter = RPMPROB_FILTER_NONE,
+ #else
+     .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),

diff --git a/rpm.spec b/rpm.spec
index f4d8fdf8d9e468bbf8df3064a5fcf349fbf25e7c..ef3e82883af9069c2a609557f5a1fe522b1db9ae 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -53,7 +53,7 @@ ERROR
 %define                reqdb_ver       4.7.25
 %define                reqpopt_ver     1.15
 %define                beecrypt_ver    2:4.1.2-4
-%define                sover   5.0
+%define                sover   5.2
 
 Summary:       RPM Package Manager
 Summary(de.UTF-8):     RPM Packet-Manager
@@ -63,12 +63,12 @@ Summary(pt_BR.UTF-8):       Gerenciador de pacotes RPM
 Summary(ru.UTF-8):     Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
-Version:       5.1.9
-Release:       0.2
+Version:       5.2.0
+Release:       0.1
 License:       LGPL
 Group:         Base
-Source0:       http://rpm5.org/files/rpm/rpm-5.1/%{name}-%{version}.tar.gz
-# Source0-md5: 2b6ff8f7abb1fe919402f00cc0ca56f7
+Source0:       http://rpm5.org/files/rpm/rpm-5.2/%{name}-%{version}.tar.gz
+# Source0-md5: 9126c960be02f2b0d6068801aa27fde7
 Source1:       %{name}.groups
 Source2:       %{name}.platform
 Source3:       %{name}-install-tree
@@ -138,6 +138,8 @@ Patch38:    %{name}-perl_req-use_base.patch
 Patch39:       %{name}-perl_req-skip_multiline.patch
 Patch40:       %{name}-perl_req-heredocs_pod.patch
 
+Patch41:       vendor-pld.patch
+
 Patch42:       %{name}-old-fileconflicts-behaviour.patch
 
 Patch46:       %{name}-mono.patch
@@ -675,7 +677,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 # compress doc in upstream
 %patch10 -p1
 %{?with_system_lua:%patch11 -p1}
-%patch12 -p1
+#patch12 -p1
 # CHECK ME - macrofiles: ~/etc could be used
 #%%patch14 -p1
 %patch16 -p1
@@ -703,9 +705,10 @@ install %{SOURCE12} scripts/perl.prov
 %patch35 -p0
 %patch36 -p1
 %patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
+#patch38 -p1 applied
+#patch39 -p1 applied
+#patch40 -p1 applied
+%patch41 -p1
 %patch42 -p1
 %patch46 -p1
 # port to new implementation
@@ -724,7 +727,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch61 -p1
 %endif
 %patch62 -p1
-%patch70 -p1
+%patch70 -p1 -b .wiget
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -1081,7 +1084,7 @@ rm $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
 # wrong location, not used anyway
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd}
 # utils dropped in 4.4.8 -- their manuals
-rm $RPM_BUILD_ROOT%{_mandir}/{,*/}/man8/rpmgraph.8
+#rm $RPM_BUILD_ROOT%{_mandir}/{,*/}/man8/rpmgraph.8
 
 %find_lang %{name}
 
@@ -1158,6 +1161,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/macros
 %{_rpmlibdir}/macros.pld
+%{_rpmlibdir}/cpuinfo.yaml
 
 %attr(755,root,root) %{_rpmlibdir}/hrmib-cache
 
@@ -1203,18 +1207,20 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %files utils
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rpm2cpio
-%attr(755,root,root) %{_bindir}/rpmcache
 %attr(755,root,root) %{_bindir}/rpmconstant
-%attr(755,root,root) %{_bindir}/rpmdigest
-%attr(755,root,root) %{_bindir}/rpmgrep
-%attr(755,root,root) %{_bindir}/rpmrepo
-%attr(755,root,root) %{_bindir}/rpmmtree
-%attr(755,root,root) %{_rpmlibdir}/debugedit
 %attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh
-%attr(755,root,root) %{_rpmlibdir}/rpmcmp
 %attr(755,root,root) %{_rpmlibdir}/rpmdb_loadcvt
-%attr(755,root,root) %{_rpmlibdir}/rpmdeps
 %attr(755,root,root) %{_rpmlibdir}/tgpg
+%dir %{_rpmlibdir}/bin
+%attr(755,root,root) %{_rpmlibdir}/bin/debugedit
+%attr(755,root,root) %{_rpmlibdir}/bin/grep
+%attr(755,root,root) %{_rpmlibdir}/bin/mtree
+%attr(755,root,root) %{_rpmlibdir}/bin/rpmcache
+%attr(755,root,root) %{_rpmlibdir}/bin/rpmcmp
+%attr(755,root,root) %{_rpmlibdir}/bin/rpmdeps
+%attr(755,root,root) %{_rpmlibdir}/bin/rpmdigest
+%attr(755,root,root) %{_rpmlibdir}/bin/rpmkey
+%attr(755,root,root) %{_rpmlibdir}/bin/rpmrepo
 %{_mandir}/man1/rpmgrep.1*
 %{_mandir}/man8/rpm2cpio.8*
 %{_mandir}/man8/rpmcache.8*
@@ -1305,8 +1311,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %attr(755,root,root) %{_bindir}/gendiff
 %attr(755,root,root) %{_bindir}/rpmbuild
-%attr(755,root,root) %{_bindir}/rpmspecdump
-%attr(755,root,root) %{_bindir}/rpmwget
+%attr(755,root,root) %{_rpmlibdir}/bin/rpmspecdump
+%attr(755,root,root) %{_rpmlibdir}/bin/wget
 
 %dir %{_rpmlibdir}/helpers
 %attr(755,root,root) %{_rpmlibdir}/helpers/makeshlibs