X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=248b908f951dda00d3a0e129e006422f65551a91;hb=6ed85e9f0446f5843d15a70099c04154266cbd49;hp=b9fab3c140181dde3ef2d51bf67e7d0c22c48e1a;hpb=edacdf8ffcd2c111ab4509eae6df97fa89783ff4;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index b9fab3c..248b908 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,55 +1,70 @@
 Summary:	Red Hat & PLD Package Manager
 Summary(pl):	Aplikacja do zarz±dzania pakietami
 Name:		rpm
-Version:	3.0.2
-Release:	7
+Version:	3.0.6
+Release:	5
 Group:		Base
+Group(de):	Gründsätzlich
 Group(pl):	Podstawowe
-Copyright:	GPL
+License:	GPL
 Source0:	ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/%{name}-%{version}.tar.gz
-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
-Patch3:		rpm-macros.patch
-Patch4:		rpm-po.patch
-Patch5:		rpm-moredoc.patch
-Patch6:		rpm-arch.patch
-Patch7:		rpm-pld.patch
-Patch8:		rpm-rpmpopt.patch
+Source1:	%{name}.groups
+Source2:	%{name}.macros
+Source3:	%{name}-install-tree
+Source4:	%{name}-find-rpm-provides
+Patch0:		%{name}-%{name}rc.patch
+Patch1:		%{name}-find-requires.patch
+Patch2:		%{name}-macros.patch
+Patch3:		%{name}-arch.patch
+Patch4:		%{name}-%{name}popt.patch
+Patch5:		%{name}-find-provides.patch
+Patch6:		%{name}-perl-macros.patch
+Patch7:		%{name}-find-lang-all-name.patch
+Patch8:		%{name}-file3.31.patch
+Patch9:		%{name}-find-lang-name-matching.patch
+Patch10:	%{name}-exclude-examples-doc.patch
+Patch11:	%{name}-db3.patch
+Patch12:	%{name}-rpm-v1.patch
+Patch13:	%{name}-rpmlibprov.patch
+Patch14:	%{name}-getrpmlibprov.patch
+Patch15:        %{name}-rpmlibprov-order.patch
+Patch16:	%{name}-find-KDE.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
-BuildRequires:	bzip2-static
+BuildRequires:	bzip2-static >= 1.0.1
 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
-BuildRoot:	/tmp/%{name}-%{version}-root
+BuildRequires:	gettext-devel
+BuildRequires:	db3-static >= 3.1.17
+BuildRequires:	zlib-static >= 1.1.4
 Obsoletes:	rpm-libs
+%define __find_provides %{SOURCE4}
+%define _binary_payload w9.gzdio
+%define		__find_provides	%{SOURCE4}
 %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, 
-query, verify, update, and uninstall individual software packages. A 
-package consists of an archive of files, and package information, including 
-name, version, and description.
+
+%description
+RPM is a powerful package manager, which can be used to build,
+install, query, verify, update, and uninstall individual software
 packages. A package consists of an archive of files, and package
 nombre, versión y descripción.
-RPM jest doskona³ym menad¿erem pakietów. Dziêki niemu bêdziesz móg³ przebudowaæ,
-zainstalowaæ czy zweryfikowaæ dowolny pakiet. Informacje dotycz±ce ka¿dego 
-pakietu s± przechowywane w bazie danych i dostêpne tylko dla administratora 
-systemu.
+RPM jest doskona³ym menad¿erem pakietów. Dziêki niemu bêdziesz móg³
+%description -l pl
+RPM jest doskona³ym mened¿erem pakietów. Dziêki niemu bêdziesz móg³
+wchodz±cych w sk³ad pakietu, zalezno¶ci od innych pakietów s±
+przechowywane s± w bazie danych i mo¿na je uzyskaæ za pomoc± opcji
+wchodz±cych w sk³ad pakietu, zale¿no¶ci od innych pakietów, s±
 przechowywane w bazie danych i mo¿na je uzyskaæ za pomoc± opcji
 %package libs
 Summary:	RPM shared libraries
