X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=a827529d8c286997b5876f11be258890c4825425;hb=80e9f34db61d7881845ecc57fb69515617ad95f7;hp=d76b7b15e148a0a80c2ed8c9f998b7877b98ec74;hpb=c34a847a14f21ac6f9b11895f3f9884790eda771;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index d76b7b1..a827529 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -16,8 +16,8 @@
 # force_cpp		- force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E"
 
 # versions of required libraries
-%define	reqdb_ver	4.3.29
-%define	reqpopt_ver	1.10.3
+%define	reqdb_ver	4.4.16
+%define	reqpopt_ver	1.10.4
 %define	beecrypt_ver	2:4.1.2-4
 Summary:	RPM Package Manager
 Summary(de):	RPM Packet-Manager
@@ -28,12 +28,12 @@ Summary(ru):	
 Summary(uk):	íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM
 Name:		rpm
 %define	sover	4.4
-Version:	4.4.3
+Version:	4.4.4
 Release:	0.3
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
-# Source0-md5:	12ffef41c0f0ff565d2f6a89ad6c0598
+# Source0-md5:	d6cba56ec786915c3bf340c310a0bc44
 Source1:	%{name}.groups
 Source2:	%{name}.platform
 Source3:	%{name}-install-tree
@@ -92,11 +92,11 @@ Patch34:	%{name}-epoch0.patch
 Patch35:	%{name}-perl_req-INC_dirs.patch
 Patch36:	%{name}-debuginfo.patch
 Patch37:	%{name}-doxygen_hack.patch
-
+Patch38:	%{name}-empty-rpmlock-path.patch
 Patch39:	%{name}-pythondeps.patch
 Patch40:	%{name}-print-requires.patch
 Patch41:	%{name}-reduce-stack-usage.patch
-
+Patch42:	%{name}-old-fileconflicts-behaviour.patch
 Patch43:	%{name}-patch-quote.patch
 Patch44:	%{name}-no-neon.patch
 Patch45:	%{name}-no-sqlite.patch
@@ -106,8 +106,8 @@ Patch48:	%{name}-requireseq.patch
 Patch49:	%{name}-p4.patch
 Patch50:	%{name}-macros.patch
 Patch51:	%{name}-cleanlibdirs.patch
+Patch52:	%{name}-morearchs.patch
 URL:		http://wraptastic.org/
-Icon:		rpm.gif
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	beecrypt-devel >= %{beecrypt_ver}
@@ -162,6 +162,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # don't require very fresh rpm.macros to build
 %define		__gettextize gettextize --copy --force --intl ; cp -f po/Makevars{.template,}
 %define		ix86	i386 i486 i586 i686 athlon pentium3 pentium4
+%define		ppc	ppc ppc7400 ppc7450
 %define		x8664	amd64 ia32e x86_64
 
 # stabilize new build environment
@@ -226,7 +227,6 @@ RPM - 
 Summary:	RPM base package - scripts used by rpm packages themselves
 Summary(pl):	Podstawowy pakiet RPM - skrypty u¿ywane przez same pakiety rpm
 Group:		Base
-Requires:	sed
 Obsoletes:	vserver-rpm
 
 %description base
@@ -667,17 +667,21 @@ install %{SOURCE12} scripts/perl.prov
 %patch35 -p0
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
+%patch42 -p1
 %patch43 -p1
 %{!?with_neon:%patch44 -p1}
 %patch45 -p1
 %patch46 -p1
+
 %patch48 -p1
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
+%patch52 -p1
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -720,8 +724,14 @@ cd ..
 
 # 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
+%ifarch %{ppc}
+TARG=$( echo %{_target_cpu} | sed 's/ppc//' )
+sed -e "s|@host@|ppc-%{_target_vendor}-linux-gnu|" \
+	-e "s|@host_cpu@|%{_target_cpu}|" macros.in > macros.tmp
+%else
 sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' \
 	-e 's|@host_cpu@|%{_target_cpu}|' macros.in > macros.tmp
+%endif
 mv -f macros.tmp macros.in
 
 CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS
@@ -929,7 +939,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc RPM-PGP-KEY CHANGES manual
+%doc RPM-PGP-KEY CHANGES manual/*
 
 %attr(755,root,root) /bin/rpm
 #%attr(755,root,root) %{_bindir}/rpmdb
@@ -1068,7 +1078,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %ifarch mips mipsel mips64 mips64el
 %{_rpmlibdir}/mips*
 %endif
-%ifarch ppc
+%ifarch %{ppc}
 %{_rpmlibdir}/ppc*
 %endif
 %ifarch sparc sparc64