- first step to upcomming 4.0.4

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index e5d01ab7cf3bfccbbed19f3469cfb326dbcd5780..3c341e1c49251f8573f6bfa6354a0c020709fb7f 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,20 +1,31 @@
 Summary:       Red Hat (and now also PLD) Package Manager
 Summary(de):   Red Hat (und jetzt auch PLD) Packet-Manager
 Summary:       Red Hat (and now also PLD) Package Manager
 Summary(de):   Red Hat (und jetzt auch PLD) Packet-Manager

+Summary(es):   Gestor de paquetes RPM

 Summary(pl):   Aplikacja do zarz±dzania pakietami
 Summary(pl):   Aplikacja do zarz±dzania pakietami

+Summary(pt_BR):        Gerenciador de pacotes RPM

 Name:          rpm
 Name:          rpm

-Version:       4.0.2
-Release:       40
+Version:       4.0.4
+Release:       0.29.2

 License:       GPL
 Group:         Base
 License:       GPL
 Group:         Base

+Group(cs):     Základ
+Group(da):     Basal

 Group(de):     Gründsätzlich
 Group(es):     Base
 Group(de):     Gründsätzlich
 Group(es):     Base

+Group(fr):     Base
+Group(it):     Base
+Group(ja):     ¥Ù¡¼¥¹
+Group(no):     Basis

 Group(pl):     Podstawowe
 Group(pl):     Podstawowe

+Group(pt):     Base

 Group(pt_BR):  Base
 Group(pt_BR):  Base

+Group(ru):     âÁÚÏ×ÙÊ ÎÁÂÏÒ
+Group(sv):     Bas

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

-Source4:       %{name}-find-rpm-provides
+Source4:       %{name}-find-%{name}-provides

 Source5:       %{name}-macros.perl
 Source6:       %{name}-find-perl-provides
 Source7:       %{name}-find-perl-requires
 Source5:       %{name}-macros.perl
 Source6:       %{name}-find-perl-provides
 Source7:       %{name}-find-perl-requires


@@ -23,64 +34,63 @@ Source9:    %{name}-find-lang
 Source10:      %{name}-find-provides
 Source11:      %{name}-find-requires
 Source12:      %{name}-non-english-man-pages.tar.bz2
 Source10:      %{name}-find-provides
 Source11:      %{name}-find-requires
 Source12:      %{name}-non-english-man-pages.tar.bz2

-Patch0:                %{name}-rpmrc.patch
+Source13:      %{name}-macros.python
+Patch0:                %{name}-%{name}rc.patch

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

-Patch3:                %{name}-rpmpopt.patch
+Patch3:                %{name}-%{name}popt.patch

 Patch4:                %{name}-perl-macros.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
-Patch16:       %{name}-byKey.patch
-Patch17:       %{name}-perlprov.patch
-Patch18:       %{name}-noperldir.patch
-Patch19:       popt-cvs20010530.patch
-Patch20:       %{name}-noexpand.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
+Patch5:                %{name}-am_fix.patch
+Patch6:                %{name}-perl-req-perlfile.patch
+Patch7:                %{name}-installplatform.patch
+Patch8:                %{name}-cache.patch
+Patch9:                %{name}-glob.patch
+Patch10:       %{name}-header_h.patch
+Patch11:       %{name}-fast-alAddPackage.patch
+Patch12:       %{name}-byKey.patch
+Patch13:       %{name}-noexpand.patch
+Patch14:       %{name}-scripts-closefds.patch
+Patch15:       %{name}-python-amfix.patch
+Patch16:       %{name}-non-english-man-pages.patch
+Patch17:       %{name}-python-macros.patch
+Patch18:       %{name}-perlprov-regonly.patch
+Patch19:       %{name}-acconfig.patch
+Patch20:       %{name}-db4.patch
+Patch21:       %{name}-pl.po.patch
+Patch22:       %{name}-drop-legacy-CLI.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: automake

