- release 25,

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index a1844da8be58a943cec5e03c6c06b7ab2d02f3b7..f286ccc8a7c1d2a4f178f2fa66650d42c5cde394 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:       3.0.3
-Release:       8
+Release:       25
 Group:         Base
 Group(pl):     Podstawowe
 Copyright:     GPL
@@ -18,6 +18,8 @@ Patch4:               rpm-pld.patch
 Patch5:                rpm-rpmpopt.patch
 Patch6:                rpm-findlangs.patch
 Patch7:                rpm-perl-macros.patch
+Patch8:                rpm-nodeps.patch
+Patch9:                rpm-find-provides.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 BuildRequires: bzip2-static
@@ -30,6 +32,7 @@ BuildRequires:        autoconf >= 2.13-8
 BuildRequires: gettext-devel
 Requires:      glibc >= 2.1
 BuildRoot:     /tmp/%{name}-%{version}-root
+Conflicts:     /usr/bin/id
 Obsoletes:     rpm-libs
 %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, '.')"`)
 RPM is a powerful package manager, which can be used to build, install, 
@@ -113,16 +116,22 @@ Dodatkowe narz
 construir pacotes usando o RPM.
 %setup  -q
 %patch0 -p0
-%patch1 -p0
-%patch2 -p1 
+%patch1 -p1
+%patch0 -p1
 %patch1 -p1
 %patch4 -p1 
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 %patch31 -p1
 install %{SOURCE3} macros.pld.in
 install %{SOURCE13} macros.python.in
+(cd scripts; 
+mv perl.req perl.req.in
+mv perl.prov perl.prov.in)
+
 mv -f perl.prov perl.prov.in)
 LDFLAGS="-s"; export LDFLAGS
 
@@ -146,7 +155,7 @@ make
 
 
 %{__make} %{?_without_static:rpm_LDFLAGS="\\$(myLDFLAGS)"}
-install -d $RPM_BUILD_ROOT/var/db/rpm \
+install -d $RPM_BUILD_ROOT/var/state/rpm \
        $RPM_BUILD_ROOT%{_mandir}/{ru,pl}/man8
 
 make DESTDIR="$RPM_BUILD_ROOT" pkgbindir="%{_bindir}" install
@@ -155,10 +164,6 @@ install macros.pld  $RPM_BUILD_ROOT%{_libdir}/rpm/macros.pld
 install macros.perl     $RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
 install -m755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/install-build-tree
        pkgbindir="%{_bindir}"
-#install rpm.8ru $RPM_BUILD_ROOT%{_mandir}/ru/man8/rpm.8
-#install rpm2cpio.8ru $RPM_BUILD_ROOT%{_mandir}/ru/man8/rpm2cpio.8
-#install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man8/rpm.8
-
 
 install %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm/find-spec-bcond
 strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
@@ -203,7 +208,9 @@ fi
 if [ -L /var/db/rpm ]; then
        rm -rf /var/db/rpm
 fi
-/bin/rpm --initdb
+if [ ! -f /var/state/rpm/packages.rpm ]; then
+       /bin/rpm --initdb
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -218,7 +225,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/rpm.8*
 %lang(pl) %{_mandir}/pl/man8/rpm.8*
 %lang(ru) %{_mandir}/ru/man8/rpm.8*
-%attr(755,root,root) %dir /var/db/rpm
+%attr(755,root,root) %dir /var/state/rpm
 
 %dir /usr/lib/rpm
 %defattr(644,root,root,755)