rpm-lfind patch replaced by rpm-alAddPackage.patch

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 921d5264f235b3deab1d4309002e0cba41a14238..2590e7f78a83f99f2eecd7ee5dcfb0e3bbc808ea 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,12 +1,13 @@
 Summary:       Red Hat (and now also PLD) Package Manager
 Summary:       Red Hat (and now also PLD) Package Manager

+Summary(de):   Red Hat (und jetzt auch PLD) Packet-Manager

 Summary(pl):   Aplikacja do zarz±dzania pakietami
 Name:          rpm
 Version:       4.0.2
 Summary(pl):   Aplikacja do zarz±dzania pakietami
 Name:          rpm
 Version:       4.0.2

-Release:       2
+Release:       18
+License:       GPL

 Group:         Base
 Group(de):     Gründsätzlich
 Group(pl):     Podstawowe
 Group:         Base
 Group(de):     Gründsätzlich
 Group(pl):     Podstawowe

-License:       GPL

 Source0:       ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/%{name}-%{version}.tar.gz
 Source1:       %{name}.groups
 Source2:       %{name}.macros
 Source0:       ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/%{name}-%{version}.tar.gz
 Source1:       %{name}.groups
 Source2:       %{name}.macros


@@ -17,31 +18,29 @@ Source6:    %{name}-find-perl-provides
 Source7:       %{name}-find-perl-requires
 Source8:       %{name}-find-spec-bcond
 Source9:       %{name}-find-lang
 Source7:       %{name}-find-perl-requires
 Source8:       %{name}-find-spec-bcond
 Source9:       %{name}-find-lang

+Source10:      %{name}-find-provides
+Source11:      %{name}-find-requires

 Patch0:                %{name}-rpmrc.patch
 Patch0:                %{name}-rpmrc.patch

-Patch1:                %{name}-find-requires.patch
-Patch2:                %{name}-macros.patch
-Patch3:                %{name}-arch.patch
-Patch4:                %{name}-rpmpopt.patch
-Patch5:                %{name}-find-provides.patch
-Patch6:                %{name}-perl-macros.patch
-Patch7:                %{name}-file3.31.patch
-Patch8:                %{name}-exclude-examples-doc.patch
-Patch9:                %{name}-db3.patch
-Patch10:       %{name}-rpm-v1.patch
-#Patch11:      %{name}-rpmlibprov.patch
-Patch12:       %{name}-segv.patch
-#Patch13:        %{name}-rpmlibprov-order.patch
-Patch14:       %{name}-am_fix.patch
-Patch15:       %{name}-perl-req-perlfile.patch
-Patch16:       %{name}-installplatform.patch
-Patch17:       %{name}-cache.patch
-Patch18:       %{name}-suggestions.patch
-Patch19:       %{name}-rh-lame.patch
+Patch1:                %{name}-macros.patch
+Patch2:                %{name}-arch.patch
+Patch3:                %{name}-rpmpopt.patch
+Patch4:                %{name}-perl-macros.patch
+Patch5:                %{name}-db3.patch
+Patch6:                %{name}-segv.patch
+Patch7:                %{name}-am_fix.patch
+Patch8:                %{name}-perl-req-perlfile.patch
+Patch9:                %{name}-installplatform.patch
+Patch10:       %{name}-cache.patch
+Patch11:       %{name}-suggestions.patch
+Patch12:       %{name}-rh-lame.patch
+Patch13:       %{name}-glob.patch
+Patch14:       %{name}-header_h.patch  
+Patch15:       %{name}-fast-alAddPackage.patch

 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 BuildRequires: gettext-devel
 BuildRequires: automake
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 BuildRequires: gettext-devel
 BuildRequires: automake

-BuildRequires: db3-devel >= 3.1.17
+BuildRequires: db3-devel >= 3.1.17-9

 BuildRequires: bzip2-devel >= 1.0.1
 BuildRequires: gdbm-devel
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel >= 1.0.1
 BuildRequires: gdbm-devel
 BuildRequires: zlib-devel


@@ -49,15 +48,16 @@ BuildRequires:      gettext-devel >= 0.10.38-3
 BuildRequires: libtool
 BuildRequires: automake
 BuildRequires: autoconf >= 2.13-8
 BuildRequires: libtool
 BuildRequires: automake
 BuildRequires: autoconf >= 2.13-8

-%if %{!?bcond_off_static:1}%{?bcond_off_static:0}
+BuildRequires: python-modules >= 2.2.1

 BuildRequires: zlib-devel >= 1.1.4
 # Require static library only for static build
 BuildRequires: zlib-devel >= 1.1.4
 # Require static library only for static build

