- removed second Release :-)

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 9dfc2abcb9de21589d78699e679dbe6e7eb71604..621e390fa56604b4c1c4d8c2725bab6e0086c902 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -3,7 +3,7 @@ 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:       37
+Release:       48

 License:       GPL
 Group:         Base
 Group(de):     Gründsätzlich
 License:       GPL
 Group:         Base
 Group(de):     Gründsätzlich


@@ -22,7 +22,8 @@ Source8:      %{name}-find-spec-bcond
 Source9:       %{name}-find-lang
 Source10:      %{name}-find-provides
 Source11:      %{name}-find-requires
 Source9:       %{name}-find-lang
 Source10:      %{name}-find-provides
 Source11:      %{name}-find-requires

-Source12:      %{name}-non-english-man-pages.tar.gz
+Source12:      %{name}-non-english-man-pages.tar.bz2
+Source13:      %{name}-macros.python

 Patch0:                %{name}-rpmrc.patch
 Patch1:                %{name}-macros.patch
 Patch2:                %{name}-arch.patch
 Patch0:                %{name}-rpmrc.patch
 Patch1:                %{name}-macros.patch
 Patch2:                %{name}-arch.patch


@@ -47,38 +48,43 @@ Patch20:    %{name}-noexpand.patch
 Patch21:       %{name}-scripts-closefds.patch
 Patch22:       %{name}-python-amfix.patch
 Patch23:       %{name}-non-english-man-pages.patch
 Patch21:       %{name}-scripts-closefds.patch
 Patch22:       %{name}-python-amfix.patch
 Patch23:       %{name}-non-english-man-pages.patch

+Patch24:       %{name}-progress-nontty.patch
+Patch25:       %{name}-am_ac.patch
+Patch26:       %{name}-python-macros.patch
+Patch27:       %{name}-hardlink-fixes.patch
+Patch28:       %{name}-perlprov-regonly.patch
+Patch29:       %{name}-cxx.patch

 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch

-BuildRequires: gettext-devel >= 0.10.38-3
+URL:           http://www.rpm.org/
+Icon:          rpm.gif
+BuildRequires: autoconf >= 2.50

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

-BuildRequires: bzip2-devel >= 1.0.1
-BuildRequires: zlib-devel
+BuildRequires: db1-devel >= 1.85
+BuildRequires: db3-devel >= 3.1.17-9

 BuildRequires: gettext-devel >= 0.10.38-3
 BuildRequires: gettext-devel >= 0.10.38-3

-BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf >= 2.50

 BuildRequires: python-devel
 BuildRequires: python-devel

+BuildRequires: zlib-devel

 BuildRequires: python-modules >= 2.2.1
 BuildRequires: zlib-devel >= 1.1.4
 BuildRequires: python-modules >= 2.2.1
 BuildRequires: zlib-devel >= 1.1.4

+%if %{!?_without_static:1}%{?_without_static:0}

 # Require static library only for static build
 BuildRequires: db3-static >= 3.1.17-9
 # Require static library only for static build
 BuildRequires: db3-static >= 3.1.17-9

-BuildRequires: bzip2-static >= 1.0.1
+BuildRequires: db1-static >= 1.85

 BuildRequires: zlib-static
 BuildRequires: zlib-static

-BuildRequires: glibc-static >= 2.2.0
-%endif

 BuildRequires: zlib-static >= 1.1.4
 Obsoletes:     rpm-libs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     rpm-libs
 BuildRequires: zlib-static >= 1.1.4
 Obsoletes:     rpm-libs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     rpm-libs

-%define __find_provides %{SOURCE4}
-%define _binary_payload w9.gzdio
+Conflicts:     glibc < 2.2
+

 %define                __find_provides %{SOURCE4}
 %define                __find_provides %{SOURCE4}

-%define python_prefix      %(echo `python -c "import sys; print sys.prefix"`)
-%define python_version     %(echo `python -c "import sys; print sys.version[:3]"`)
-%define python_includedir  %{_includedir}/python%{python_version}
-%define python_libdir      %{python_prefix}/lib/python%{python_version}
-%define python_sitedir     %{python_libdir}/site-packages
+%define                _binary_payload w9.gzdio
+
+%define                py_ver          %(echo `python -c "import sys; print sys.version[:3]"`)
+%define                py_prefix       %(echo `python -c "import sys; print sys.prefix"`)
+%define                py_libdir       %{py_prefix}/lib/python%{py_ver}

 %define                py_dyndir       %{py_libdir}/lib-dynload
 %define                pyrequires_eq() Requires:       %1 >= %py_ver %1 < %(echo `python -c "import sys; import string; ver=sys.version[:3].split('.'); ver[1]=str(int(ver[1])+1); print string.join(ver, '.')"`)
 
 %define                py_dyndir       %{py_libdir}/lib-dynload
 %define                pyrequires_eq() Requires:       %1 >= %py_ver %1 < %(echo `python -c "import sys; import string; ver=sys.version[:3].split('.'); ver[1]=str(int(ver[1])+1); print string.join(ver, '.')"`)
 


