- redesign: allow to be used as a library

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 7969c08f76f3ebf68fe46d2ccff3ed37786c42cd..21f83ea81d2ffbb0e7ce7da9dca1e6cc5883c4dc 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,93 +1,141 @@
+#
+# TODO:
+# - learn find-perl-provides to use the __perl macro instead
+#   of /usr/bin/perl
+#   NOTE: there is no find-perl* now, only perl.{prov,req}
+# - use system libmagic not internal libfmagic
+#
+# Conditional build:
+# _without_static      - build shared /bin/rpm (doesn't work at the moment)
+# _without_docs                - don't generate documentation with doxygen
+# force_cc             - force using __cc other than "%{_target_cpu}-pld-linux-gcc"
+# force_cxx            - force using __cxx other than "%{_target_cpu}-pld-linux-g++"
+# force_cpp            - force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E"
+#

 %include        /usr/lib/rpm/macros.python
 %include        /usr/lib/rpm/macros.python

-%define        beecrypt_ver    2.2.0
-%define        beecrypt_rel    1.4
+%define snap   20030610
+# versions of required libraries
+%define        reqdb_ver       4.1.25-1
+%define        reqpopt_ver     1.9
+%define        beecrypt_ver    3.0.0-0.20030610.1
+%define rpm_macros_rev 1.118

 Summary:       RPM Package Manager
 Summary(de):   RPM Packet-Manager
 Summary(es):   Gestor de paquetes RPM
 Summary(pl):   Aplikacja do zarz±dzania pakietami RPM
 Summary(pt_BR):        Gerenciador de pacotes RPM
 Summary:       RPM Package Manager
 Summary(de):   RPM Packet-Manager
 Summary(es):   Gestor de paquetes RPM
 Summary(pl):   Aplikacja do zarz±dzania pakietami RPM
 Summary(pt_BR):        Gerenciador de pacotes RPM

+Summary(ru):   íÅÎÅÄÖÅÒ ÐÁËÅÔÏ× ÏÔ RPM
+Summary(uk):   íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM

 Name:          rpm
 Name:          rpm

-Version:       4.1
-Release:       1.4
+%define        ver     4.3
+Version:       %{ver}
+%define        rel     0.%{snap}.18
+Release:       %{rel}

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

-Source0:       ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/%{name}-%{version}.tar.gz
+#Source0:      ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz
+Source0:       ftp://distfiles.pld-linux.org/src/%{name}-%{version}.%{snap}.tar.gz
+# Source0-md5: f923fe5ca8f0803868ae7bcc0fabe9bb

 Source1:       %{name}.groups
 Source1:       %{name}.groups

-Source2:       %{name}.macros
+Source2:       %{name}.platform

 Source3:       %{name}-install-tree
 Source3:       %{name}-install-tree

-Source4:       %{name}-find-%{name}-provides
-Source5:       %{name}-macros.perl
-Source6:       %{name}-find-perl-provides
-Source7:       %{name}-find-perl-requires
-Source8:       %{name}-find-spec-bcond
-Source9:       %{name}-find-lang
-Source10:      %{name}-find-provides
-Source11:      %{name}-find-requires
-Source12:      %{name}-macros.php
-Source13:      %{name}-macros.python
-Source14:      %{name}-groups-po.awk
-Source15:      %{name}-compress-doc
-Source16:      %{name}-check-files
-Source17:      %{name}-php-provides
-Source18:      %{name}-php-requires
-Source19:      %{name}-find-php-provides
-Source20:      %{name}-find-php-requires
+Source4:       %{name}-find-rpm-provides
+Source5:       %{name}-find-spec-bcond
+Source6:       %{name}-find-lang
+Source7:       %{name}-find-provides
+Source8:       %{name}-find-requires
+Source9:       %{name}-groups-po.awk
+Source10:      %{name}-compress-doc
+Source11:      %{name}-check-files
+Source12:      %{name}-php-provides
+Source13:      %{name}-php-requires
+Source14:      %{name}.macros
+Source15:      %{name}-find-provides-wrapper
+Source16:      %{name}-find-requires-wrapper
+Source30:      builder
+Source31:      adapter.awk
+Source32:      pldnotify.awk
+Source33:      perl.prov

 Patch0:                %{name}-pl.po.patch
 Patch0:                %{name}-pl.po.patch

-Patch1:                %{name}-%{name}rc.patch
+Patch1:                %{name}-rpmrc.patch

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

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

 Patch4:                %{name}-perl-macros.patch
 Patch5:                %{name}-perl-req-perlfile.patch
 Patch4:                %{name}-perl-macros.patch
 Patch5:                %{name}-perl-req-perlfile.patch

-Patch6:                %{name}-cache.patch
-Patch7:                %{name}-glob.patch
-Patch8:                %{name}-header_h.patch
-Patch9:                %{name}-fast-alAddPackage.patch
-Patch10:       %{name}-byKey.patch
-Patch11:       %{name}-noexpand.patch
-Patch12:       %{name}-scripts-closefds.patch
-Patch13:       %{name}-python-macros.patch
-Patch14:       %{name}-perlprov-regonly.patch
-Patch15:       %{name}-4.1-branch.patch
-Patch16:       %{name}-drop-legacy-CLI.patch
-Patch17:       %{name}-perlprov-perl5.6.patch
-Patch18:       %{name}-gettext-in-header.patch
-Patch19:       %{name}-compress-doc.patch
-Patch20:       %{name}-lt14d.patch
-Patch21:       %{name}-gettext0.11.patch
-Patch22:       %{name}-build.patch
-Patch23:       %{name}-python-link.patch
-Patch24:       %{name}-system_libs.patch
-Patch25:       %{name}-bb-and-short-circuit.patch
+Patch6:                %{name}-glob.patch
+Patch7:                %{name}-noexpand.patch
+Patch8:                %{name}-scripts-closefds.patch
+Patch9:                %{name}-python-macros.patch
+Patch10:       %{name}-gettext-in-header.patch
+Patch11:       %{name}-compress-doc.patch
+Patch12:       %{name}-gettext0.11.patch
+Patch13:       %{name}-build.patch
+Patch14:       %{name}-system_libs.patch
+Patch15:       %{name}-bb-and-short-circuit.patch
+Patch16:       %{name}-etc_dir.patch
+Patch17:       %{name}-system_libs-more.patch
+Patch18:       %{name}-php-deps.patch
+Patch19:       %{name}-python-fix.patch
+Patch20:       %{name}-spec-prep-pre.patch
+Patch21:       %{name}-perl_req.patch
+Patch22:       %{name}-system_libs_more.patch
+Patch23:       %{name}-python_2_3.patch
+Patch24:       %{name}-no-bin-env.patch
+Patch25:       %{name}-specflags.patch
+Patch26:       %{name}-magic-usesystem.patch
+Patch27:       %{name}-dontneedutils.patch
+Patch28:       %{name}-python-beecrypt.patch
+Patch29:       %{name}-man-typos.patch
+Patch30:       %{name}-man-pl.patch
+Patch31:       %{name}-fdClose-typo.patch
+Patch32:       %{name}-userpmdepswrappers.patch
+Patch33:       %{name}-provides-dont-obsolete.patch
+Patch34:       %{name}-examplesaredoc.patch

 URL:           http://www.rpm.org/
 Icon:          rpm.gif
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 URL:           http://www.rpm.org/
 Icon:          rpm.gif
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake

