X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=2ede830b1164e43c9c1ec0637e5e612c246f9830;hb=77a0fe7fd94229cceae48638158788b77907cccf;hp=cd55be530a479ac8f78eefc27639c8e84f977d84;hpb=87ef0d952ab1746491adab7b9e2c85eb1c958a7e;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index cd55be5..2ede830 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,16 +26,17 @@ Summary(uk):	
 Name:		rpm
 %define	ver	4.3
 Version:	%{ver}
-%define	rel	0.4
+%define	rel	0.%{snap}.8
 Release:	%{rel}
 License:	GPL
 Group:		Base
-Source0:	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz
+#Source0:	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz
+# Source0-md5:	b7a16114143a0465aa65daf7a0234cf4
+Source0:	http://recesja.icm.edu.pl/~psk/%{name}-%{version}.%{snap}.tar.gz
 Source1:	%{name}.groups
 Source2:	%{name}.platform
 Source3:	%{name}-install-tree
-Source4:	%{name}-find-%{name}-provides
-Source5:	%{name}-macros.perl
+Source4:	%{name}-find-rpm-provides
 Source8:	%{name}-find-spec-bcond
 Source9:	%{name}-find-lang
 Source10:	%{name}-find-provides
@@ -51,20 +52,16 @@ Source31:	adapter.awk
 Source32:	pldnotify.awk
 Source33:	perl.prov
 Patch0:		%{name}-pl.po.patch
-Patch1:		%{name}-%{name}rc.patch
+Patch1:		%{name}-rpmrc.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
-Patch6:		%{name}-cache.patch
 Patch7:		%{name}-glob.patch
-Patch9:		%{name}-fast-alAddPackage.patch
-Patch10:	%{name}-byKey.patch
 Patch11:	%{name}-noexpand.patch
 Patch12:	%{name}-scripts-closefds.patch
 Patch13:	%{name}-python-macros.patch
-Patch16:	%{name}-drop-legacy-CLI.patch
-Patch15:	%{name}-4.1-branch.patch
+#Patch16:	%{name}-drop-legacy-CLI.patch
 Patch18:	%{name}-gettext-in-header.patch
 Patch19:	%{name}-compress-doc.patch
 Patch20:	%{name}-lt14d.patch
@@ -80,6 +77,10 @@ Patch34:	%{name}-spec-prep-pre.patch
 Patch35:	%{name}-perl_req.patch
 Patch36:	%{name}-system_libs_more.patch
 Patch37:	%{name}-python_2_3.patch
+Patch38:	%{name}-no-bin-env.patch
+Patch39:	%{name}-specflags.patch
+Patch40:	%{name}-magic-usesystem.patch
+Patch41:	%{name}-dontneedutils.patch
 URL:		http://www.rpm.org/
 Icon:		rpm.gif
 BuildRequires:	autoconf >= 2.52
@@ -290,6 +291,25 @@ Zusatzwerkzeuge f
 %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
@@ -399,7 +419,7 @@ Requires:	/bin/id
 Requires:	awk
 Requires:	binutils
 Requires:	diffutils
-Requires:	file >= 3.31
+Requires:	file >= 4.01
 Requires:	fileutils
 Requires:	findutils
 %ifarch athlon
@@ -475,26 +495,16 @@ construir pacotes usando o RPM.
 
 %prep
 %setup -q
-# need update
-#%%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-# find-spec-bcond need update
-# po/pl.po need update
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-# not needed ? (break compilation)
-#%patch6 -p1
 %patch7 -p1
-# rejected (needed ?)
-#%patch9 -p1
-# too many rejects, Pawel please check if needed and rediff
-#%patch10 -p0
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch16 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
@@ -505,11 +515,12 @@ construir pacotes usando o RPM.
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
-%patch33 -p1 -b .wiget
+%patch33 -p1
 # patch34 -- look down
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
@@ -522,6 +533,9 @@ install %{SOURCE18} scripts/php.req.in
 install %{SOURCE33} scripts/perl.prov
 cat %{SOURCE20} >> macros.in
 %patch34 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
 
 cd scripts;
 mv -f perl.req perl.req.in
@@ -543,14 +557,6 @@ rm -f missing
 %{__autoconf}
 %{__automake}
 cd ..
-cd beecrypt
-rm -f missing
-%{__libtoolize}
-%{__aclocal}
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-cd ..
 
 rm -f missing
 %{__libtoolize}
@@ -599,8 +605,8 @@ 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 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
@@ -621,8 +627,8 @@ 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
+	mv -f $RPM_BUILD_ROOT%{_libdir}/$a $RPM_BUILD_ROOT/lib
+	ln -s /lib/$a $RPM_BUILD_ROOT%{_libdir}/$a
 done
 
 %find_lang %{name}
@@ -636,8 +642,6 @@ 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
@@ -647,6 +651,10 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 %doc RPM-PGP-KEY CHANGES manual
 
 %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
@@ -662,6 +670,9 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 %dir /var/lib/rpm
 %dir %attr(700,root,root) /var/spool/repackage
 %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
 
@@ -694,7 +705,9 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 #%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/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
@@ -724,7 +737,7 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_bindir}/gendiff
 %attr(755,root,root) %{_bindir}/rpmbuild
 
-%{_mandir}/man1/*
+%{_mandir}/man1/gendiff.1*
 %{_mandir}/man8/rpmbuild.8*
 
 %files devel
@@ -748,19 +761,11 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_bindir}/rpmdeps
 %attr(755,root,root) %{_bindir}/rpmgraph
 %attr(755,root,root) %{_bindir}/rpmfile
-#%attr(755,root,root) %{_bindir}/striptofile
-#%attr(755,root,root) %{_bindir}/unstripfile
 %attr(755,root,root) %{_libdir}/rpm/find-debuginfo.sh
 %attr(755,root,root) %{_libdir}/rpm/rpm2cpio.sh
-%attr(755,root,root) %{_libdir}/rpm/rpmd
 %attr(755,root,root) %{_libdir}/rpm/rpmdiff*
-%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/rpmv
 %attr(755,root,root) %{_libdir}/rpm/tgpg
 %attr(755,root,root) %{_libdir}/rpm/rpmdb_loadcvt
-%{_libdir}/rpm/magic
 
 # not here
 #%%{_libdir}/rpm/rpm.daily
@@ -776,6 +781,11 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 %{_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)
 %attr(755,root,root) %{_libdir}/rpm/perl.*