-Summary(pl):	Bibliteki wspó³dzielone rpm-a
+Summary(pl):	Biblioteki wspó³dzielone rpm-a
 Group:		Libraries
+Group(de):	Libraries
+Group(fr):	Librairies
 Group(pl):	Biblioteki
 Requires:	%{name} = %{version}
 
@@ -57,14 +72,16 @@ Requires:	%{name} = %{version}
 RPM shared libraries.
 
 %description -l pl libs
-Bibliteki wspó³dzielone rpm-a.
+Biblioteki wspó³dzielone rpm-a.
 
 do pacote, permissões dos arquivos, etc.
 Summary:	Header files and libraries 
 Summary(pl):	Pliki nag³ówkowe i biblioteki statyczne	
 Summary(pl):	Pliki nag³ówkowe i biblioteki statyczne
+Group(de):	Entwicklung/Libraries
+Group(fr):	Development/Librairies
 Group(pl):	Programowanie/Biblioteki
-Requires:	%{name} = %{version}
+Requires:	%{name}-libs = %{version}
 Requires:	%{name} = %{version}
 Requires:	popt-devel
 
@@ -77,22 +94,26 @@ Pliki nag
 graficznych mened¿erów pakietów oraz innych narzêdzi, które wymagaj±
 ferramentas que precisem de conhecimento profundo de pacotes RPM.
 
-Summary(pl):	Bibliteki statyczne rpm-a
-Group:		Libraries/Development
-Group(pl):	Biblioteki/Programowanie
-Requires:	%{name} = %{version}
+Summary(pl):	Biblioteki statyczne rpm-a
+Summary(pl):	Biblioteki statyczne RPM-a
+Group(de):	Entwicklung/Libraries
+Group(fr):	Development/Librairies
+Group(pl):	Programowanie/Biblioteki
+Summary(pt_BR):	Bibliotecas estáticas para o desenvolvimento de aplicações RPM
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}
 
 %description static
 %description -l pl static
-Bibliteki statyczne rpm-a.
+Biblioteki statyczne rpm-a.
 %description static -l pl
 Bibliotecas estáticas para desenvolvimento.
 
 Summary(pl):	Dodatkowe narzêdzia do zarz±dzanai baz± rpm-a i pakietami
-Group:		Utilities/File
-Group(pl):	Narzêdzia/Pliki
+Summary(de):	Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
+Group(de):	Applikationen/Datei
+Group(pl):	Aplikacje/Pliki
+Summary(pl):	Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami
 Group:		Applications/File
 Requires:	%{name} = %{version}
 
@@ -100,23 +121,73 @@ Requires:	%{name} = %{version}
 %description -l pl utils
 Dodatkowe narzêdzia do zarz±dzanai baz± rpm-a i pakietami.
 %description utils -l pl
+Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami.
+Summary:	Additional utilities for check perl provides/requires in rpm packages
+Summary(pl):	Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci dla skryptów perl w pakietach rpm
+Summary(de):	Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen
+Group(de):	Applikationen/Datei
+Group(pl):	Aplikacje/Pliki
+Summary(pl):	Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
+Requires:	perl-modules
+Requires:	findutils
+Additional utilities for check perl provides/requires in rpm packages.
+Additional utilities for checking perl provides/requires in rpm
+%description -l pl perlprov
+Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci dla skryptów perl w
+%description perlprov -l pl
+Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w
+Python para manipular pacotes e bancos de dados RPM.
+
+Summary(pl):	Skrypty pomocnicze do budowania binarnych RPMów
+Summary(pl):	Skrypty pomocnicze do budowania binarnych RPM-ów
+Group(de):	Applikationen/Datei
+Group(pl):	Aplikacje/Pliki
+Summary(pt_BR):	Scripts e programas executáveis usados para construir pacotes
+Group:		Applications/File
+Requires:	sh-utils
+Requires:	binutils
+Requires:	patch
+Requires:	texinfo
+Requires:	file >= 3.31
+Requires:	binutils
+Requires:	gcc >= 3.0.3
+Requires:	gcc
+Requires:	tar
+Requires:	textutils
+
+%description build
+%description -l pl build
+Skrypty pomocnicze do budowania binarnych RPMów.
+%description build -l pl
 construir pacotes usando o RPM.
 %setup  -q