+BuildRequires: beecrypt-devel >= %{beecrypt_ver}

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

-BuildRequires: db-devel >= 4.1
-BuildRequires: doxygen
+BuildRequires: db-devel >= %{reqdb_ver}
+%{!?_without_docs:BuildRequires:       doxygen}

 BuildRequires: gettext-devel >= 0.11.4-2
 BuildRequires: gettext-devel >= 0.11.4-2

-BuildRequires: libelf-devel
+BuildRequires: elfutils-devel
+#BuildRequires:        libmagic-devel

 BuildRequires: libtool
 BuildRequires: patch >= 2.2
 BuildRequires: python-devel >= 2.2
 BuildRequires: python-modules >= 2.2
 BuildRequires: libtool
 BuildRequires: patch >= 2.2
 BuildRequires: python-devel >= 2.2
 BuildRequires: python-modules >= 2.2

+BuildRequires: rpm-perlprov

 BuildRequires: rpm-pythonprov
 BuildRequires: zlib-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: zlib-devel

-BuildRequires: popt-devel >= 1.7
-%if %{!?_without_static:1}%{?_without_static:0}
+BuildRequires: popt-devel >= %{reqpopt_ver}
+%if %{!?_without_static:1}0

 # Require static library only for static build
 # Require static library only for static build

+BuildRequires: beecrypt-static >= %{beecrypt_ver}

 BuildRequires: bzip2-static >= 1.0.2-5
 BuildRequires: bzip2-static >= 1.0.2-5

-BuildRequires: db-static >= 4.1
+BuildRequires: db-static >= %{reqdb_ver}

 BuildRequires: glibc-static >= 2.2.94
 BuildRequires: glibc-static >= 2.2.94

-BuildRequires: libelf-static
+BuildRequires: elfutils-static
+#BuildRequires:        libmagic-static

 BuildRequires: zlib-static
 BuildRequires: zlib-static

-BuildRequires: popt-static >= 1.7
+BuildRequires: popt-static >= %{reqpopt_ver}

 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

+Requires:      popt >= %{reqpopt_ver}

 Conflicts:     glibc < 2.2.92
 
 %define                __find_provides %{SOURCE4}
 %define                _binary_payload w9.gzdio
 Conflicts:     glibc < 2.2.92
 
 %define                __find_provides %{SOURCE4}
 %define                _binary_payload w9.gzdio

+%define                _noPayloadPrefix 1
+
+# don't require very fresh rpm.macros to build
+%define                __gettextize gettextize --copy --force --intl ; cp -f po/Makevars{.template,}
+
+# stabilize new build environment
+%define                __cc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc}
+%define                __cxx %{?force_cxx}%{!?force_cxx:%{_target_cpu}-pld-linux-g++}
+%define                __cpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E}

 
 %description
 RPM is a powerful package manager, which can be used to build,
 
 %description
 RPM is a powerful package manager, which can be used to build,


@@ -110,10 +158,10 @@ almacenaje de archivos, y informaci
 nombre, versión y descripción.
 
 %description -l pl
 nombre, versión y descripción.
 
 %description -l pl

-RPM jest doskona³ym mened¿erem pakietów. Dziêki niemu bêdziesz móg³
-przebudowaæ, zainstalowaæ czy zweryfikowaæ dowolny pakiet. Informacje
-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±
+RPM jest doskona³ym programem zarz±dzaj±cym pakietami. Umo¿liwia on
+przebudowanie, instalacjê czy weryfikacjê dowolnego pakietu.
+Informacje 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.
 
 przechowywane w bazie danych i mo¿na je uzyskaæ za pomoc± opcji
 odpytywania programu rpm.
 


@@ -124,26 +172,43 @@ 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.
 
 arquivos e informações adicionais, incluindo nome, versão e descrição
 do pacote, permissões dos arquivos, etc.
 

