- updated mono,javadeps patches to stop using javadeps by default

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index b6a340233938b022edb2e34b96ed2399d1ba0181..05d891ab1522bd27e918f4eccc312d5269cdd4ee 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -35,7 +35,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.4.9
-Release:       0.1
+Release:       0.2
 License:       GPL
 Group:         Base
 Source0:       ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -72,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}-Nmalloc.patch
 Patch12:       %{name}-system_libs.patch
 Patch13:       %{name}-bb-and-short-circuit.patch
 Patch14:       %{name}-etc_dir.patch
@@ -105,6 +105,7 @@ Patch42:    %{name}-old-fileconflicts-behaviour.patch
 Patch44:       %{name}-no-neon.patch
 Patch45:       %{name}-no-sqlite.patch
 Patch46:       %{name}-mono.patch
+Patch47:       %{name}-javadeps.patch
 
 Patch49:       %{name}-p4.patch
 Patch50:       %{name}-macros.patch
@@ -116,6 +117,7 @@ Patch55:    %{name}-truncate-cvslog.patch
 Patch57:       %{name}-as_needed-fix.patch
 Patch58:       %{name}-repackage-wo-lzma.patch
 Patch59:       %{name}-libtool-deps.patch
+Patch60:       %{name}-obsolete-rpmrc.patch
 URL:           http://wraptastic.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.4
@@ -165,7 +167,7 @@ Requires:   popt >= %{reqpopt_ver}
 %{!?with_static:Obsoletes:     rpm-utils-static}
 Conflicts:     glibc < 2.2.92
 # ABI changes in rpm, new poldek needed
-Conflicts:     poldek < 0.20.1-0.20070105.0
+Conflicts:     poldek < 0.20.1-0.20070108.1.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _binary_payload         w9.gzdio
@@ -379,7 +381,7 @@ Bibliotecas estáticas para desenvolvimento.
 бібліотека RPM.
 
 %package utils
-Summary:       Additional utilities for managing rpm packages and database
+Summary:       Additional utilities for managing RPM packages and database
 Summary(de.UTF-8):     Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Summary(pl.UTF-8):     Dodatkowe narzędzia do zarządzania bazą RPM-a i pakietami
 Group:         Applications/File
@@ -387,7 +389,7 @@ Requires:   %{name} = %{version}-%{release}
 Requires:      popt >= %{reqpopt_ver}
 
 %description utils
-Additional utilities for managing rpm packages and database.
+Additional utilities for managing RPM packages and database.
 
 %description utils -l de.UTF-8
 Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken.
@@ -396,7 +398,7 @@ Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken.
 Dodatkowe narzędzia do zarządzania bazą RPM-a i pakietami.
 
 %package utils-perl
-Summary:       Additional utilities for managing rpm packages and database
+Summary:       Additional utilities for managing RPM packages and database
 Summary(de.UTF-8):     Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Summary(pl.UTF-8):     Dodatkowe narzędzia do zarządzania bazą RPM-a i pakietami
 Group:         Applications/File
@@ -404,7 +406,7 @@ Requires:   %{name}-utils = %{version}-%{release}
 Requires:      popt >= %{reqpopt_ver}
 
 %description utils-perl
-Additional utilities for managing rpm packages and database.
+Additional utilities for managing RPM packages and database.
 
 %description utils-perl -l de.UTF-8
 Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken.
@@ -527,56 +529,74 @@ construir pacotes usando o RPM.
 Різноманітні допоміжні скрипти та утиліти, які використовуються для
 побудови RPM'ів.
 
+%package javaprov
+Summary:       Additional utilities for checking Java provides/requires in RPM packages
+Summary(pl.UTF-8):     Dodatkowe narzędzia do sprawdzania zależności kodu w Javie w pakietach RPM
+Group:         Applications/File
+Requires:      %{name} = %{version}-%{release}
+Requires:      file
+Requires:      findutils >= 1:4.2.26
+Requires:      mktemp
+Requires:      unzip
+
+%description javaprov
+Additional utilities for checking Java provides/requires in RPM
+packages.
+
+%description javaprov -l pl.UTF-8
+Dodatkowe narzędzia do sprawdzania zależności kodu w Javie w pakietach
+RPM.
+
 %package perlprov
-Summary:       Additional utilities for checking perl provides/requires in rpm packages
+Summary:       Additional utilities for checking Perl provides/requires in RPM packages
 Summary(de.UTF-8):     Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen
-Summary(pl.UTF-8):     Dodatkowe narzędzia do sprawdzenia zależności skryptów perla w pakietach rpm
+Summary(pl.UTF-8):     Dodatkowe narzędzia do sprawdzenia zależności skryptów Perla w pakietach RPM
 Group:         Applications/File
 Requires:      %{name} = %{version}-%{release}
 Requires:      perl-devel
 Requires:      perl-modules
 
 %description perlprov
