- update to 5.1b2

Changed files:
    rpm-doxygen_hack.patch -> 1.11
    rpm-macros-th.patch -> 1.4
    rpm-macros.patch -> 1.46
    rpm.spec -> 1.892

diff --git a/rpm-doxygen_hack.patch b/rpm-doxygen_hack.patch
index 2b1244cb4e66253d02c65feddca9f23193a0a9c6..1cff510d52ed27b414236ce60cc69aa17a1ba14d 100644 (file)
--- a/rpm-doxygen_hack.patch
+++ b/rpm-doxygen_hack.patch
@@ -1,10 +1,10 @@
---- rpm-4.4.9/Doxyfile.in.orig 2007-05-13 05:20:43.000000000 +0200
-+++ rpm-4.4.9/Doxyfile.in      2007-05-22 17:41:12.107028314 +0200
-@@ -504,7 +504,6 @@
+--- rpm-5.1b2/Doxyfile.in~     2008-04-13 19:14:33.000000000 +0300
++++ rpm-5.1b2/Doxyfile.in      2008-04-13 19:15:06.904571320 +0300
+@@ -503,7 +503,6 @@
                           @top_srcdir@/doc/manual/spec \
                           @top_srcdir@/doc/manual/triggers \
                           @top_srcdir@/doc/manual/tsort \
 -                         @top_srcdir@/file/src/tar.h \
-                          @top_srcdir@/lib/cpio.c \
-                          @top_srcdir@/lib/cpio.h \
                           @top_srcdir@/lib/depends.c \
+                          @top_srcdir@/lib/formats.c \
+                          @top_srcdir@/lib/fs.c \

diff --git a/rpm-macros-th.patch b/rpm-macros-th.patch
index f654c3b84ab3fddc7531edf5d1b825ee67a17508..3597b7b4c88af7b60e145a597749e139efca93f1 100644 (file)
--- a/rpm-macros-th.patch
+++ b/rpm-macros-th.patch
@@ -1,5 +1,5 @@
---- rpm-5.0.3/macros.in        2008-03-27 19:38:53.797722786 +0200
-+++ rpm-4.4.9/macros.in        2008-04-04 23:06:29.374285032 +0300
+--- rpm-5.1b2/macros.in~       2008-04-13 19:16:37.000000000 +0300
++++ rpm-5.1b2/macros.in        2008-04-13 19:16:57.396520131 +0300
 @@ -282,6 +282,9 @@
  #
  #%distribution
@@ -10,10 +10,11 @@
  #     Configurable distribution URL, same as DistURL: tag in a specfile.
  #     The URL will be used to supply reliable information to tools like
  #     rpmfind.
-@@ -1464,6 +1467,7 @@
+@@ -1625,7 +1625,7 @@
  # -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
  
  %debugcflags  -O0 -g -Wall
+-%optldflags   -Wl,--as-needed
 +%optldflags   -Wl,--as-needed -Wl,-z,relro -Wl,-z,-combreloc
  
  # Warning: those macros are overwritten by macros.build,

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 43d56e3f82d0c3852c6eeba92c4ed59b81952bb6..4cb7be85c68fa527f51c9d09a9953dcdbe1f07ee 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -46,15 +46,6 @@ diff -urN rpm.org/macros.in rpm/macros.in
  
  #     Archive formats to use for source/binary package payloads.
  #             "cpio"          cpio archive (default)
-@@ -522,7 +522,7 @@
- 
- #
- # Path to magic file used for file classification.
--%_rpmfc_magic_path    %{_rpmhome}/magic
-+%_rpmfc_magic_path    /usr/share/file/magic
- 
- #==============================================================================
- # ---- Database configuration macros.
 @@ -1224,17 +1224,17 @@
  %_exec_prefix         %{_prefix}
  %_bindir              %{_exec_prefix}/bin

diff --git a/rpm.spec b/rpm.spec
index 9253860dd201418e4e5c10dd6f70a75003e7754a..a5222203b9f8e861cb9ad8df4f3eaefdfa46ba88 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -48,12 +48,14 @@
 ERROR
 %endif
 
-#
 # versions of required libraries
-%define        reqdb_ver       4.6.18
-%define        reqpopt_ver     1.10.8
-%define        beecrypt_ver    2:4.1.2-4
-%define        sover   5.0
+%define                reqdb_ver       4.6.18
+%define                reqpopt_ver     1.10.8
+%define                beecrypt_ver    2:4.1.2-4
+%define                sover   5.1
+
+%define                subver  b2
+%define                rel             0.1
 Summary:       RPM Package Manager
 Summary(de.UTF-8):     RPM Packet-Manager
 Summary(es.UTF-8):     Gestor de paquetes RPM
@@ -62,12 +64,12 @@ Summary(pt_BR.UTF-8):       Gerenciador de pacotes RPM
 Summary(ru.UTF-8):     Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
-Version:       5.0.3
-Release:       0.2
+Version:       5.1
+Release:       0.%{subver}.%{rel}
 License:       LGPL
 Group:         Base
-Source0:       http://rpm5.org/files/rpm/rpm-5.0/%{name}-%{version}.tar.gz
-# Source0-md5: b3df4e54e84cf3344ce6b76fa2a8d5bf
+Source0:       http://rpm5.org/files/rpm/rpm-5.1/%{name}-%{version}b2.tar.gz
+# Source0-md5: 11950912cb8e5f3353fd6c95cfbc650f
 Source1:       %{name}.groups
 Source2:       %{name}.platform
 Source3:       %{name}-install-tree
@@ -116,6 +118,7 @@ Patch11:    %{name}-lua.patch
 
 Patch14:       %{name}-etc_dir.patch
 Patch16:       %{name}-php-deps.patch
+Patch17:       %{name}-macros.patch
 Patch18:       %{name}-macros-th.patch
 
 Patch23:       %{name}-pkgconfigdeps.patch
@@ -625,7 +628,7 @@ Esse pacote deve ser instalado se você quiser desenvolver programas em
 Python para manipular pacotes e bancos de dados RPM.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?subver}
 
 # APPLIED ALREADY? translationproject.org is used now
 #%%patch0 -p1
@@ -673,6 +676,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch55 -p1
 %patch58 -p1
 %patch59 -p1
+%patch17 -p1
 %patch18 -p1
 %ifarch sparc64
 %patch61 -p1