-BuildRequires: db3-static >= 3.1.17
+BuildRequires: db3-static >= 3.1.17-9

 BuildRequires: bzip2-static >= 1.0.1
 BuildRequires: gdbm-static
 BuildRequires: zlib-static
 %endif
 BuildRequires: zlib-static >= 1.1.4
 BuildRequires: bzip2-static >= 1.0.1
 BuildRequires: gdbm-static
 BuildRequires: zlib-static
 %endif
 BuildRequires: zlib-static >= 1.1.4

+Obsoletes:     rpm-libs

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     rpm-libs
 %define __find_provides %{SOURCE4}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     rpm-libs
 %define __find_provides %{SOURCE4}


@@ -69,6 +69,13 @@ Obsoletes:   rpm-libs
 RPM is a powerful package manager, which can be used to build,
 install, query, verify, update, and uninstall individual software
 packages. A package consists of an archive of files, and package
 RPM is a powerful package manager, which can be used to build,
 install, query, verify, update, and uninstall individual software
 packages. A package consists of an archive of files, and package

+information, including name, version, and description.
+
+%description -l de
+RPM ist ein kräftiger Packet-Manager, der verwendet sein kann zur
+Installation, Anfrage, Verifizierung, Aktualisierung und
+Uninstallation individueller Softwarepakete. Ein Paket besteht aus
+einem Archiv Dateien und Paketinformation, inklusive Name, Version und

 nombre, versión y descripción.
 RPM jest doskona³ym menad¿erem pakietów. Dziêki niemu bêdziesz móg³
 %description -l pl
 nombre, versión y descripción.
 RPM jest doskona³ym menad¿erem pakietów. Dziêki niemu bêdziesz móg³
 %description -l pl


@@ -77,30 +84,15 @@ wchodz
 przechowywane s± w bazie danych i mo¿na je uzyskaæ za pomoc± opcji
 wchodz±cych w sk³ad pakietu, zale¿no¶ci od innych pakietów, s±
 przechowywane w bazie danych i mo¿na je uzyskaæ za pomoc± opcji
 przechowywane s± w bazie danych i mo¿na je uzyskaæ za pomoc± opcji
 wchodz±cych w sk³ad pakietu, zale¿no¶ci od innych pakietów, s±
 przechowywane w bazie danych i mo¿na je uzyskaæ za pomoc± opcji

-%package libs
-Summary:       RPM shared libraries
-Summary(pl):   Biblioteki wspó³dzielone rpm-a
-Group:         Libraries
-Group(de):     Libraries
-Group(es):     Bibliotecas
-Group(fr):     Librairies
-Group(pl):     Biblioteki
-Requires:      %{name} = %{version}
-
-%description libs
-RPM shared libraries.
-
-%description -l pl libs
-Biblioteki wspó³dzielone rpm-a.
-

 do pacote, permissões dos arquivos, etc.
 do pacote, permissões dos arquivos, etc.

-Summary:       Header files and libraries 
+
+%package devel

 Summary(pl):   Pliki nag³ówkowe i biblioteki statyczne 
 Summary(pl):   Pliki nag³ówkowe i biblioteki statyczne
 Group(de):     Entwicklung/Libraries
 Group(fr):     Development/Librairies
 Group(pl):     Programowanie/Biblioteki
 Summary(pl):   Pliki nag³ówkowe i biblioteki statyczne 
 Summary(pl):   Pliki nag³ówkowe i biblioteki statyczne
 Group(de):     Entwicklung/Libraries
 Group(fr):     Development/Librairies
 Group(pl):     Programowanie/Biblioteki

-Requires:      %{name}-libs = %{version}
+Summary(pt_BR):        Arquivos de inclusão e bibliotecas para programas de manipulação de pacotes RPM

 Group:         Development/Libraries
 Requires:      %{name} = %{version}
 Requires:      popt-devel
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
 Requires:      popt-devel


@@ -109,11 +101,18 @@ Requires: popt-devel
 The RPM packaging system includes a C library that makes it easy to
 manipulate RPM packages and databases. It is intended to ease the
 creation of graphical package managers and other tools that need
 The RPM packaging system includes a C library that makes it easy to
 manipulate RPM packages and databases. It is intended to ease the
 creation of graphical package managers and other tools that need

+%description -l de devel
+
+%description devel -l de
+Der RPM-Packensystem enthält eine C-Library, die macht es einfach
+RPM-Pakete und Dateibanken zu manipulieren. Er eignet sich für
+Vereinfachung des Schaffens grafischer Paket-Manager und anderer

 %description -l pl devel
 Pliki nag³ówkowe i biblioteki statyczne.
 graficznych mened¿erów pakietów oraz innych narzêdzi, które wymagaj±
 ferramentas que precisem de conhecimento profundo de pacotes RPM.
 
 %description -l pl devel
 Pliki nag³ówkowe i biblioteki statyczne.
 graficznych mened¿erów pakietów oraz innych narzêdzi, które wymagaj±
 ferramentas que precisem de conhecimento profundo de pacotes RPM.
 