-Additional utilities for checking perl provides/requires in rpm
+Additional utilities for checking Perl provides/requires in RPM
 packages.
 
 %description perlprov -l de.UTF-8
 Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen.
 
 %description perlprov -l pl.UTF-8
-Dodatkowe narzędzia do sprawdzenia zależności skryptów perla w
-pakietach rpm.
+Dodatkowe narzędzia do sprawdzenia zależności skryptów Perla w
+pakietach RPM.
 
 %package pythonprov
-Summary:       Python macros, which simplifies creation of rpm packages with Python software
-Summary(pl.UTF-8):     Makra ułatwiające tworzenie pakietów rpm z programami napisanymi w Pythonie
+Summary:       Python macros, which simplifies creation of RPM packages with Python software
+Summary(pl.UTF-8):     Makra ułatwiające tworzenie pakietów RPM z programami napisanymi w Pythonie
 Group:         Applications/File
 Requires:      %{name} = %{version}-%{release}
 Requires:      python
 Requires:      python-modules
 
 %description pythonprov
-Python macros, which simplifies creation of rpm packages with Python
+Python macros, which simplifies creation of RPM packages with Python
 software.
 
 %description pythonprov -l pl.UTF-8
-Makra ułatwiające tworzenie pakietów rpm z programami napisanymi w
+Makra ułatwiające tworzenie pakietów RPM z programami napisanymi w
 Pythonie.
 
 %package php-pearprov
-Summary:       Additional utilities for managing rpm packages and database
-Summary(pl.UTF-8):     Dodatkowe narzędzia do sprawdzania zależności skryptów php w rpm
+Summary:       Additional utilities for checking PHP PEAR provides/requires in RPM packages
+Summary(pl.UTF-8):     Dodatkowe narzędzia do sprawdzania zależności skryptów php w RPM
 Group:         Applications/File
 Requires:      %{name} = %{version}-%{release}
 Requires:      sed >= 4.0
 
 %description php-pearprov
-Additional utilities for checking php pear provides/requires in rpm
+Additional utilities for checking PHP PEAR provides/requires in RPM
 packages.
 
 %description php-pearprov -l pl.UTF-8
-Dodatkowe narzędzia do sprawdzenia zależności skryptów php pear w
-pakietach rpm.
+Dodatkowe narzędzia do sprawdzenia zależności skryptów PHP PEAR w
+pakietach RPM.
 
 %package -n python-rpm
 Summary:       Python interface to RPM library
@@ -636,6 +656,7 @@ 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
@@ -667,8 +688,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch28 -p1
 %patch31 -p1
 %patch32 -p1
-# needed? I doubt
-# %patch33 -p1
+%patch33 -p1
 %patch34 -p1
 %patch35 -p0
 %patch36 -p1
@@ -678,6 +698,7 @@ install %{SOURCE12} scripts/perl.prov
 %{!?with_neon:%patch44 -p1}
 %patch45 -p1
 %patch46 -p1
+%patch47 -p1
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
@@ -686,6 +707,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
+%patch60 -p1
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -757,8 +779,6 @@ sed -i -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' -e 's|@host_cpu
        debugedit_LDADD="\$(WITH_LIBELF_LIB) -lpopt" \
        staticLDFLAGS=%{?with_static:-all-static}
 
-%{?with_apidocs:%{__make} doxygen}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner}
@@ -795,7 +815,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 %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-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
@@ -807,8 +827,6 @@ install %{SOURCE33} $RPM_BUILD_ROOT%{_bindir}/banner.sh
 
 install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
 
-install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm
-
 # obsolete but still installed
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/rpmrc
 
@@ -1064,8 +1082,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_rpmlibdir}/mkinstalldirs
 %attr(755,root,root) %{_rpmlibdir}/u_pkg.sh
 %attr(755,root,root) %{_rpmlibdir}/executabledeps.sh
-# needs jar (any jdk), jcf-dump (gcc-java) to work
-%attr(755,root,root) %{_rpmlibdir}/javadeps.sh
 %attr(755,root,root) %{_rpmlibdir}/libtooldeps.sh
 # needs hacked pkg-config to return anything
 %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh
@@ -1096,6 +1112,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/x86_64*
 %endif
 # must be here for "Requires: rpm-*prov" to work
+%{_rpmlibdir}/macros.java
 %{_rpmlibdir}/macros.mono
 %{_rpmlibdir}/macros.perl
 %{_rpmlibdir}/macros.php
@@ -1122,6 +1139,12 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_bindir}/adapter.awk
 %attr(755,root,root) %{_bindir}/pldnotify.awk
 
+%files javaprov
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_rpmlibdir}/java-find-requires
+# needs jar (any jdk), jcf-dump (gcc-java) to work
+%attr(755,root,root) %{_rpmlibdir}/javadeps.sh
+
 %files perlprov
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_rpmlibdir}/perl.*