- updated for 4.4.9 (but probably not needed at all)

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index c1397bdd5eb132470db8ac87a86094f3e8ecc744..777d0fb6968b4d8c1a26aee3769c1336b41efdf7 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -15,6 +15,7 @@
 %bcond_without python          # don't build python bindings
 %bcond_without selinux         # build without selinux support
 %bcond_without system_libmagic # don't use system libmagic
+%bcond_without suggest_tags    # build without Suggest tag (bootstrapping)
 %bcond_with    neon            # build with HTTP/WebDAV support (neon library)
 # force_cc             - force using __cc other than "%{_target_cpu}-pld-linux-gcc"
 # force_cxx            - force using __cxx other than "%{_target_cpu}-pld-linux-g++"
@@ -33,12 +34,12 @@ Summary(pt_BR.UTF-8):       Gerenciador de pacotes RPM
 Summary(ru.UTF-8):     Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
-Version:       4.4.8
+Version:       4.4.9
 Release:       0.1
 License:       GPL
 Group:         Base
 Source0:       ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
-# Source0-md5: dc73bcebf6b206058457c9a90f944c55
+# Source0-md5: 210b768006e7d88dd8a3bcd498ea27f6
 Source1:       %{name}.groups
 Source2:       %{name}.platform
 Source3:       %{name}-install-tree
@@ -87,7 +88,8 @@ Patch25:      %{name}-glob.patch
 Patch26:       %{name}-notsc.patch
 Patch27:       %{name}-hack-norpmlibdep.patch
 Patch28:       %{name}-makefile-no_myLDADD_deps.patch
-
+Patch29:       %{name}-ds.patch
+Patch30:       %{name}-locale.patch
 Patch31:       %{name}-missing-prototypes.patch
 Patch32:       %{name}-pld-autodep.patch
 Patch33:       %{name}-arch-x86_64.patch
@@ -96,7 +98,7 @@ Patch35:      %{name}-perl_req-INC_dirs.patch
 Patch36:       %{name}-debuginfo.patch
 Patch37:       %{name}-doxygen_hack.patch
 Patch38:       %{name}-empty-rpmlock-path.patch
-
+Patch39:       %{name}-version.patch
 Patch41:       %{name}-reduce-stack-usage.patch
 Patch42:       %{name}-old-fileconflicts-behaviour.patch
 
@@ -267,7 +269,7 @@ Requires:   popt >= %{reqpopt_ver}
 Obsoletes:     rpm-libs
 # avoid SEGV caused by mixed db versions
 Conflicts:     poldek < 0.18.1-16
-Suggests:      lzma
+%{?with_suggest_tags:Suggests: lzma}
 
 %description lib
 RPMs library.
@@ -625,7 +627,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 
 %prep
 %setup -q
-%patch0 -p1
+# merged
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -636,7 +639,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
+# obsolete
+#%patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
@@ -657,28 +661,42 @@ install %{SOURCE5} scripts/find-lang.sh
 install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
-%patch19 -p1
+# obsolete
+#%patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-%patch24 -p1
-%patch25 -p1
+# merged
+#%patch24 -p1
+# merged
+#%patch25 -p1
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+# merged
+#%patch29 -p1
+# merged
+#%patch30 -p1
 %patch31 -p1
-%patch32 -p1
-%patch33 -p1
+# FIXME!
+# %patch32 -p1
+# merged
+# %patch33 -p1
 %patch34 -p1
 %patch35 -p0
 %patch36 -p1
-%patch37 -p1
-%patch38 -p1
+# FIXME
+#%patch37 -p1
+# CHECK ME
+#%patch38 -p1
+# obsolete
+#%patch39 -p1
 %patch41 -p1
 %patch42 -p1
 %{!?with_neon:%patch44 -p1}
-%patch45 -p1
+# WTF? this is merged?
+#%patch45 -p1
 %patch46 -p1
 %patch49 -p1
 %patch50 -p1
@@ -688,7 +706,8 @@ install %{SOURCE12} scripts/perl.prov
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
-%patch64 -p1
+# CHECK ME
+#%patch64 -p1
 
 cd scripts
 mv -f perl.req perl.req.in