+BuildRequires: db4-devel >= 4.0.14
+BuildRequires: doxygen
+BuildRequires: db1-devel >= 1.85

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

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

 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 >= 2.2
+BuildRequires: python-modules >= 2.2
+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
 # Require static library only for static build

-BuildRequires: db3-static >= 3.1.17-9
-BuildRequires: bzip2-static >= 1.0.1
+BuildRequires: db4-static >= 4.0.14
+BuildRequires: db1-static >= 1.85

 BuildRequires: zlib-static
 BuildRequires: glibc-static >= 2.2.0
 BuildRequires: zlib-static
 BuildRequires: glibc-static >= 2.2.0

-%endif

 BuildRequires: zlib-static >= 1.1.4
 BuildRequires: zlib-static >= 1.1.4

-Obsoletes:     rpm-libs

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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, '.')"`)
 


@@ -95,6 +105,13 @@ RPM ist ein kr
 Installation, Anfrage, Verifizierung, Aktualisierung und
 Uninstallation individueller Softwarepakete. Ein Paket besteht aus
 einem Archiv Dateien und Paketinformation, inklusive Name, Version und
 Installation, Anfrage, Verifizierung, Aktualisierung und
 Uninstallation individueller Softwarepakete. Ein Paket besteht aus
 einem Archiv Dateien und Paketinformation, inklusive Name, Version und

+Beschreibung.
+
+%description -l es
+RPM es un poderoso administrador de paquetes, que puede ser usado para
+construir, instalar, pesquisar, verificar, actualizar y desinstalar
+paquetes individuales de software. Un paquete consiste en un
+almacenaje de archivos, y información sobre el paquete, incluyendo

 nombre, versión y descripción.
 
 %description -l pl
 nombre, versión y descripción.
 
 %description -l pl


@@ -103,20 +120,38 @@ przebudowa
 dotycz±ce ka¿dego pakietu, takie jak jego opis, lista plików
 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
 dotycz±ce ka¿dego pakietu, takie jak jego opis, lista plików
 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

+odpytywania programu rpm.
+
+%description -l pt_BR
+RPM é um poderoso gerenciador de pacotes, que pode ser usado para
+construir, instalar, pesquisar, verificar, atualizar e desinstalar
+pacotes individuais de software. Um pacote consiste de um conjunto de
+arquivos e informações adicionais, incluindo nome, versão e descrição

 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:       Header files and libraries
+Summary(de):   Header-Dateien uns Libraries
+Summary(es):   Archivos de inclusión y bibliotecas para programas de manipulación de paquetes rpm

 Summary(pl):   Pliki nag³ówkowe i biblioteki statyczne
 Summary(pl):   Pliki nag³ówkowe i biblioteki statyczne

-Group(de):     Entwicklung/Libraries
+Group(cs):     Vývojové prostøedky/Knihovny
+Group(da):     Udvikling/Biblioteker
+Group(de):     Entwicklung/Bibliotheken

 Group(es):     Desarrollo/Bibliotecas
 Group(fr):     Development/Librairies
 Group(es):     Desarrollo/Bibliotecas
 Group(fr):     Development/Librairies

+Group(it):     Sviluppo/Librerie
+Group(ja):     ³«È¯/¥é¥¤¥Ö¥é¥ê
+Group(no):     Utvikling/Bibliotek

 Group(pl):     Programowanie/Biblioteki
 Group(pt_BR):  Desenvolvimento/Bibliotecas
 Group(pl):     Programowanie/Biblioteki
 Group(pt_BR):  Desenvolvimento/Bibliotecas

+Group(pt):     Desenvolvimento/Bibliotecas

 Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
 Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ

+Group(sv):     Utveckling/Bibliotek

 Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Summary(pt_BR):        Arquivos de inclusão e bibliotecas para programas de manipulação de pacotes RPM
 Group:         Development/Libraries
 Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Summary(pt_BR):        Arquivos de inclusão e bibliotecas para programas de manipulação de pacotes RPM
 Group:         Development/Libraries