+%description -l ru
+RPM - ÜÔÏ ÍÏÝÎÙÊ ÍÅÎÅÄÖÅÒ ÐÁËÅÔÏ×, ËÏÔÏÒÙÊ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÄÌÑ
+ÓÏÚÄÁÎÉÑ, ÉÎÓÔÁÌÌÑÃÉÉ, ÚÁÐÒÏÓÏ× (query), ÐÒÏ×ÅÒËÉ, ÏÂÎÏ×ÌÅÎÉÑ É
+ÕÄÁÌÅÎÉÑ ÐÒÏÇÒÁÍÍÎÙÈ ÐÁËÅÔÏ×. ðÁËÅÔ ÓÏÓÔÏÉÔ ÉÚ ÆÁÊÌÏ×ÏÇÏ ÁÒÈÉ×Á É
+ÓÌÕÖÅÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ, ×ËÌÀÞÁÀÝÅÊ ÎÁÚ×ÁÎÉÅ, ×ÅÒÓÉÀ, ÏÐÉÓÁÎÉÅ É ÄÒÕÇÉÅ
+ÄÁÎÎÙÅ Ï ÐÁËÅÔÅ.
+
+%description -l uk
+RPM - ÃÅ ÐÏÔÕÖÎÉÊ ÍÅÎÅÄÖÅÒ ÐÁËÅÔ¦×, ÝÏ ÍÏÖÅ ÂÕÔÉ ×ÉËÏÒÉÓÔÁÎÉÊ ÄÌÑ
+ÓÔ×ÏÒÅÎÎÑ, ¦ÎÓÔÁÌÑæ§, ÚÁÐÉÔ¦× (query), ÐÅÒÅצÒËÉ, ÐÏÎÏ×ÌÅÎÎÑ ÔÁ
+×ÉÄÁÌÅÎÎÑ ÐÒÏÇÒÁÍÎÉÈ ÐÁËÅÔ¦×. ðÁËÅÔ ÓËÌÁÄÁ¤ÔØÓÑ Ú ÆÁÊÌÏ×ÏÇÏ ÁÒȦ×Õ ÔÁ
+ÓÌÕÖÂÏ×ϧ ¦ÎÆÏÒÍÁæ§, ÝÏ Í¦ÓÔÉÔØ ÎÁÚ×Õ, ×ÅÒÓ¦À, ÏÐÉÓ ÔÁ ¦ÎÛÕ
+¦ÎÆÏÒÍÁæÀ ÐÒÏ ÐÁËÅÔ.
+

 %package devel
 %package devel

-Summary:       Header files and libraries
-Summary(de):   Header-Dateien uns Libraries
+Summary:       Header files for rpm libraries
+Summary(de):   Header-Dateien für rpm Libraries

 Summary(es):   Archivos de inclusión y bibliotecas para programas de manipulación de paquetes rpm
 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 bibliotek rpm

 Summary(pt_BR):        Arquivos de inclusão e bibliotecas para programas de manipulação de pacotes RPM
 Summary(pt_BR):        Arquivos de inclusão e bibliotecas para programas de manipulação de pacotes RPM

+Summary(ru):   èÅÄÅÒÙ É ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ Ó rpm-ÐÁËÅÔÁÍÉ
+Summary(uk):   èÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm

 Group:         Development/Libraries
 Group:         Development/Libraries

-Requires:      %{name} = %{version}
-Requires:      beecrypt-devel
+Requires:      %{name}-lib = %{version}
+Requires:      beecrypt-devel >= %{beecrypt_ver}

 Requires:      bzip2-devel
 Requires:      db-devel
 Requires:      bzip2-devel
 Requires:      db-devel

-Requires:      libelf-devel
-Requires:      popt-devel >= 1.7
+Requires:      elfutils-devel
+Requires:      popt-devel >= %{reqpopt_ver}

 Requires:      zlib-devel
 
 %description devel
 Requires:      zlib-devel
 
 %description 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
+The RPM packaging system includes C libraries that make it easy to
+manipulate RPM packages and databases. They are intended to ease the

 creation of graphical package managers and other tools that need
 creation of graphical package managers and other tools that need

-intimate knowledge of RPM packages.
+intimate knowledge of RPM packages. This package contains header files
+for these libraries.

 
 %description devel -l de
 Der RPM-Packensystem enthält eine C-Library, die macht es einfach
 
 %description devel -l de
 Der RPM-Packensystem enthält eine C-Library, die macht es einfach


@@ -158,10 +223,11 @@ facilitar la creaci
 herramientas que necesiten un conocimiento profundo de paquetes RPM.
 
 %description devel -l pl
 herramientas que necesiten un conocimiento profundo de paquetes RPM.
 
 %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±
-szczegó³owej wiedzy na temat pakietów RPM.
+System RPM zawiera biblioteki C, które u³atwiaj± manipulowanie
+pakietami RPM oraz bazami danych. W zamiarze ma to upro¶ciæ tworzenie
+graficznych programów zarz±dzaj±cych pakietami oraz innych narzêdzi,
+które wymagaj± szczegó³owej wiedzy na temat pakietów RPM. Ten pakiet
+zawiera pliki nag³ówkowe wspomnianych bibliotek.

 
 %description devel -l pt_BR
 O sistema de empacotamento RPM inclui uma biblioteca C que torna fácil
 
 %description devel -l pt_BR
 O sistema de empacotamento RPM inclui uma biblioteca C que torna fácil


@@ -169,13 +235,34 @@ a manipula
 facilitar a criação de gerenciadores gráficos de pacotes e outras
 ferramentas que precisem de conhecimento profundo de pacotes RPM.
 
 facilitar a criação de gerenciadores gráficos de pacotes e outras
 ferramentas que precisem de conhecimento profundo de pacotes RPM.
 

+%description devel -l ru
+óÉÓÔÅÍÁ ÕÐÒÁ×ÌÅÎÉÑ ÐÁËÅÔÁÍÉ RPM ÓÏÄÅÒÖÉÔ ÂÉÂÌÉÏÔÅËÕ C, ËÏÔÏÒÁÑ
+ÕÐÒÏÝÁÅÔ ÍÁÎÉÐÕÌÑÃÉÀ ÐÁËÅÔÁÍÉ RPM É ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍÉ ÂÁÚÁÍÉ ÄÁÎÎÙÈ.
+üÔÁ ÂÉÂÌÉÏÔÅËÁ ÐÒÅÄÎÁÚÎÁÞÅÎÁ ÄÌÑ ÏÂÌÅÇÞÅÎÉÑ ÓÏÚÄÁÎÉÑ ÇÒÁÆÉÞÅÓËÉÈ
+ÐÁËÅÔÎÙÈ ÍÅÎÅÄÖÅÒÏ× É ÄÒÕÇÉÈ ÕÔÉÌÉÔ, ËÏÔÏÒÙÍ ÎÅÏÂÈÏÄÉÍÏ ÒÁÂÏÔÁÔØ Ó
+ÐÁËÅÔÁÍÉ RPM.
+
+%description devel -l uk
+óÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ÐÁËÅÔÁÍÉ RPM ͦÓÔÉÔØ Â¦Â̦ÏÔÅËÕ C, ËÏÔÒÁ ÓÐÒÏÝÕ¤
+ÒÏÂÏÔÕ Ú ÐÁËÅÔÁÍÉ RPM ÔÁ צÄÐÏצÄÎÉÍÉ ÂÁÚÁÍÉ ÄÁÎÉÈ. ãÑ Â¦Â̦ÏÔÅËÁ
+ÐÒÉÚÎÁÞÅÎÁ ÄÌÑ ÐÏÌÅÇÛÅÎÎÑ ÓÔ×ÏÒÅÎÎÑ ÇÒÁƦÞÎÉÈ ÐÁËÅÔÎÉÈ ÍÅÎÅÄÖÅÒ¦× ÔÁ
+¦ÎÛÉÈ ÕÔÉ̦Ô, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ RPM.
+

 %package static
 Summary:       RPM static libraries
 Summary(de):   RPMs statische Libraries
 Summary(pl):   Biblioteki statyczne RPM-a
 Summary(pt_BR):        Bibliotecas estáticas para o desenvolvimento de aplicações RPM
 %package static
 Summary:       RPM static libraries
 Summary(de):   RPMs statische Libraries
 Summary(pl):   Biblioteki statyczne RPM-a
 Summary(pt_BR):        Bibliotecas estáticas para o desenvolvimento de aplicações RPM