@@ -104,7 +110,7 @@ przechowywane w bazie danych i mo
 do pacote, permissões dos arquivos, etc.
 
 %package devel
 do pacote, permissões dos arquivos, etc.
 
 %package devel

-Summary(pl):   Pliki nag³ówkowe i biblioteki statyczne 
+Summary(de):   Header-Dateien uns Libraries

 Summary(pl):   Pliki nag³ówkowe i biblioteki statyczne
 Group(de):     Entwicklung/Libraries
 Group(es):     Desarrollo/Bibliotecas
 Summary(pl):   Pliki nag³ówkowe i biblioteki statyczne
 Group(de):     Entwicklung/Libraries
 Group(es):     Desarrollo/Bibliotecas


@@ -129,12 +135,15 @@ Der RPM-Packensystem enth
 RPM-Pakete und Dateibanken zu manipulieren. Er eignet sich für
 Vereinfachung des Schaffens grafischer Paket-Manager und anderer
 herramientas que necesiten un conocimiento profundo de paquetes RPM.
 RPM-Pakete und Dateibanken zu manipulieren. Er eignet sich für
 Vereinfachung des Schaffens grafischer Paket-Manager und anderer
 herramientas que necesiten un conocimiento profundo de paquetes RPM.

-Pliki nag³ówkowe i biblioteki statyczne.
+
+%description devel -l pl
+System RPM zawiera bibliotekê C, która u³atwia manipulowanie pakietami
+RPM oraz bazami danych. W zamiarze ma to upro¶ciæ tworzenie

 graficznych mened¿erów pakietów oraz innych narzêdzi, które wymagaj±
 ferramentas que precisem de conhecimento profundo de pacotes RPM.
 
 %package static
 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:       RPM static libraries

 Summary(pl):   Biblioteki statyczne RPM-a
 Group(de):     Entwicklung/Libraries
 Group(es):     Desarrollo/Bibliotecas
 Summary(pl):   Biblioteki statyczne RPM-a
 Group(de):     Entwicklung/Libraries
 Group(es):     Desarrollo/Bibliotecas


@@ -152,12 +161,12 @@ RPM static libraries.
 
 %description static -l de
 RPMs statische Libraries.
 
 %description static -l de
 RPMs statische Libraries.

-Biblioteki statyczne rpm-a.
+

 %description static -l pl
 Bibliotecas estáticas para desenvolvimento.
 
 %package utils
 %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:       Additional utilities for managing rpm packages and database

 Summary(de):   Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Group(de):     Applikationen/Datei
 Group(pl):     Aplikacje/Pliki
 Summary(de):   Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Group(de):     Applikationen/Datei
 Group(pl):     Aplikacje/Pliki


@@ -170,12 +179,12 @@ Additional utilities for managing rpm packages and database.
 
 %description utils -l de
 Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken.
 
 %description utils -l de
 Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken.

-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.
 
 %package perlprov
 %description utils -l pl
 Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami.
 
 %package perlprov

-Summary(pl):   Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci dla skryptów perl w pakietach rpm
+Summary:       Additional utilities for checking perl provides/requires in rpm packages

 Summary(de):   Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen
 Group(de):     Applikationen/Datei
 Group(pl):     Aplikacje/Pliki
 Summary(de):   Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen
 Group(de):     Applikationen/Datei
 Group(pl):     Aplikacje/Pliki


@@ -190,11 +199,29 @@ packages.
 
 %description perlprov -l de
 Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen.
 
 %description perlprov -l de
 Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen.

-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
 %description perlprov -l pl
 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
+Group(de):     Applikationen/Datei
+Group(pl):     Aplikacje/Pliki
+Summary(pl):   Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w Pythonie
+Requires:      python
+Requires:      %{name} = %{version}
+Requires:      python-modules
+
+%description pythonprov
+Python macros, which simplifies creation of rpm packages with Python
+software.
+Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi
+w Pythonie.
+Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w

 %package python
 
 %package python
 