+Requires:      beecrypt-devel
+Requires:      db4-devel

 Requires:      %{name} = %{version}
 Requires:      popt-devel
 
 Requires:      %{name} = %{version}
 Requires:      popt-devel
 


@@ -130,20 +165,43 @@ intimate knowledge of RPM packages.
 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
 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

+Werkzeuge, die intime Kenntnis von RPM-Paketen brauchen.
+
+%description devel -l es
+El sistema de empaquetado RPM incluye una biblioteca C que vuelve
+fácil la manipulación de paquetes y bases de datos RPM. Su objetivo es
+facilitar la creación de administradores gráficos de paquetes y otras

 herramientas que necesiten un conocimiento profundo de paquetes RPM.
 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±
 graficznych mened¿erów pakietów oraz innych narzêdzi, które wymagaj±

+szczegó³owej wiedzy na temat pakietów RPM.
+
+%description devel -l pt_BR
+O sistema de empacotamento RPM inclui uma biblioteca C que torna fácil
+a manipulação de pacotes e bases de dados RPM. Seu objetivo é
+facilitar a criação de gerenciadores gráficos de pacotes e outras

 ferramentas que precisem de conhecimento profundo de pacotes RPM.
 
 %package static
 ferramentas que precisem de conhecimento profundo de pacotes RPM.
 
 %package static

-Summary(pl):   Biblioteki statyczne rpm-a
+Summary:       RPM static libraries
+Summary(de):   RPMs statische Libraries

 Summary(pl):   Biblioteki statyczne RPM-a
 Summary(pl):   Biblioteki statyczne RPM-a

-Group(de):     Entwicklung/Libraries
+Group(cs):     Vývojové prostøedky/Knihovny
+Group(da):     Udvikling/Biblioteker
+Group(de):     Entwicklung/Bibliotheken

 Group(es):     Desarrollo/Bibliotecas
 Group(fr):     Development/Librairies
 Group(es):     Desarrollo/Bibliotecas
 Group(fr):     Development/Librairies

+Group(it):     Sviluppo/Librerie
+Group(ja):     ³«È¯/¥é¥¤¥Ö¥é¥ê
+Group(no):     Utvikling/Bibliotek

 Group(pl):     Programowanie/Biblioteki
 Group(pt_BR):  Desenvolvimento/Bibliotecas
 Group(pl):     Programowanie/Biblioteki
 Group(pt_BR):  Desenvolvimento/Bibliotecas

+Group(pt):     Desenvolvimento/Bibliotecas

 Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
 Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ

+Group(sv):     Utveckling/Bibliotek

 Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Summary(pt_BR):        Bibliotecas estáticas para o desenvolvimento de aplicações RPM
 Group:         Development/Libraries
 Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Summary(pt_BR):        Bibliotecas estáticas para o desenvolvimento de aplicações RPM
 Group:         Development/Libraries


@@ -154,15 +212,29 @@ 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
 %description static -l pl

+Biblioteki statyczne RPM-a.
+
+%description static -l pt_BR

 Bibliotecas estáticas para desenvolvimento.
 
 %package utils
 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
 Summary(de):   Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken

+Group(cs):     Aplikace/Práce se soubory
+Group(da):     Programmer/Filer

 Group(de):     Applikationen/Datei
 Group(de):     Applikationen/Datei

+Group(es):     Aplicaciones/Archivos
+Group(fr):     Applications/Fichiers
+Group(it):     Applicazioni/File
+Group(ja):     ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥Õ¥¡¥¤¥ë
+Group(no):     Applikasjoner/Fil

 Group(pl):     Aplikacje/Pliki
 Group(pl):     Aplikacje/Pliki