+Summary(ru):   óÔÁÔÉÞÅÓËÁÑ ÂÉÂÌÉÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ Ó rpm-ÐÁËÅÔÁÍÉ
+Summary(uk):   óÔÁÔÉÞÎÁ ¦Â̦ÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm

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

+Requires:      beecrypt-static >= %{beecrypt_ver}
+Requires:      bzip2-static
+Requires:      db-static
+Requires:      elfutils-static
+Requires:      popt-static >= %{reqpopt_ver}
+Requires:      zlib-static

 
 %description static
 RPM static libraries.
 
 %description static
 RPM static libraries.


@@ -189,13 +276,23 @@ Biblioteki statyczne RPM-a.
 %description static -l pt_BR
 Bibliotecas estáticas para desenvolvimento.
 
 %description static -l pt_BR
 Bibliotecas estáticas para desenvolvimento.
 

+%description static -l ru
+óÉÓÔÅÍÁ ÕÐÒÁ×ÌÅÎÉÑ ÐÁËÅÔÁÍÉ RPM ÓÏÄÅÒÖÉÔ ÂÉÂÌÉÏÔÅËÕ C, ËÏÔÏÒÁÑ
+ÕÐÒÏÝÁÅÔ ÍÁÎÉÐÕÌÑÃÉÀ ÐÁËÅÔÁÍÉ RPM É ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍÉ ÂÁÚÁÍÉ ÄÁÎÎÙÈ.
+üÔÏ ÓÔÁÔÉÞÅÓËÁÑ ÂÉÂÌÉÏÔÅËÁ RPM.
+
+%description static -l uk
+óÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ÐÁËÅÔÁÍÉ RPM ͦÓÔÉÔØ Â¦Â̦ÏÔÅËÕ C, ËÏÔÒÁ ÓÐÒÏÝÕ¤
+ÒÏÂÏÔÕ Ú ÐÁËÅÔÁÍÉ RPM ÔÁ צÄÐÏצÄÎÉÍÉ ÂÁÚÁÍÉ ÄÁÎÉÈ. ãÅ ÓÔÁÔÉÞÎÁ
+¦Â̦ÏÔÅËÁ RPM.
+

 %package utils
 Summary:       Additional utilities for managing rpm packages and database
 Summary(de):   Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Summary(pl):   Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami
 Group:         Applications/File
 Requires:      %{name} = %{version}
 %package utils
 Summary:       Additional utilities for managing rpm packages and database
 Summary(de):   Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Summary(pl):   Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami
 Group:         Applications/File
 Requires:      %{name} = %{version}

-Requires:      popt >= 1.7
+Requires:      popt >= %{reqpopt_ver}

 
 %description utils
 Additional utilities for managing rpm packages and database.
 
 %description utils
 Additional utilities for managing rpm packages and database.


@@ -206,12 +303,32 @@ Zusatzwerkzeuge f
 %description utils -l pl
 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 utils-static
+Summary:       Static rpm utilities
+Summary(pl):   Statyczne narzêdzia rpm
+Group:         Applications/System
+Requires:      %{name} = %{version}
+
+%description utils-static
+Static rpm utilities for repairing system in case something with
+shared libraries used by rpm become broken. Currently it contains rpmi
+binary, which can be used to install/upgrade/remove packages without
+using shared libraries (well, in fact with exception of NSS modules).
+
+%description utils-static -l pl
+Statyczne narzêdzia rpm do naprawy systemu w przypadku zepsucia czego¶
+zwi±zanego z bibliotekami wspó³dzielonymi u¿ywanymi przez rpm-a.
+Aktualnie pakiet zawiera binarkê rpmi, któr± mo¿na u¿yæ do instalacji,
+uaktualniania lub usuwania pakietów bez udzia³u bibliotek statycznych
+(z wyj±tkiem modu³ów NSS).
+

 %package perlprov
 Summary:       Additional utilities for checking perl provides/requires in rpm packages
 Summary(de):   Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen
 Summary(pl):   Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
 Group:         Applications/File
 Requires:      %{name} = %{version}
 %package perlprov
 Summary:       Additional utilities for checking perl provides/requires in rpm packages
 Summary(de):   Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen
 Summary(pl):   Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
 Group:         Applications/File
 Requires:      %{name} = %{version}

+Requires:      perl-devel

 Requires:      perl-modules
 
 %description perlprov
 Requires:      perl-modules
 
 %description perlprov


@@ -288,44 +405,51 @@ Python para manipular pacotes e bancos de dados RPM.
 
 %package lib
 Summary:       RPMs library
 
 %package lib
 Summary:       RPMs library

-Summary(pl):   Biblioteki RPMa
+Summary(pl):   Biblioteki RPM-a

 Group:         Libraries
 Group:         Libraries

+Requires:      db >= %{reqdb_ver}
+Requires:      popt >= %{reqpopt_ver}

 
 %description lib
 RPMs library.
 
 %description lib -l pl
 
 %description lib
 RPMs library.
 
 %description lib -l pl

-Biblioteki RPMa.
+Biblioteki RPM-a.

 
 %package build
 
 %package build