+%package -n python-rpm

 Group:         Development/Languages/Python
 Group(de):     Entwicklung/Sprachen/Python
 Group(pl):     Programowanie/Jêzyki/Python
 Group:         Development/Languages/Python
 Group(de):     Entwicklung/Sprachen/Python
 Group(pl):     Programowanie/Jêzyki/Python


@@ -208,29 +235,36 @@ written in the Python programming language to use the interface
 supplied by RPM (RPM Package Manager) libraries.
 
 This package should be installed if you want to develop Python
 supplied by RPM (RPM Package Manager) libraries.
 
 This package should be installed if you want to develop Python

+%description python -l pl
+Pakiet rpm-python zawiera modu³, który pozwala aplikacjom napisanym
+w Pythonie na u¿ywanie interfejsu dostarczanego przez biblioteki RPM-a.
+Pakiet rpm-python zawiera modu³, który pozwala aplikacjom napisanym w
+Pakiet ten powinien zostaæ zainstalowany, je¶li chcesz pisaæ
+w Pythonie programy manipuluj±ce pakietami i bazami danych rpm.
+Esse pacote deve ser instalado se você quiser desenvolver programas em

 Python para manipular pacotes e bancos de dados RPM.
 
 %package build
 Python para manipular pacotes e bancos de dados RPM.
 
 %package build

-Summary(pl):   Skrypty pomocnicze do budowania binarnych RPMów
+Summary:       Scripts for building binary RPM packages

 Summary(pl):   Skrypty pomocnicze do budowania binarnych RPM-ów
 Group(de):     Applikationen/Datei
 Group(pl):     Aplikacje/Pliki
 Summary(pt_BR):        Scripts e programas executáveis usados para construir pacotes
 Group:         Applications/File
 Summary(pl):   Skrypty pomocnicze do budowania binarnych RPM-ów
 Group(de):     Applikationen/Datei
 Group(pl):     Aplikacje/Pliki
 Summary(pt_BR):        Scripts e programas executáveis usados para construir pacotes
 Group:         Applications/File

-Requires:      sh-utils
+Requires:      /bin/id
+Requires:      awk

 Requires:      binutils
 Requires:      binutils

-Requires:      patch
-Requires:      texinfo
+Requires:      diffutils

 Requires:      file >= 3.31
 Requires:      file >= 3.31

-Requires:      binutils
-Requires:      make

 Requires:      gcc >= 3.0.3
 Requires:      gcc
 Requires:      gcc >= 3.0.3
 Requires:      gcc

-Requires:      diffutils

 Requires:      glibc-devel
 Requires:      glibc-devel

-Requires:      sed
-Requires:      sed
+Requires:      grep
+Requires:      gzip
+Requires:      make
+Requires:      patch

 Requires:      popt >= 1.6.2-2
 Requires:      popt >= 1.6.2-2

+Requires:      sed

 Requires:      tar
 Requires:      textutils
 
 Requires:      tar
 Requires:      textutils
 


@@ -239,7 +273,7 @@ Scripts for building binary RPM packages.
 
 %description build -l de
 Scripts fürs Bauen binärer RPM-Pakete.
 
 %description build -l de
 Scripts fürs Bauen binärer RPM-Pakete.

-Skrypty pomocnicze do budowania binarnych RPMów.
+

 %description build -l pl
 construir pacotes usando o RPM.
 
 %description build -l pl
 construir pacotes usando o RPM.
 


@@ -267,10 +301,17 @@ construir pacotes usando o RPM.
 %patch19 -p1
 %patch22 -p1
 %patch23 -p1
 %patch19 -p1
 %patch22 -p1
 %patch23 -p1

+%patch24 -p1
+%patch25 -p1
+%patch26 -p0
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1

 %patch31 -p1
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
 %patch31 -p1
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1

+

 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
 install %{SOURCE9} scripts/find-lang.sh
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
 install %{SOURCE9} scripts/find-lang.sh


@@ -283,6 +324,7 @@ install %{SOURCE9} scripts/find-lang.sh
 mv -f perl.req perl.req.in
 mv -f perl.prov perl.prov.in)
 %build
 mv -f perl.req perl.req.in
 mv -f perl.prov perl.prov.in)
 %build

+# generate Group translations to *.po

 awk -f %{SOURCE14} %{SOURCE1}
 
 cd popt
 awk -f %{SOURCE14} %{SOURCE1}
 
 cd popt