+Group(pt):     Aplicações/Ficheiros
+Group(pt_BR):  Aplicações/Arquivos
+Group(ru):     ðÒÉÌÏÖÅÎÉÑ/òÁÂÏÔÁ Ó ÆÁÊÌÁÍÉ
+Group(sv):     Tillämpningar/Fil

 Summary(pl):   Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami
 Group:         Applications/File
 Requires:      %{name} = %{version}
 Summary(pl):   Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami
 Group:         Applications/File
 Requires:      %{name} = %{version}


@@ -172,15 +244,26 @@ 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
 Summary(de):   Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen

+Group(cs):     Aplikace/Práce se soubory
+Group(da):     Programmer/Filer

 Group(de):     Applikationen/Datei
 Group(de):     Applikationen/Datei

+Group(es):     Aplicaciones/Archivos
+Group(fr):     Applications/Fichiers
+Group(it):     Applicazioni/File
+Group(ja):     ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥Õ¥¡¥¤¥ë
+Group(no):     Applikasjoner/Fil

 Group(pl):     Aplikacje/Pliki
 Group(pl):     Aplikacje/Pliki

+Group(pt):     Aplicações/Ficheiros
+Group(pt_BR):  Aplicações/Arquivos
+Group(ru):     ðÒÉÌÏÖÅÎÉÑ/òÁÂÏÔÁ Ó ÆÁÊÌÁÍÉ
+Group(sv):     Tillämpningar/Fil

 Summary(pl):   Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
 Group:         Applications/File
 Requires:      perl-modules
 Summary(pl):   Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
 Group:         Applications/File
 Requires:      perl-modules


@@ -192,17 +275,59 @@ 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

-%package python
+pakietach rpm.
+
+%package pythonprov
+Summary:       Python macros, which simplifies creation of rpm packages with Python software
+Group(cs):     Aplikace/Práce se soubory
+Group(da):     Programmer/Filer
+Group(de):     Applikationen/Datei
+Group(es):     Aplicaciones/Archivos
+Group(fr):     Applications/Fichiers
+Group(it):     Applicazioni/File
+Group(ja):     ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥Õ¥¡¥¤¥ë
+Group(no):     Applikasjoner/Fil
+Group(pl):     Aplikacje/Pliki
+Group(pt):     Aplicações/Ficheiros
+Group(pt_BR):  Aplicações/Arquivos
+Group(ru):     ðÒÉÌÏÖÅÎÉÑ/òÁÂÏÔÁ Ó ÆÁÊÌÁÍÉ
+Group(sv):     Tillämpningar/Fil
+Summary(pl):   Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w Pythonie
+Group:         Applications/File
+Requires:      %{name} = %{version}
+Requires:      python-modules

 
 

+%description pythonprov
+Python macros, which simplifies creation of rpm packages with Python
+software.
+
+%description pythonprov -l pl
+Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w
+Pythonie.
+
+%package -n python-rpm
+Summary:       Python interface to RPM library

 Group:         Development/Languages/Python
 Group:         Development/Languages/Python

+Group(cs):     Vývojové prostøedky/Programovací jazyky/Python
+Group(da):     Udvikling/Sprog/Python

 Group(de):     Entwicklung/Sprachen/Python
 Group(de):     Entwicklung/Sprachen/Python

+Group(es):     Desarrollo/Lenguages/Python
+Group(fr):     Development/Langues/Python
+Group(it):     Sviluppo/Linguaggi/Python
+Group(ja):     ³«È¯/¸À¸ì/Python
+Group(no):     Utvikling/Programmeringsspråk/Python

 Group(pl):     Programowanie/Jêzyki/Python
 Group(pl):     Programowanie/Jêzyki/Python

+Group(pt):     Desenvolvimento/Línguas/Python
+Group(ru):     òÁÚÒÁÂÏÔËÁ/ñÚÙËÉ/Python
+Group(sv):     Utveckling/Språk/Python

 Summary(pt_BR):        Módulo Python para aplicativos que manipulam pacotes RPM
 Summary(pt_BR):        Módulo Python para aplicativos que manipulam pacotes RPM