-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(pt_BR): Scripts e programas executáveis usados para construir pacotes
-Group:          Applications/File
-Requires:       %{name} = %{version}
-Requires:       /bin/id
-Requires:       awk
-Requires:       binutils
-Requires:       diffutils
-Requires:       file >= 3.31
-Requires:       fileutils
-Requires:       findutils
+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(pt_BR):        Scripts e programas executáveis usados para construir pacotes
+Summary(ru):   óËÒÉÐÔÙ É ÕÔÉÌÉÔÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÏ×
+Summary(uk):   óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦×
+Group:         Applications/File
+Provides:      rpmbuild(macros) = %{rpm_macros_rev}
+Requires(pre): findutils
+Requires:      %{name} = %{version}
+Requires:      %{name}-utils = %{version}
+Requires:      /bin/id
+Requires:      awk
+Requires:      binutils
+Requires:      diffutils
+Requires:      file >= 4.01
+Requires:      fileutils
+Requires:      findutils

 %ifarch athlon
 %ifarch athlon

-Requires:       gcc >= 3.0.3
+Requires:      gcc >= 3.0.3

 %else
 %else

-Requires:       gcc
+Requires:      gcc

 %endif
 %endif

-Requires:       glibc-devel
-Requires:       grep
-Requires:       gzip
-Requires:       make
-Requires:       patch
-Requires:       popt >= 1.7
-Requires:       sed
-Requires:       sh-utils
-Requires:       tar
-Requires:       textutils
+Requires:      glibc-devel
+Requires:      grep
+Requires:      gzip
+Requires:      make
+Requires:      patch
+Requires:      popt >= 1.7
+Requires:      sed
+Requires:      sh-utils
+Requires:      tar
+Requires:      textutils

 
 %description build
 Scripts for building binary RPM packages.
 
 %description build
 Scripts for building binary RPM packages.


@@ -340,49 +464,47 @@ Skrypty pomocnicze do budowania binarnych RPM-
 Este pacote contém scripts e programas executáveis que são usados para
 construir pacotes usando o RPM.
 
 Este pacote contém scripts e programas executáveis que são usados para
 construir pacotes usando o RPM.
 

-%package -n beecrypt
-Summary:       Crypto library
-Summary(pl):   Biblioteka kryptograficzna
-Version:       %{beecrypt_ver}
-Release:       %{beecrypt_rel}
-Epoch:         1
-Group:         Libraries
-
-%description -n beecrypt
-Crypto library (modified for rpm needs).
-
-%description -n beecrypt -l pl
-Biblioteka kryptograficzna (zmodyfikowana na potrzeby rpma).
+%description build -l ru
+òÁÚÌÉÞÎÙÅ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÓËÒÉÐÔÙ É ÉÓÐÏÌÎÑÅÍÙÅ ÐÒÏÇÒÁÍÍÙ, ËÏÔÏÒÙÅ
+ÉÓÐÏÌØÚÕÀÔÓÑ ÄÌÑ ÓÂÏÒËÉ RPM'Ï×.
+
+%description build -l uk
+ò¦ÚÎÏÍÁΦÔΦ ÄÏÐÏͦÖΦ ÓËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ ÄÌÑ
+ÐÏÂÕÄÏ×É RPM'¦×.
+
+%package build-tools
+Summary:       Scripts for managing .spec files and building RPM packages
+Summary(de):   Scripts fürs Bauen binärer RPM-Pakete
+Summary(pl):   Skrypty pomocnicze do zarz±dznia plikami .spec i budowania RPM-ów
+Summary(pt_BR):        Scripts e programas executáveis usados para construir pacotes
+Summary(ru):   óËÒÉÐÔÙ É ÕÔÉÌÉÔÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÏ×
+Summary(uk):   óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦×
+Group:         Applications/File
+Requires:      %{name}-build = %{version}
+# these are optional
+#Requires:     cvs
+#Requires:     wget

 
 

-%package -n beecrypt-devel
-Summary:       Crypto library - development files
-Summary(pl):   Biblioteka kryptograficzna - pliki developerskie
-Version:       %{beecrypt_ver}
-Release:       %{beecrypt_rel}
-Group:         Development/Libraries
-Requires:      beecrypt = %{beecrypt_ver}
-Epoch:         1
+%description build-tools
+Scripts for managing .spec files and building RPM packages.

 
 

-%description -n beecrypt-devel
-Crypto library - development files.
+%description build-tools -l de
+Scripts fürs Bauen RPM-Pakete.

 
 

-%description -n beecrypt-devel -l pl
-Biblioteka kryptograficzna - pliki developerskie.
+%description build-tools -l pl
+Skrypty pomocnicze do zarz±dzania plikami .spec i do budowania RPM-ów.

 
 

-%package -n beecrypt-static
-Summary:       Crypto library - static version
-Summary(pl):   Statyczna biblioteka kryptograficzna
-Version:       %{beecrypt_ver}
-Release:       %{beecrypt_rel}
-Group:         Development/Libraries
-Requires:      beecrypt-devel = %{beecrypt_ver}
-Epoch:         1
+%description build-tools -l pt_BR
+Este pacote contém scripts e programas executáveis que são usados para
+construir pacotes usando o RPM.

 
 

-%description -n beecrypt-static
-Static version of crypto library.
+%description build-tools -l ru
+òÁÚÌÉÞÎÙÅ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÓËÒÉÐÔÙ É ÉÓÐÏÌÎÑÅÍÙÅ ÐÒÏÇÒÁÍÍÙ, ËÏÔÏÒÙÅ
+ÉÓÐÏÌØÚÕÀÔÓÑ ÄÌÑ ÓÂÏÒËÉ RPM'Ï×.

 
 

-%description -n beecrypt-static -l pl
-Statyczna wersja biblioteki kryptograficznej.
+%description build-tools -l uk
+ò¦ÚÎÏÍÁΦÔΦ ÄÏÐÏͦÖΦ ÓËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ ÄÌÑ
+ÐÏÂÕÄÏ×É RPM'¦×.

 
 %prep
 %setup -q
 
 %prep
 %setup -q


@@ -392,15 +514,11 @@ Statyczna wersja biblioteki kryptograficznej.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

-# not needed ? (break compilation)
-#%patch6 -p1
+%patch6 -p1

 %patch7 -p1
 %patch7 -p1