@@ -290,6 +332,7 @@ autoconf
 automake -a -c
 aclocal
 autoheader
 automake -a -c
 aclocal
 autoheader

+automake -a -c -f

 %{__automake}
 cd ..
 
 %{__automake}
 cd ..
 


@@ -305,25 +348,33 @@ sed -e 's#cpio.c depends.c#cpio.c $(DBLIBOBJS) depends.c#g' \
        lib/Makefile.in > lib/Makefile.in.new
 mv -f lib/Makefile.in.new lib/Makefile.in
 
        lib/Makefile.in > lib/Makefile.in.new
 mv -f lib/Makefile.in.new lib/Makefile.in
 

-sed -e 's#python1.5#python%{python_version}#g' \
+sed -e 's#python1.5#python%{py_ver}#g' \

        python/Makefile.in > python/Makefile.in.new
 mv -f python/Makefile.in.new python/Makefile.in
 
        python/Makefile.in > python/Makefile.in.new
 mv -f python/Makefile.in.new python/Makefile.in
 

+sed -e 's#python1.5#python%{py_ver}#g' \
+       python/Makefile.in > python/Makefile.in.new
+sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' macros.in | \
+       sed 's|@host_cpu@|%{_target_cpu}|' | \
+# config.guess doesn't handle athlon, so we have to change it by hand.
+# rpm checks for CPU type at runtime, but it looks better

 sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' macros.in | \
        sed 's|@host_cpu@|%{_target_cpu}|' > macros.tmp
        --enable-v1-packages \
        --with-python
 %configure \
 sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' macros.in | \
        sed 's|@host_cpu@|%{_target_cpu}|' > macros.tmp
        --enable-v1-packages \
        --with-python
 %configure \

+       --enable-shared \

        --enable-v1-packages \
        --with-python
 
 
 %{__make} %{?_without_static:rpm_LDFLAGS="\\$(myLDFLAGS)"}
 
        --enable-v1-packages \
        --with-python
 
 
 %{__make} %{?_without_static:rpm_LDFLAGS="\\$(myLDFLAGS)"}
 

-       DESTDIR="$RPM_BUILD_ROOT" \
+%install

 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \

+       DESTDIR=$RPM_BUILD_ROOT \

        pkgbindir="%{_bindir}"
 
 install macros.perl $RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
        pkgbindir="%{_bindir}"
 
 install macros.perl $RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl


@@ -384,6 +435,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/rpm
 %dir %{_libdir}/rpm
 
 %dir /var/lib/rpm
 %dir %{_libdir}/rpm
 

+%{_libdir}/rpm/macros.python

 %{_libdir}/rpm/noarch-linux
 %{_libdir}/rpm/noarch-pld-linux
 %ifarch i386 i486 i586 i686
 %{_libdir}/rpm/noarch-linux
 %{_libdir}/rpm/noarch-pld-linux
 %ifarch i386 i486 i586 i686


@@ -395,6 +447,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/rpm/athlon*
 %endif
 %ifarch sparc sparc64
 %{_libdir}/rpm/athlon*
 %endif
 %ifarch sparc sparc64

+%{_libdir}/rpm/sparc*
+%endif
+%ifarch alpha
+%{_libdir}/rpm/alpha*

 %endif
 %ifarch ppc
 %{_libdir}/rpm/ppc*
 %endif
 %ifarch ppc
 %{_libdir}/rpm/ppc*


@@ -454,11 +510,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/rpm/find-perl-*
 %attr(755,root,root) %{_libdir}/rpm/find-*.perl
 %attr(755,root,root) %{_libdir}/rpm/find-prov.pl
 %attr(755,root,root) %{_libdir}/rpm/find-perl-*
 %attr(755,root,root) %{_libdir}/rpm/find-*.perl
 %attr(755,root,root) %{_libdir}/rpm/find-prov.pl

+%attr(755,root,root) %{_libdir}/rpm/find-req.pl
+%attr(755,root,root) %{_libdir}/rpm/get_magic.pl
+
+%{_libdir}/rpm/macros.perl

 %files python
 %defattr(644,root,root,755)
 %files python
 %defattr(644,root,root,755)

-%{python_sitedir}/*.so
+%{py_sitedir}/*.so

 %{_libdir}/rpm/macros.python
 
 %files -n python-rpm
 %{_libdir}/rpm/macros.python
 
 %files -n python-rpm

-* %{date} PLD Team <pld-list@pld.org.pl>
+%defattr(755,root,root,755)

 %{py_sitedir}/*.so
 %{py_sitedir}/*.so