+%requires_eq   python
+Requires:      %{name} = %{version}

 %pyrequires_eq python
 %pyrequires_eq python

-%description python
+Obsoletes:     rpm-python

 
 %description -n python-rpm
 The rpm-python package contains a module which permits applications
 
 %description -n python-rpm
 The rpm-python package contains a module which permits applications


@@ -210,29 +335,108 @@ 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

+programs that will manipulate RPM packages and databases.
+
+%description -n python-rpm -l pl
+Pakiet rpm-python zawiera modu³, który pozwala aplikacjom napisanym w
+Pythonie na u¿ywanie interfejsu dostarczanego przez biblioteki RPM-a.
+
+Pakiet ten powinien zostaæ zainstalowany, je¶li chcesz pisaæ w
+Pythonie programy manipuluj±ce pakietami i bazami danych rpm.
+
+%description -n python-rpm -l pt_BR
+O pacote rpm-python contém um módulo que permite que aplicações
+escritas em Python utilizem a interface fornecida pelas bibliotecas
+RPM (RPM Package Manager).
+
+Esse pacote deve ser instalado se você quiser desenvolver programas em
+%package lib
+Summary:       RPMs library
+Group:         Libraries
+Group(de):     Bibliotheken
+Group(es):     Bibliotecas
+Group(fr):     Librairies
+Group(pl):     Biblioteki
+Group(pt):     Bibliotecas
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
+
+
+%description lib
+RPMs library
+
+%package -n beecrypt
+Summary:       Crypto library
+Group:         Libraries
+Group(de):     Bibliotheken
+Group(es):     Bibliotecas
+Group(fr):     Librairies
+Group(pl):     Biblioteki
+Group(pt):     Bibliotecas
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
+
+%description -n beecrypt
+Crypto library
+
+%package -n beecrypt-devel
+Summary:       Crypto library - development files
+Group:         Development/Libraries
+Group(de):     Entwicklung/Bibliotheken
+Group(es):     Desarrollo/Bibliotecas
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
+Group(pt):     Desenvolvimento/Bibliotecas
+Group(pt_BR):  Desenvolvimento/Bibliotecas
+Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
+
+
+%description -n beecrypt-devel
+Crypto library - development files
+

 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(de):   Scripts fürs Bauen binärer RPM-Pakete

 Summary(pl):   Skrypty pomocnicze do budowania binarnych RPM-ów
 Summary(pl):   Skrypty pomocnicze do budowania binarnych RPM-ów

+Group(cs):     Aplikace/Práce se soubory
+Group(da):     Programmer/Filer

 Group(de):     Applikationen/Datei
 Group(de):     Applikationen/Datei

+Group(es):     Aplicaciones/Archivos
+Group(fr):     Applications/Fichiers
+Group(it):     Applicazioni/File
+Group(ja):     ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥Õ¥¡¥¤¥ë
+Group(no):     Applikasjoner/Fil

 Group(pl):     Aplikacje/Pliki
 Group(pl):     Aplikacje/Pliki

+Group(pt):     Aplicações/Ficheiros
+Group(pt_BR):  Aplicações/Arquivos
+Group(ru):     ðÒÉÌÏÖÅÎÉÑ/òÁÂÏÔÁ Ó ÆÁÊÌÁÍÉ
+Group(sv):     Tillämpningar/Fil

 Summary(pt_BR):        Scripts e programas executáveis usados para construir pacotes
 Group:         Applications/File
 Summary(pt_BR):        Scripts e programas executáveis usados para construir pacotes
 Group:         Applications/File

-Requires:      sh-utils
+Requires:      %{name} = %{version}
+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:      fileutils
+Requires:      findutils
+%ifarch athlon

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

+%else

 Requires:      gcc
 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
 


@@ -241,8 +445,12 @@ 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
 %description build -l pl

+Skrypty pomocnicze do budowania binarnych RPM-ów.
+
+%description build -l pt_BR
+Este pacote contém scripts e programas executáveis que são usados para

 construir pacotes usando o RPM.
 
 %prep
 construir pacotes usando o RPM.
 
 %prep