+%package static

 Summary(pl):   Biblioteki statyczne rpm-a
 Summary(pl):   Biblioteki statyczne RPM-a
 Group(de):     Entwicklung/Libraries
 Summary(pl):   Biblioteki statyczne rpm-a
 Summary(pl):   Biblioteki statyczne RPM-a
 Group(de):     Entwicklung/Libraries


@@ -124,11 +123,15 @@ Group:            Development/Libraries
 Requires:      %{name}-devel = %{version}
 
 %description static
 Requires:      %{name}-devel = %{version}
 
 %description static

+%description -l de static
+
+%description static -l de

 %description -l pl static
 Biblioteki statyczne rpm-a.
 %description static -l pl
 Bibliotecas estáticas para desenvolvimento.
 
 %description -l pl static
 Biblioteki statyczne rpm-a.
 %description static -l pl
 Bibliotecas estáticas para desenvolvimento.
 

+%package utils

 Summary(pl):   Dodatkowe narzêdzia do zarz±dzania baz± rpm-a i pakietami
 Summary(de):   Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Group(de):     Applikationen/Datei
 Summary(pl):   Dodatkowe narzêdzia do zarz±dzania baz± rpm-a i pakietami
 Summary(de):   Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Group(de):     Applikationen/Datei


@@ -138,11 +141,15 @@ Group:            Applications/File
 Requires:      %{name} = %{version}
 
 %description utils
 Requires:      %{name} = %{version}
 
 %description utils

+%description -l de utils
+
+%description utils -l de

 %description -l pl utils
 Dodatkowe narzêdzia do zarz±dzania baz± rpm-a i pakietami.
 %description utils -l pl
 Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami.
 %description -l pl utils
 Dodatkowe narzêdzia do zarz±dzania baz± rpm-a i pakietami.
 %description utils -l pl
 Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami.

-Summary:       Additional utilities for check perl provides/requires in rpm packages
+
+%package perlprov

 Summary(pl):   Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci dla skryptów perl w pakietach rpm
 Summary(de):   Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen
 Group(de):     Applikationen/Datei
 Summary(pl):   Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci dla skryptów perl w pakietach rpm
 Summary(de):   Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen
 Group(de):     Applikationen/Datei


@@ -153,12 +160,16 @@ Requires: findutils
 
 %description perlprov
 Additional utilities for checking perl provides/requires in rpm
 
 %description perlprov
 Additional utilities for checking perl provides/requires in rpm

+%description -l de perlprov
+
+%description perlprov -l de

 %description -l pl perlprov
 Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci dla skryptów perl w
 %description perlprov -l pl
 Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w
 Python para manipular pacotes e bancos de dados RPM.
 
 %description -l pl perlprov
 Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci dla skryptów perl w
 %description perlprov -l pl
 Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w
 Python para manipular pacotes e bancos de dados RPM.
 

+%package build

 Summary(pl):   Skrypty pomocnicze do budowania binarnych RPMów
 Summary(pl):   Skrypty pomocnicze do budowania binarnych RPM-ów
 Group(de):     Applikationen/Datei
 Summary(pl):   Skrypty pomocnicze do budowania binarnych RPMów
 Summary(pl):   Skrypty pomocnicze do budowania binarnych RPM-ów
 Group(de):     Applikationen/Datei


@@ -177,35 +188,35 @@ Requires: diffutils
 Requires:      libtool
 Requires:      glibc-devel
 Requires:      sed
 Requires:      libtool
 Requires:      glibc-devel
 Requires:      sed

+Requires:      sed

 Requires:      tar
 Requires:      textutils
 
 %description build
 Requires:      tar
 Requires:      textutils
 
 %description build

+%description -l de build
+
+%description build -l de

 %description -l pl build
 Skrypty pomocnicze do budowania binarnych RPMów.
 %description build -l pl
 construir pacotes usando o RPM.
 %setup  -q
 %prep
 %description -l pl build
 Skrypty pomocnicze do budowania binarnych RPMów.
 %description build -l pl
 construir pacotes usando o RPM.
 %setup  -q
 %prep

-%patch1 -p1
+%setup -q -a12

 %patch0 -p1
 %patch1 -p1
 %patch0 -p1
 %patch1 -p1

