Name: rpm
%define ver 4.3
Version: %{ver}
-%define rel 0.%{snap}.6
+%define rel 0.%{snap}.8
Release: %{rel}
License: GPL
Group: Base
Source2: %{name}.platform
Source3: %{name}-install-tree
Source4: %{name}-find-rpm-provides
-Source5: %{name}-macros.perl
Source8: %{name}-find-spec-bcond
Source9: %{name}-find-lang
Source10: %{name}-find-provides
Patch11: %{name}-noexpand.patch
Patch12: %{name}-scripts-closefds.patch
Patch13: %{name}-python-macros.patch
-Patch16: %{name}-drop-legacy-CLI.patch
+#Patch16: %{name}-drop-legacy-CLI.patch
Patch18: %{name}-gettext-in-header.patch
Patch19: %{name}-compress-doc.patch
Patch20: %{name}-lt14d.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
%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
Requires: awk
Requires: binutils
Requires: diffutils
-Requires: file >= 3.31
+Requires: file >= 4.01
Requires: fileutils
Requires: findutils
%ifarch athlon
%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
%patch11 -p1
%patch12 -p1
%patch13 -p1
-%patch16 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
-%patch33 -p1 -b .wiget
+%patch33 -p1
# patch34 -- look down
%patch35 -p1
%patch36 -p1
cat %{SOURCE20} >> macros.in
%patch34 -p1
%patch39 -p1
+%patch40 -p1
+%patch41 -p1
cd scripts;
mv -f perl.req perl.req.in
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
# 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}
%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
%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
#%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
%attr(755,root,root) %{_bindir}/gendiff
%attr(755,root,root) %{_bindir}/rpmbuild
-%{_mandir}/man1/*
+%{_mandir}/man1/gendiff.1*
%{_mandir}/man8/rpmbuild.8*
%files devel
%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
%{_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.*