@@ -256,28 +464,27 @@ construir pacotes usando o RPM.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1

+%patch11 -p1
+# too many rejects, Pawel please check if needed and rediff
+#%patch12 -p0

 %patch11 -p0
 %patch12 -p0
 %patch11 -p0
 %patch12 -p0

-%patch11 -p0
-%patch12 -p0
-%patch15 -p0
-%patch16 -p0
+%patch15 -p1
+%patch16 -p1

 %patch15 -p0
 %patch16 -p0
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch15 -p0
 %patch16 -p0
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1

-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
+%patch22 -p1 -b .wiget

 %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
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in

-install %{SOURCE9} scripts/find-lang.sh
+#install %{SOURCE9} scripts/find-lang.sh

 install %{SOURCE13} macros.python.in
 install %{SOURCE6} scripts/find-perl-provides
 install %{SOURCE7} scripts/find-perl-requires
 install %{SOURCE13} macros.python.in
 install %{SOURCE6} scripts/find-perl-provides
 install %{SOURCE7} scripts/find-perl-requires


@@ -287,47 +494,65 @@ 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
 autoconf
 awk -f %{SOURCE14} %{SOURCE1}
 
 cd popt
 autoconf

-automake -a -c
+automake -a -c -f
+cd ../beecrypt
+rm -f missing
+libtoolize --force --copy
+aclocal
+autoheader
+autoconf
+automake -a -c -f
+cd ../zlib
+rm -f missing
+# first call for work around libtoolize problems
+aclocal
+autoconf
+automake -a -c -f
+libtoolize --force --copy
+# second call for correct work
+aclocal
+autoconf
+automake -a -c -f

 aclocal
 autoheader
 aclocal
 autoheader

+automake -a -c -f

 %{__automake}
 cd ..
 
 rm -f missing
 libtoolize --force --copy
 autoconf
 %{__automake}
 cd ..
 
 rm -f missing
 libtoolize --force --copy
 autoconf

-# ugly workaround for automake
-sed -e 's#cpio.c $(DBLIBOBJS) depends.c#cpio.c depends.c#g' \
-       lib/Makefile.am > lib/Makefile.am.new
-mv -f lib/Makefile.am.new lib/Makefile.am
-automake -a -c
-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
-
-sed -e 's#python1.5#python%{python_version}#g' \
-       python/Makefile.in > python/Makefile.in.new
-mv -f python/Makefile.in.new python/Makefile.in
+automake -a -c -f

 
 

+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|'  \
+       -e 's|@host_cpu@|%{_target_cpu}|'  macros.in  > macros.tmp
+# 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
 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
+       --with-apidocs \
+       --with-python \
+       --without-db

 %configure \
 %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


@@ -363,11 +588,7 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 

-%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.*.*
+

 %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/rpmdb
 %attr(755,root,root) %{_libdir}/rpm/rpmq
 %attr(755,root,root) %{_libdir}/rpm/rpmk


@@ -388,10 +609,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/rpm
 %dir %{_libdir}/rpm
 
 %dir /var/lib/rpm
 %dir %{_libdir}/rpm
 

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

 %{_libdir}/rpm/rpmpopt*
 %{_libdir}/rpm/rpmpopt*

+%{_libdir}/rpm/macros

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


@@ -399,9 +620,17 @@ 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*
+%files lib
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/librpm*-*.so

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

+%attr(755,root,root) %{_libdir}/rpm/cross-build

 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rpmbuild
 %attr(755,root,root) %{_bindir}/rpme
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rpmbuild
 %attr(755,root,root) %{_bindir}/rpme