-# needed ?
-#%patch8 -p1
-# rejected (needed ?)
-#%patch9 -p1
-# too many rejects, Pawel please check if needed and rediff
-#%patch10 -p0
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1

 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1


@@ -410,25 +528,33 @@ Statyczna wersja biblioteki kryptograficznej.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1

-%patch20 -p1
+# patch20 -- look down

 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1

-%patch25 -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 %{SOURCE5} macros.perl.in
-install %{SOURCE13} macros.python.in
-install %{SOURCE12} macros.php.in
-install %{SOURCE6} scripts/find-perl-provides
-install %{SOURCE7} scripts/find-perl-requires
-install %{SOURCE9} scripts/find-lang.sh
-install %{SOURCE17} scripts/php.prov.in
-install %{SOURCE18} scripts/php.req.in
-install %{SOURCE19} scripts/find-php-provides
-install %{SOURCE20} scripts/find-php-requires
+echo '# obsoleted file' > macros.perl
+echo '# obsoleted file' > macros.python
+echo '# obsoleted file' > macros.php
+install %{SOURCE6} scripts/find-lang.sh
+install %{SOURCE12} scripts/php.prov.in
+install %{SOURCE13} scripts/php.req.in
+install %{SOURCE33} scripts/perl.prov
+cat %{SOURCE14} >> macros.in
+%patch20 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1

 
 cd scripts;
 mv -f perl.req perl.req.in
 
 cd scripts;
 mv -f perl.req perl.req.in


@@ -438,15 +564,17 @@ cd ..
 chmod +x %{SOURCE4}
 rm -rf zlib libelf db db3 popt rpmdb/db.h
 
 chmod +x %{SOURCE4}
 rm -rf zlib libelf db db3 popt rpmdb/db.h
 

-%build

 # generate Group translations to *.po
 # generate Group translations to *.po

-awk -f %{SOURCE14} %{SOURCE1}
+awk -f %{SOURCE9} %{SOURCE1}

 
 

-%{__aclocal}
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-cd beecrypt
+# update macros paths
+for f in doc{,/ja,/pl}/rpm.8 doc{,/ja,/pl}/rpmbuild.8 ; do
+       sed -e 's@lib/rpm/redhat@lib/rpm/pld@g' $f > ${f}.tmp
+       mv -f ${f}.tmp $f
+done
+
+%build
+cd file

 rm -f missing
 %{__libtoolize}
 %{__aclocal}
 rm -f missing
 %{__libtoolize}
 %{__aclocal}


@@ -459,8 +587,7 @@ rm -f missing
 %{__libtoolize}
 %{__gettextize}
 %{__aclocal}
 %{__libtoolize}
 %{__gettextize}
 %{__aclocal}

-autoupdate
-%{__autoheader} || :
+%{__autoheader}

 %{__autoconf}
 %{__automake}
 
 %{__autoconf}
 %{__automake}
 


@@ -470,10 +597,12 @@ sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|'  \
        -e 's|@host_cpu@|%{_target_cpu}|'  macros.in  > macros.tmp
 mv -f macros.tmp macros.in
 
        -e 's|@host_cpu@|%{_target_cpu}|'  macros.in  > macros.tmp
 mv -f macros.tmp macros.in
 

+# pass CC and CXX too in case of building with some older configure macro

 %configure \
 %configure \

+       CC="%{__cc}" CXX="%{__cxx}" CPP="%{__cpp}" \

        --enable-shared \
        --enable-static \
        --enable-shared \
        --enable-static \

-       --with-apidocs \
+       %{!?_without_docs:--with-apidocs} \

        --with-python=auto \
        --without-db
 
        --with-python=auto \
        --without-db
 


@@ -483,6 +612,7 @@ mv -f macros.tmp macros.in
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

+install -d $RPM_BUILD_ROOT/lib

 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \


@@ -495,13 +625,21 @@ install macros.php        $RPM_BUILD_ROOT%{_libdir}/rpm/macros.php
 install %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/install-build-tree
 install %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/rpm/find-rpm-provides
 install %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/install-build-tree
 install %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/rpm/find-rpm-provides

-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 %{SOURCE16} $RPM_BUILD_ROOT%{_libdir}/rpm/check-files
-install scripts/find-php*      $RPM_BUILD_ROOT%{_libdir}/rpm/
-install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_libdir}/rpm/
+install %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/find-spec-bcond
+# 2 following files - to be removed or changed to find-elf-*
+# (to generate only ELF dependencies using objdump)???
+install %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides
+install %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires
+install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/rpm/compress-doc
+install %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/rpm/check-files
+install %{SOURCE15} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides-wrapper
+install %{SOURCE16} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires-wrapper
+install scripts/find-php*      $RPM_BUILD_ROOT%{_libdir}/rpm
+install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_libdir}/rpm
+
+install %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/builder
+install %{SOURCE31} $RPM_BUILD_ROOT%{_bindir}/adapter.awk
+install %{SOURCE32} $RPM_BUILD_ROOT%{_bindir}/pldnotify.awk

 
 install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm
 
 
 install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm
 


@@ -513,23 +651,65 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
 %%distribution PLD
 EOF
 
 %%distribution PLD
 EOF
 

+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles <<EOF
+# global list of files (name regexps) which don't generate Provides
+EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov <<EOF
+# global list of capabilities (regexps) not to be used in Provides
+EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles <<EOF
+# global list of files (name regexps) which don't generate Requires
+/usr/src/examples/.*
+/usr/share/doc/.*
+EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq <<EOF
+# global list of capabilities (regexps) not to be used in Requires
+EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep <<EOF
+# global list of capabilities (SONAME, perl(module), php(module) regexps)
+# which don't generate dependencies on package NAMES
+libGL.so.1
+libGLU.so.1
+libOSMesa.so.4
+libglide3.so.3
+libgtkmozembed.so
+libgtksuperwin.so
+libxpcom.so
+EOF
+
+# for rpm -e|-U --repackage
+install -d $RPM_BUILD_ROOT/var/spool/repackage
+
+# move libs to /lib
+for a in librpm-%{ver}.so librpmdb-%{ver}.so librpmio-%{ver}.so ; do
+       mv -f $RPM_BUILD_ROOT%{_libdir}/$a $RPM_BUILD_ROOT/lib
+       ln -s /lib/$a $RPM_BUILD_ROOT%{_libdir}/$a
+done
+

 %find_lang %{name}
 
 %find_lang %{name}
 

