- merged macros.java and find-java-requires script from AC-branch

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 22d0d4915d6834d3f9bf6dc94ef4382fb2591d21..b6a340233938b022edb2e34b96ed2399d1ba0181 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
@@ -53,6 +54,8 @@ Source11:     %{name}.sysinfo
 Source12:      perl.prov
 Source13:      %{name}-user_group.sh
 Source14:      %{name}.sysconfig
+Source15:      %{name}-macros.java
+Source16:      %{name}-java-requires
 Source30:      builder
 Source31:      adapter.awk
 Source32:      pldnotify.awk
@@ -69,7 +72,7 @@ Patch7:               %{name}-scripts-closefds.patch
 Patch8:                %{name}-python-macros.patch
 Patch9:                %{name}-gettext-in-header.patch
 Patch10:       %{name}-compress-doc.patch
-Patch11:       %{name}-rpmdeps-segv.patch
+
 Patch12:       %{name}-system_libs.patch
 Patch13:       %{name}-bb-and-short-circuit.patch
 Patch14:       %{name}-etc_dir.patch
@@ -95,7 +98,6 @@ Patch34:      %{name}-epoch0.patch
 Patch35:       %{name}-perl_req-INC_dirs.patch
 Patch36:       %{name}-debuginfo.patch
 Patch37:       %{name}-doxygen_hack.patch
-Patch38:       %{name}-empty-rpmlock-path.patch
 
 Patch41:       %{name}-reduce-stack-usage.patch
 Patch42:       %{name}-old-fileconflicts-behaviour.patch
@@ -114,8 +116,6 @@ Patch55:    %{name}-truncate-cvslog.patch
 Patch57:       %{name}-as_needed-fix.patch
 Patch58:       %{name}-repackage-wo-lzma.patch
 Patch59:       %{name}-libtool-deps.patch
-
-Patch64:       %{name}-iconv-translit.patch
 URL:           http://wraptastic.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.4
@@ -267,7 +267,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.
@@ -636,7 +636,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
@@ -668,12 +667,12 @@ install %{SOURCE12} scripts/perl.prov
 %patch28 -p1
 %patch31 -p1
 %patch32 -p1
-%patch33 -p1
+# needed? I doubt
+# %patch33 -p1
 %patch34 -p1
 %patch35 -p0
 %patch36 -p1
 %patch37 -p1
-%patch38 -p1
 %patch41 -p1
 %patch42 -p1
 %{!?with_neon:%patch44 -p1}
@@ -687,7 +686,6 @@ install %{SOURCE12} scripts/perl.prov
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
-%patch64 -p1
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -732,8 +730,6 @@ cd ..
 # rpm checks for CPU type at runtime, but it looks better
 sed -i -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' -e 's|@host_cpu@|%{_target_cpu}|' macros.in
 
-CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS
-
 # pass CC and CXX too in case of building with some older configure macro
 # disable perl-RPM2 build, we have it in separate spec
 %configure \
@@ -791,6 +787,7 @@ install macros.perl $RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl
 install macros.python  $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python
 install macros.php     $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php
 install macros.mono    $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono
+install %{SOURCE15}    $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java
 
 install %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
@@ -798,6 +795,7 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond
 install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc
 install %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/check-files
 install %{SOURCE13} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
+install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/find-java-requires
 install scripts/find-php*      $RPM_BUILD_ROOT%{_rpmlibdir}
 install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir}
 install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm
@@ -1023,7 +1021,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_bindir}/rpmdeps
 %{!?with_system_libmagic:%attr(755,root,root) %{_bindir}/rpmfile}
 %attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh
-%attr(755,root,root) %{_rpmlibdir}/rpm2cpio.sh
 %attr(755,root,root) %{_rpmlibdir}/tgpg
 %attr(755,root,root) %{_rpmlibdir}/rpmdb_loadcvt
 %{_mandir}/man8/rpm2cpio.8*