+%patch4 -p1 
+%patch3 -p1

 %patch4 -p1
 %patch5 -p1
 %patch4 -p1
 %patch5 -p1

-%patch6 -p1 
-%patch7 -p1 
-%patch8 -p1
+%patch6 -p1

 %patch7 -p1
 %patch7 -p1

-#%patch10 -p1
-#%patch11 -p1
-%patch12 -p1
-#%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p0
+%patch8 -p1
+%patch11 -p0
+%patch12 -p0
+%patch11 -p0
+%patch12 -p0
+%patch15 -p0

 %patch31 -p1
 install %{SOURCE2} macros.pld.in
 %patch38 -p1
 %patch31 -p1
 install %{SOURCE2} macros.pld.in
 %patch38 -p1


@@ -229,6 +240,7 @@ mv -f perl.prov perl.prov.in)
  automake -a -c)
 autoheader
 %{__automake}
  automake -a -c)
 autoheader
 %{__automake}

+cd ..

 
 autoheader
 autoconf
 
 autoheader
 autoconf


@@ -244,9 +256,7 @@ mv -f lib/Makefile.in.new lib/Makefile.in
        sed 's|@host_cpu@|%{_target_cpu}|' > macros.tmp
        --enable-v1-packages
 %configure \
        sed 's|@host_cpu@|%{_target_cpu}|' > macros.tmp
        --enable-v1-packages
 %configure \

-%{__make} %{?bcond_off_static:rpm_LDFLAGS="\\$(myLDFLAGS)"}
-sed -e 's/#include <rpmio\.h>/#include <rpm\/rpmio\.h>/g' lib/header.h > lib/header.h.new
-mv -f lib/header.h.new lib/header.h
+       --enable-v1-packages \

        --with-python
 
 
        --with-python
 
 


@@ -262,17 +272,27 @@ install macros.pld $RPM_BUILD_ROOT%{_libdir}/rpm/macros.pld
 install macros.perl $RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
 install macros.python $RPM_BUILD_ROOT%{_libdir}/rpm/macros.python
 
 install macros.perl $RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
 install macros.python $RPM_BUILD_ROOT%{_libdir}/rpm/macros.python
 

+install %{SOURCE1} doc/manual/groups
+install %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/install-build-tree

 install %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm/find-spec-bcond
 install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides
 install %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires
 install %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm/find-spec-bcond
 install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides
 install %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires

+install %{SOURCE15} $RPM_BUILD_ROOT%{_libdir}/rpm/compress-doc
+
+install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm
+
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
+# customized rpm macros - global for host
+#

 #%%_install_langs pl_PL:en_US
 %%distribution PLD
 EOF
 
 %find_lang %{name}
 
 #%%_install_langs pl_PL:en_US
 %%distribution PLD
 EOF
 
 %find_lang %{name}
 

-%post   libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post   -p /sbin/ldconfig
+

 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -286,7 +306,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/rpm/rpmq
 %attr(755,root,root) %{_libdir}/rpm/rpmk
 %attr(755,root,root) %{_libdir}/rpm/rpmv
 %attr(755,root,root) %{_libdir}/rpm/rpmq
 %attr(755,root,root) %{_libdir}/rpm/rpmk
 %attr(755,root,root) %{_libdir}/rpm/rpmv

+%attr(755,root,root) %{_libdir}/librpm*.so.*.*

 %attr(755,root,root) %{_libdir}/rpm/rpmdb
 %attr(755,root,root) %{_libdir}/rpm/rpmdb

+%attr(755,root,root) %{_libdir}/rpm/rpmq
+%attr(755,root,root) %{_libdir}/rpm/rpmk
+%attr(755,root,root) %{_libdir}/rpm/rpmv

 %attr(755,root,root) %{_libdir}/librpm*.so.*.*
 %{_mandir}/man8/rpm.8*
 %lang(pl) %{_mandir}/pl/man8/rpm.8*
 %attr(755,root,root) %{_libdir}/librpm*.so.*.*
 %{_mandir}/man8/rpm.8*
 %lang(pl) %{_mandir}/pl/man8/rpm.8*


@@ -358,10 +382,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/librpm*.la
 %attr(755,root,root) %{_libdir}/librpm*.so
 %files devel
 %attr(755,root,root) %{_libdir}/librpm*.la
 %attr(755,root,root) %{_libdir}/librpm*.so
 %files devel

-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/librpm*.so.*.*
-

 %defattr(644,root,root,755)
 %{_includedir}/rpm
 %attr(755,root,root) %{_libdir}/librpm*.la
 %defattr(644,root,root,755)
 %{_includedir}/rpm
 %attr(755,root,root) %{_libdir}/librpm*.la