- release 6: removed %pre/%post scripts for break cyclic dependences

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 9fec48c9e21128fbac8cc1015bf0364b49b1a306..42968555b7d1ec155f8c3153740f95496657c6b1 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary:        Red Hat & PLD Package Manager
 Summary(pl):   Aplikacja do zarz±dzania pakietami
 Name:          rpm
 Version:       4.0
-Release:       1
+Release:       6
 Group:         Base
 Group(de):     Gründsätzlich
 Group(pl):     Podstawowe
@@ -15,6 +15,7 @@ Source4:      %{name}-find-rpm-provides
 Source5:       %{name}-macros.perl
 Source6:       %{name}-find-perl-provides
 Source7:       %{name}-find-perl-requires
+Source8:       %{name}-find-spec-bcond
 Patch0:                %{name}-%{name}rc.patch
 Patch1:                %{name}-find-requires.patch
 Patch2:                %{name}-macros.patch
@@ -32,6 +33,8 @@ Patch13:      %{name}-rpmlibprov.patch
 Patch14:       %{name}-getrpmlibprov.patch
 Patch15:        %{name}-rpmlibprov-order.patch
 Patch16:       %{name}-find-KDE.patch
+Patch17:       %{name}-bash2.patch
+Patch18:       %{name}-perl-req-perlfile.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 BuildRequires: bzip2-static >= 1.0.1
@@ -42,8 +45,10 @@ BuildRequires:       libtool
 BuildRequires: automake
 BuildRequires: autoconf >= 2.13-8
 BuildRequires: gettext-devel
+BuildRequires: db1-devel >= 1.85
 BuildRequires: db3-static >= 3.1.17
 BuildRequires: zlib-static >= 1.1.4
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     rpm-libs
 %define __find_provides %{SOURCE4}
 %define _binary_payload w9.gzdio
@@ -181,6 +186,8 @@ construir pacotes usando o RPM.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
 %patch31 -p1
 install %{SOURCE2} macros.pld.in
 %patch38 -p1
@@ -226,6 +233,7 @@ install macros.pld $RPM_BUILD_ROOT%{_libdir}/rpm/macros.pld
 
 install macros.perl $RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
 install macros.python $RPM_BUILD_ROOT%{_libdir}/rpm/macros.python
+
 install %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm/find-spec-bcond
 #%%_install_langs pl_PL:en_US
 %%distribution PLD
@@ -233,43 +241,6 @@ EOF
 
 %find_lang %{name}
 
-%pre
-if [ -L /var/lib/rpm ]; then
-       echo "WARNING:upgrade cannot be done because /var/state/rpm is symlink"
-       exit 1
-fi
-if [ ! -d /var/lib/rpm ]; then 
-       if [ -e /var/state/rpm ] && [ ! -L /var/state/rpm ]; then
-               mkdir -p /var/lib/rpm
-               cp -ap /var/state/rpm/* /var/lib/rpm
-               rm -rf /var/state/rpm
-               ln -sf /var/lib/rpm /var/state/rpm
-               echo "RPM Database moved from /var/state/rpm to /var/lib/rpm" 1>&2
-               echo "Run second time upgradeing rpm package for complete operation" 1>&2
-               exit 1
-       fi
-       if [ -e /var/db/rpm ] && [ ! -L /var/db/rpm ]; then
-               mkdir -p /var/lib/rpm
-               cp -ap /var/db/rpm/* /var/lib/rpm
-               rm -rf /var/db/rpm
-               ln -sf /var/lib/rpm /var/db/rpm
-               echo "RPM Database moved from /var/db/rpm to /var/lib/rpm" 1>&2
-               echo "Run second time upgradeing rpm package for complete operation" 1>&2
-               exit 1
-       fi
-fi
-
-%post
-if [ -L /var/lib/rpm ]; then
-       rm -rf /var/lib/rpm
-fi
-if [ -L /var/db/rpm ]; then
-       rm -rf /var/db/rpm
-fi
-if [ ! -f /var/lib/rpm/packages.rpm ]; then
-       /bin/rpm --initdb
-fi
-
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 %clean
@@ -281,6 +252,10 @@ rm -rf $RPM_BUILD_ROOT
 %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}/rpm/rpmdb
 %attr(755,root,root) %{_libdir}/librpm*.so.*.*
 %{_mandir}/man8/rpm.8*
@@ -311,7 +286,6 @@ rm -rf $RPM_BUILD_ROOT
 %ifarch i686
 %{_libdir}/rpm/i686-pld-linux
 %{_libdir}/rpm/noarch-linux
-%endif
 %{_libdir}/rpm/noarch-pld-linux
 %{_libdir}/rpm/sparc-pld-linux
 %endif
@@ -328,15 +302,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rpmbuild
 %attr(755,root,root) %{_bindir}/rpme
+%attr(755,root,root) %{_bindir}/rpmi
 %attr(755,root,root) %{_bindir}/rpmu
 %attr(755,root,root) %{_libdir}/rpm/find-requires
 %attr(755,root,root) %{_libdir}/rpm/find-provides
 %attr(755,root,root) %{_libdir}/rpm/find-rpm-provides
 %attr(755,root,root) %{_libdir}/rpm/find-spec-bcond
-%attr(755,root,root) %{_libdir}/rpm/brb-*
+%attr(755,root,root) %{_libdir}/rpm/find-lang.sh
 %attr(755,root,root) %{_libdir}/rpm/mkinstalldirs
 %attr(755,root,root) %{_libdir}/rpm/getpo.sh
-%attr(755,root,root) %{_libdir}/rpm/getpo.sh
 %attr(755,root,root) %{_libdir}/rpm/install-build-tree
 %attr(755,root,root) %{_libdir}/rpm/brp-*
 %attr(755,root,root) %{_libdir}/rpm/check-prereqs
@@ -344,14 +318,10 @@ 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/rpmdb
 %attr(755,root,root) %{_libdir}/rpm/rpmi
-%attr(755,root,root) %{_libdir}/rpm/rpmk
-%attr(755,root,root) %{_libdir}/rpm/rpmq
 %attr(755,root,root) %{_libdir}/rpm/u_pkg.sh
 %attr(755,root,root) %{_libdir}/rpm/rpme
 %attr(755,root,root) %{_libdir}/rpm/rpmu
-%attr(755,root,root) %{_libdir}/rpm/rpmv
 %attr(755,root,root) %{_libdir}/rpm/rpmb
 %attr(755,root,root) %{_libdir}/rpm/rpmi
 %attr(755,root,root) %{_libdir}/rpm/rpmt
@@ -381,7 +351,8 @@ rm -rf $RPM_BUILD_ROOT
 %lang(pl) %{_mandir}/pl/man8/rpm2cpio.8*
 %lang(ru) %{_mandir}/ru/man8/rpm2cpio.8*
 
-%attr(755,root,root) %{_libdir}/rpm/find-{prov,req}.pl
+%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/find-*.perl