-rm -f doc/manual/Makefile*
+rm -rf manual
+cp -a doc/manual manual
+rm -f manual/Makefile*

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post  lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post  lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig

-%post   -n beecrypt -p /sbin/ldconfig
-%postun -n beecrypt -p /sbin/ldconfig
+
+%pre build
+find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f

 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)

-%doc RPM-PGP-KEY CHANGES doc/manual/*
+%doc RPM-PGP-KEY CHANGES manual

 
 %attr(755,root,root) /bin/rpm
 
 %attr(755,root,root) /bin/rpm

+#%attr(755,root,root) %{_bindir}/rpmdb
+#%attr(755,root,root) %{_bindir}/rpmquery
+#%attr(755,root,root) %{_bindir}/rpmsign
+#%attr(755,root,root) %{_bindir}/rpmverify

 
 %dir %{_sysconfdir}/rpm
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/rpm/macros
 
 %dir %{_sysconfdir}/rpm
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/rpm/macros


@@ -543,38 +723,32 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sk) %{_mandir}/sk/man8/rpm.8*
 
 %dir /var/lib/rpm
 %lang(sk) %{_mandir}/sk/man8/rpm.8*
 
 %dir /var/lib/rpm

+%dir %attr(700,root,root) /var/spool/repackage

 %dir %{_libdir}/rpm
 %dir %{_libdir}/rpm

+#%attr(755,root,root) %{_libdir}/rpm/rpmd
+#%attr(755,root,root) %{_libdir}/rpm/rpmk
+#%attr(755,root,root) %{_libdir}/rpm/rpm[qv]

 
 %doc %attr(755,root,root) %{_libdir}/rpm/convertrpmrc.sh
 
 %{_libdir}/rpm/rpmrc
 %{_libdir}/rpm/rpmpopt*
 %{_libdir}/rpm/macros
 
 %doc %attr(755,root,root) %{_libdir}/rpm/convertrpmrc.sh
 
 %{_libdir}/rpm/rpmrc
 %{_libdir}/rpm/rpmpopt*
 %{_libdir}/rpm/macros

-%{_libdir}/rpm/noarch-*
-%ifarch i386 i486 i586 i686 athlon
-%{_libdir}/rpm/i?86*
-%{_libdir}/rpm/athlon*
-%endif
-%ifarch sparc sparc64
-%{_libdir}/rpm/sparc*
-%endif
-%ifarch alpha
-%{_libdir}/rpm/alpha*
-%endif
-%ifarch ppc
-%{_libdir}/rpm/ppc*
-%endif

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

+%attr(755,root,root) /lib/librpm*-*.so

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

+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/rpm/noauto*

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

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

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

+%attr(755,root,root) %{_libdir}/rpm/find-provides-wrapper
+%attr(755,root,root) %{_libdir}/rpm/find-requires
+%attr(755,root,root) %{_libdir}/rpm/find-requires-wrapper

 %attr(755,root,root) %{_libdir}/rpm/find-rpm-provides
 %attr(755,root,root) %{_libdir}/rpm/find-spec-bcond
 %attr(755,root,root) %{_libdir}/rpm/find-lang.sh
 %attr(755,root,root) %{_libdir}/rpm/find-rpm-provides
 %attr(755,root,root) %{_libdir}/rpm/find-spec-bcond
 %attr(755,root,root) %{_libdir}/rpm/find-lang.sh


@@ -585,16 +759,32 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/rpm/brp-*
 %attr(755,root,root) %{_libdir}/rpm/check-files
 %attr(755,root,root) %{_libdir}/rpm/check-prereqs
 %attr(755,root,root) %{_libdir}/rpm/brp-*
 %attr(755,root,root) %{_libdir}/rpm/check-files
 %attr(755,root,root) %{_libdir}/rpm/check-prereqs

-%attr(755,root,root) %{_libdir}/rpm/cpanflute
-%attr(755,root,root) %{_libdir}/rpm/cpanflute2
-%attr(755,root,root) %{_libdir}/rpm/Specfile.pm
+#%attr(755,root,root) %{_libdir}/rpm/cpanflute
+#%attr(755,root,root) %{_libdir}/rpm/cpanflute2
+#%attr(755,root,root) %{_libdir}/rpm/Specfile.pm

 %attr(755,root,root) %{_libdir}/rpm/http.req
 %attr(755,root,root) %{_libdir}/rpm/http.req

-%attr(755,root,root) %{_libdir}/rpm/magic.*
+#%attr(755,root,root) %{_libdir}/rpm/magic*
+%attr(755,root,root) %{_libdir}/rpm/magic.prov
+%attr(755,root,root) %{_libdir}/rpm/magic.req

 %attr(755,root,root) %{_libdir}/rpm/u_pkg.sh
 %attr(755,root,root) %{_libdir}/rpm/vpkg-provides.sh
 %attr(755,root,root) %{_libdir}/rpm/vpkg-provides2.sh
 %attr(755,root,root) %{_libdir}/rpm/rpmb
 %attr(755,root,root) %{_libdir}/rpm/rpmt
 %attr(755,root,root) %{_libdir}/rpm/u_pkg.sh
 %attr(755,root,root) %{_libdir}/rpm/vpkg-provides.sh
 %attr(755,root,root) %{_libdir}/rpm/vpkg-provides2.sh
 %attr(755,root,root) %{_libdir}/rpm/rpmb
 %attr(755,root,root) %{_libdir}/rpm/rpmt

+%{_libdir}/rpm/noarch-*
+%ifarch i386 i486 i586 i686 athlon
+%{_libdir}/rpm/i?86*
+%{_libdir}/rpm/athlon*
+%endif
+%ifarch sparc sparc64
+%{_libdir}/rpm/sparc*
+%endif
+%ifarch alpha
+%{_libdir}/rpm/alpha*
+%endif
+%ifarch ppc
+%{_libdir}/rpm/ppc*
+%endif

 # not used yet ...
 %{_libdir}/rpm/sql.prov
 %{_libdir}/rpm/sql.req
 # not used yet ...
 %{_libdir}/rpm/sql.prov
 %{_libdir}/rpm/sql.req


@@ -605,19 +795,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gendiff
 %attr(755,root,root) %{_bindir}/rpmbuild
 
 %attr(755,root,root) %{_bindir}/gendiff
 %attr(755,root,root) %{_bindir}/rpmbuild
 

-%{_mandir}/man1/*
+%{_mandir}/man1/gendiff.1*

 %{_mandir}/man8/rpmbuild.8*
 %{_mandir}/man8/rpmbuild.8*

+%lang(ja) %{_mandir}/ja/man8/rpmbuild.8*
+%lang(pl) %{_mandir}/pl/man1/gendiff.1*
+%lang(pl) %{_mandir}/pl/man8/rpmbuild.8*

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

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

 %attr(755,root,root) %{_libdir}/librpm.so
 %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}/librpmio.so

-%attr(755,root,root) %{_libdir}/librpmdb.la

 %attr(755,root,root) %{_libdir}/librpmdb.so
 %attr(755,root,root) %{_libdir}/librpmdb.so

-%attr(755,root,root) %{_libdir}/librpmbuild.la

 %attr(755,root,root) %{_libdir}/librpmbuild.so
 
 %files static
 %attr(755,root,root) %{_libdir}/librpmbuild.so
 
 %files static


@@ -626,32 +816,47 @@ rm -rf $RPM_BUILD_ROOT
 
 %files utils
 %defattr(644,root,root,755)
 
 %files utils
 %defattr(644,root,root,755)

+%attr(755,root,root) %{_bindir}/debugedit

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

+%attr(755,root,root) %{_bindir}/rpmcache
+%attr(755,root,root) %{_bindir}/rpmdeps
+%attr(755,root,root) %{_bindir}/rpmgraph
+%attr(755,root,root) %{_bindir}/rpmfile
+%attr(755,root,root) %{_libdir}/rpm/find-debuginfo.sh
+%attr(755,root,root) %{_libdir}/rpm/rpm2cpio.sh

 %attr(755,root,root) %{_libdir}/rpm/rpmdiff*
 %attr(755,root,root) %{_libdir}/rpm/tgpg
 %attr(755,root,root) %{_libdir}/rpm/rpmdiff*
 %attr(755,root,root) %{_libdir}/rpm/tgpg

-%attr(755,root,root) %{_libdir}/rpm/find-debuginfo.sh
-%attr(755,root,root) %{_bindir}/rpmgraph
-%attr(755,root,root) %{_bindir}/rpmcache
-%attr(755,root,root) %{_bindir}/striptofile
-%attr(755,root,root) %{_bindir}/unstripfile
+%attr(755,root,root) %{_libdir}/rpm/rpmdb_loadcvt
+

 # not here
 # not here

-#%{_prefix}/lib/rpm/rpm.daily
-#%{_prefix}/lib/rpm/rpm.log
-#%{_prefix}/lib/rpm/rpm.xinetd
-%{_prefix}/lib/rpm/rpm2cpio.sh
+#%%{_libdir}/rpm/rpm.daily
+#%%{_libdir}/rpm/rpm.log
+#%%{_libdir}/rpm/rpm.xinetd

 
 %{_mandir}/man8/rpm2cpio.8*
 
 %{_mandir}/man8/rpm2cpio.8*

+%{_mandir}/man8/rpmdeps.8*
+%{_mandir}/man8/rpmcache.8*
+%{_mandir}/man8/rpmgraph.8*

 %lang(ja) %{_mandir}/ja/man8/rpm2cpio.8*
 %lang(ja) %{_mandir}/ja/man8/rpm2cpio.8*

+%lang(ja) %{_mandir}/ja/man8/rpmcache.8*
+%lang(ja) %{_mandir}/ja/man8/rpmgraph.8*

 %lang(ko) %{_mandir}/ko/man8/rpm2cpio.8*
 %lang(pl) %{_mandir}/pl/man8/rpm2cpio.8*
 %lang(ko) %{_mandir}/ko/man8/rpm2cpio.8*
 %lang(pl) %{_mandir}/pl/man8/rpm2cpio.8*

+%lang(pl) %{_mandir}/pl/man8/rpmdeps.8*
+%lang(pl) %{_mandir}/pl/man8/rpmcache.8*
+%lang(pl) %{_mandir}/pl/man8/rpmgraph.8*

 %lang(ru) %{_mandir}/ru/man8/rpm2cpio.8*
 %lang(ru) %{_mandir}/ru/man8/rpm2cpio.8*

-%{_mandir}/man8/rpmcache.8*
-%{_mandir}/man8/rpmgraph.8*
+
+%files utils-static
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rpm[ieu]
+%attr(755,root,root) %{_libdir}/rpm/rpm[ieu]

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

-%attr(755,root,root) %{_libdir}/rpm/perl*
-%attr(755,root,root) %{_libdir}/rpm/find-perl-*
+%attr(755,root,root) %{_libdir}/rpm/perl.*
+#%attr(755,root,root) %{_libdir}/rpm/perldeps.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/find-*.perl
 %attr(755,root,root) %{_libdir}/rpm/find-prov.pl
 %attr(755,root,root) %{_libdir}/rpm/find-req.pl


@@ -675,16 +880,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{py_sitedir}/rpmdb/*.so
 %{py_sitedir}/rpmdb/*.py*
 
 %attr(755,root,root) %{py_sitedir}/rpmdb/*.so
 %{py_sitedir}/rpmdb/*.py*
 

-%files -n beecrypt
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libbeecrypt.so.*.*
-
-%files -n beecrypt-devel
-%defattr(644,root,root,755)
-%{_prefix}/lib/libbeecrypt.so
-%attr(755,root,root) %{_prefix}/lib/libbeecrypt.la
-%{_includedir}/beecrypt
-
-%files -n beecrypt-static
+%files build-tools

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

-%{_prefix}/lib/libbeecrypt.a
+%attr(755,root,root) %{_bindir}/builder
+%attr(755,root,root) %{_bindir}/adapter.awk
+%attr(755,root,root) %{_bindir}/pldnotify.awk