X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=b4ea094053a6ab252e940eaae604881a4476b6fa;hp=b3754f59440ebbac5e8490a7f1f42b8cb833c494;hb=09f6ceca18a714466b312fe8fe0b6552186ca1fc;hpb=d7df46b82998785bc20250033c1eed2c0e3e543e

diff --git a/rpm.spec b/rpm.spec
index b3754f5..b4ea094 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,8 +1,8 @@
 Summary:	Red Hat & PLD Package Manager
 Summary(pl):	Aplikacja do zarz±dzania pakietami
 Name:		rpm
-Version:	3.0.1
-Release:	15
+Version:	3.0.2
+Release:	7
 Group:		Base
 Group(pl):	Podstawowe
 Copyright:	GPL
@@ -11,6 +11,7 @@ Source1:	rpm.groups
 Source2:	rpm.8pl
 Source3:	rpm.macros
 Source4:	rpm.pl.po
+Source5:	rpm-install-tree
 Patch0:		rpm-rpmrc.patch
 Patch1:		rpm-i18n.patch
 Patch2:		rpm-find-requires.patch
@@ -19,18 +20,18 @@ Patch4:		rpm-po.patch
 Patch5:		rpm-moredoc.patch
 Patch6:		rpm-arch.patch
 Patch7:		rpm-pld.patch
+Patch8:		rpm-rpmpopt.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
-BuildPrereq:	bzip2-static
-BuildPrereq:	gdbm-static
-BuildPrereq:	zlib-static
-BuildPrereq:	patch >= 2.2
-BuildPrereq:	libtool
-BuildPrereq:	automake
-BuildPrereq:	autoconf >= 2.13-8
-BuildPrereq:	gettext
+BuildRequires:	bzip2-static
+BuildRequires:	gdbm-static
+BuildRequires:	zlib-static
+BuildRequires:	gettext-devel >= 0.10.38-3
+BuildRequires:	libtool
+BuildRequires:	automake
+BuildRequires:	autoconf >= 2.13-8
+BuildRequires:	gettext
 Requires:	glibc >= 2.1
-Requires:	/etc/cron.daily
 BuildRoot:	/tmp/%{name}-%{version}-root
 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, '.')"`)
@@ -63,14 +64,15 @@ Pliki nag
 graficznych mened¿erów pakietów oraz innych narzêdzi, które wymagaj±
 construir pacotes usando o RPM.
 %setup  -q
-%patch0 -p1 
+%patch0 -p0
 %patch1 -p1
-%patch2 -p1
+%patch2 -p0
 %patch1 -p1
 %patch4 -p1 
 %patch5 -p1
 %patch6 -p1 
 %patch7 -p1 
+%patch8 -p1 
 %patch31 -p1
 install %{SOURCE4} po/pl.po
 install %{SOURCE3} macros.pld.in
@@ -93,7 +95,8 @@ install -d $RPM_BUILD_ROOT/var/db/rpm \
 
 make DESTDIR="$RPM_BUILD_ROOT" pkgbindir="%{_bindir}" install
 
-install macros.pld $RPM_BUILD_ROOT%{_prefix}/lib/rpm/macros.pld
+install macros.pld $RPM_BUILD_ROOT%{_libdir}/rpm/macros.pld
+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
@@ -146,6 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
 
 %{_libdir}/rpm/rpm*
 %{_libdir}/rpm/macros*
@@ -156,15 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/librpm*.a
 %{_libdir}/librpm*.la
 %files utils
+
 %files -n python-rpm
-* Thu May 20 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [3.0.1-6.19990519]
-- spec based on version from dist tar ball (partially rewrited by me),
-- pl translation by Wojtek ¦lusarczyk <wojtek@shadow.eu.org>,
-- rewrited by Artur Frysiak <wiget@pld.org.pl>,
-- patches with fixes maked by Artur Frysiak and Marcin Dalecki
-  <dalecki@cs.net.pl>.
-Revision 1.79  2000/02/17 03:42:17  kloczek
-- release 25,
-- added "Conflicts: /usr/bin/id" and rebuilded in enviroment with id in
-  /bin.
+* %{date} PLD Team <pld-list@pld.org.pl>
+All below listed persons can be reached on <cvs_login>@pld.org.pl