-%patch0 -p0
+%prep
 %patch1 -p1
-%patch2 -p0
+%patch0 -p1
 %patch1 -p1
-%patch4 -p1 
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1 
 %patch7 -p1 
-%patch8 -p1 
+%patch8 -p1
+%patch7 -p1
+%patch10 -p1
+%patch11 -p1
+#%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 %patch31 -p1
-install %{SOURCE4} po/pl.po
-install %{SOURCE3} macros.pld.in
+install %{SOURCE2} macros.pld.in
 install %{SOURCE13} macros.python.in
+(cd scripts; 
+install %{SOURCE7} scripts/find-perl-requires
+install %{SOURCE9} scripts/find-lang.sh
+
+(cd scripts;
+mv -f perl.req perl.req.in
 mv -f perl.prov perl.prov.in)
-LDFLAGS="-s"; export LDFLAGS
 
 (cd popt;
  libtoolize --force --copy
@@ -131,90 +202,104 @@ autoheader
 automake --add-missing --gnu
 autoconf
 %configure \
-	--enable-shared
+	sed 's|@host_cpu@|%{_target_cpu}|' > macros.tmp
+	--enable-v1-packages
 %configure \
-make
+%{__make}
 	--with-python
 
 
 %{__make} %{?_without_static:rpm_LDFLAGS="\\$(myLDFLAGS)"}
-install -d $RPM_BUILD_ROOT/var/db/rpm \
-	$RPM_BUILD_ROOT%{_mandir}/{ru,pl}/man8
 
-make DESTDIR="$RPM_BUILD_ROOT" pkgbindir="%{_bindir}" install
+	DESTDIR="$RPM_BUILD_ROOT" \
+rm -rf $RPM_BUILD_ROOT
 
 install macros.pld $RPM_BUILD_ROOT%{_libdir}/rpm/macros.pld
-install -m755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/install-build-tree
+%{__make} install \
 	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 %{SOURCE1} docs/groups
+install macros.perl $RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
+install macros.python $RPM_BUILD_ROOT%{_libdir}/rpm/macros.python
 install %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm/find-spec-bcond
-strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
-
 #%%_install_langs pl_PL:en_US
 %%distribution PLD
-gzip -9fn $RPM_BUILD_ROOT%{_mandir}/{{ru,pl}/man8/*,man8/*} \
-	RPM-PGP-KEY CHANGES docs/*
+EOF
+
+%find_lang %{name}
 
 %pre
-if [ ! -L /var/lib/rpm ]; then
-	mkdir -p /var/state/rpm
-	cp -ap /var/lib/rpm/* /var/state/rpm
-	rm -rf /var/lib/rpm
-	ln -sf /var/state/rpm /var/lib/rpm
-	echo "RPM Database moved from /var/lib/rpm to /var/state/rpm" >&2
-	echo "Run second time upgradeing rpm package for complete operation"
+if [ -L /var/lib/rpm ]; then
+	echo "WARNING:upgrade cannot be done because /var/state/rpm is symlink"
 	exit 1
 fi
-if [ ! -L /var/db/rpm ]; then
-	mkdir -p /var/state/rpm
-	cp -ap /var/db/rpm/* /var/state/rpm
-	rm -rf /var/db/rpm
-	ln -sf /var/state/rpm /var/db/rpm
-	echo "RPM Database moved from /var/db/rpm to /var/state/rpm" >&2
-	echo "Run second time upgradeing rpm package for complete operation"
-	exit 1
+if [ ! -d /var/lib/rpm ]; then 
+	if [ -e /var/state/rpm ] && [ ! -L /var/state/rpm ]; then
+		mkdir -p /var/lib/rpm
+		cp -ap /var/state/rpm/* /var/lib/rpm
+		rm -rf /var/state/rpm
+		ln -sf /var/lib/rpm /var/state/rpm
+		echo "RPM Database moved from /var/state/rpm to /var/lib/rpm" 1>&2
+		echo "Run second time upgradeing rpm package for complete operation" 1>&2
+		exit 1
+	fi
+	if [ -e /var/db/rpm ] && [ ! -L /var/db/rpm ]; then
+		mkdir -p /var/lib/rpm
+		cp -ap /var/db/rpm/* /var/lib/rpm
+		rm -rf /var/db/rpm
+		ln -sf /var/lib/rpm /var/db/rpm
+		echo "RPM Database moved from /var/db/rpm to /var/lib/rpm" 1>&2
+		echo "Run second time upgradeing rpm package for complete operation" 1>&2
+		exit 1
+	fi
 fi
 
-%postin
+%post
 if [ -L /var/lib/rpm ]; then
 	rm -rf /var/lib/rpm
 fi
 if [ -L /var/db/rpm ]; then
 	rm -rf /var/db/rpm
 fi
+if [ ! -f /var/lib/rpm/packages.rpm ]; then
+	/bin/rpm --initdb
+fi
 
-%post
-/bin/rpm --initdb
-
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT
 
-%doc RPM-PGP-KEY.gz CHANGES.gz docs/*
+%post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %attr(755,root,root) %{_libdir}/rpm/rpmdb
-%{_mandir}/man8/*
-%lang(ru) %{_mandir}/ru/man8/*
-%lang(pl) %{_mandir}/pl/man8/*
+%attr(755,root,root) %{_libdir}/librpm*.so.*.*
+%{_mandir}/man8/rpm.8*
+%lang(pl) %{_mandir}/pl/man8/rpm.8*
+%lang(ja) %{_mandir}/ja/man8/rpm.8*
+%lang(ja) %{_mandir}/ja/man8/rpm.8*
+%lang(ko) %{_mandir}/ko/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
+%lang(sk) %{_mandir}/sk/man8/rpm.8*
 
-%dir /usr/lib/rpm
-%attr(755,root,root) %{_libdir}/rpm/find-*
-%attr(755,root,root) %{_libdir}/rpm/freshen.sh
+%dir /var/lib/rpm
+%{_libdir}/rpm/rpmpopt
+
+%{_libdir}/rpm/macros.pld
+
+%ifarch ppc
+%{_libdir}/rpm/ppc*
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rpmbuild
+%attr(755,root,root) %{_bindir}/rpmu
 %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*
 %attr(755,root,root) %{_libdir}/rpm/rpmb
 %attr(755,root,root) %{_libdir}/rpm/rpmi
 %attr(755,root,root) %{_libdir}/rpm/rpmt
@@ -223,15 +308,28 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/librpm*.so
 %files devel
 %files libs
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librpm*.so.*.*
 
 %defattr(644,root,root,755)
-%attr(644,root,root) %{_libdir}/librpm*.a
+%{_includedir}/rpm
+%attr(755,root,root) %{_libdir}/librpm*.la
 %attr(755,root,root) %{_libdir}/librpm*.so
 
+%files static
 %attr(755,root,root) %{_bindir}/*
 %files utils
+%defattr(644,root,root,755)
+%{_mandir}/man8/rpm2cpio.8*
+%{_mandir}/man1/*
+%lang(ja) %{_mandir}/ja/man8/rpm2cpio.8*
+%lang(ko) %{_mandir}/ko/man8/rpm2cpio.8*
+%lang(pl) %{_mandir}/pl/man8/rpm2cpio.8*
+%lang(ru) %{_mandir}/ru/man8/rpm2cpio.8*
+%attr(755,root,root) %{_libdir}/rpm/find-perl-*
+%attr(755,root,root) %{_libdir}/rpm/find-*.perl
+%attr(755,root,root) %{_libdir}/rpm/find-prov.pl
 
 %files -n python-rpm
 * %{date} PLD Team <pld-list@pld.org.pl>
-All below listed persons can be reached on <cvs_login>@pld.org.pl
+%{py_sitedir}/*.so