@@ -421,16 +650,31 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/rpm/cpanflute
 %attr(755,root,root) %{_libdir}/rpm/http.req
 %attr(755,root,root) %{_libdir}/rpm/magic.*
 %attr(755,root,root) %{_libdir}/rpm/cpanflute
 %attr(755,root,root) %{_libdir}/rpm/http.req
 %attr(755,root,root) %{_libdir}/rpm/magic.*

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

 %attr(755,root,root) %{_libdir}/rpm/u_pkg.sh
 %attr(755,root,root) %{_libdir}/rpm/u_pkg.sh

-%attr(755,root,root) %{_libdir}/rpm/rpme
-%attr(755,root,root) %{_libdir}/rpm/rpmu
+# not used yet ...
+%{_libdir}/rpm/sql.prov
+%{_libdir}/rpm/sql.req
+%{_libdir}/rpm/tcl.req
+%{_libdir}/rpm/trpm
+
+%attr(755,root,root) %{_bindir}/javadeps
+%attr(755,root,root) %{_bindir}/gendiff
+%attr(755,root,root) %{_bindir}/rpmbuild
+
+%{_mandir}/man1/*
+%{_mandir}/man8/rpmbuild.8*

 %attr(755,root,root) %{_libdir}/rpm/rpmb
 %attr(755,root,root) %{_libdir}/rpm/rpmi
 %attr(755,root,root) %{_libdir}/rpm/rpmt
 %attr(755,root,root) %{_libdir}/rpm/rpme
 %attr(755,root,root) %{_libdir}/rpm/rpmb
 %attr(755,root,root) %{_libdir}/rpm/rpmi
 %attr(755,root,root) %{_libdir}/rpm/rpmt
 %attr(755,root,root) %{_libdir}/rpm/rpme

-%attr(755,root,root) %{_libdir}/librpm*.la
-%attr(755,root,root) %{_libdir}/librpm*.so
+%attr(755,root,root) %{_libdir}/librpm.la
+%attr(755,root,root) %{_libdir}/librpm.so
+%attr(755,root,root) %{_libdir}/librpmio.la
+%attr(755,root,root) %{_libdir}/librpmio.so
+%attr(755,root,root) %{_libdir}/librpmdb.la
+%attr(755,root,root) %{_libdir}/librpmdb.so
+%attr(755,root,root) %{_libdir}/librpmbuild.la
+%attr(755,root,root) %{_libdir}/librpmbuild.so

 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/rpm
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/rpm


@@ -438,10 +682,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/librpm*.so
 
 %files static
 %attr(755,root,root) %{_libdir}/librpm*.so
 
 %files static

-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/rpm[2qvseiu]*
+%attr(755,root,root) %{_bindir}/rpmdb
+%attr(755,root,root) %{_libdir}/rpm/rpm[edikqv]
+%attr(755,root,root) %{_libdir}/rpm/rpmdiff*
+%{_prefix}/lib/rpm/rpm.daily
+%{_prefix}/lib/rpm/rpm.log
+%{_prefix}/lib/rpm/rpm.xinetd
+%{_prefix}/lib/rpm/rpm2cpio.sh

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

-%{_mandir}/man1/*

 %attr(755,root,root) %{_bindir}/javadeps
 %attr(755,root,root) %{_bindir}/rpm2cpio
 
 %attr(755,root,root) %{_bindir}/javadeps
 %attr(755,root,root) %{_bindir}/rpm2cpio
 


@@ -458,11 +708,26 @@ 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

-%files python
+%attr(755,root,root) %{_libdir}/rpm/find-req.pl
+%attr(755,root,root) %{_libdir}/rpm/get_magic.pl
+
+%{_libdir}/rpm/macros.perl
+# this subpackage need fix
+#%files -n python-rpm
+#%defattr(644,root,root,755)
+#%{py_sitedir}/*.so
+
+%files -n beecrypt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libbeecrypt.so.*.*
+
+%files -n beecrypt-devel

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

-%{python_sitedir}/*.so
+%{_prefix}/lib/libbeecrypt.so
+%{_prefix}/lib/libbeecrypt.la
+%{_includedir}/beecrypt

 %{_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