X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=9ede4ee3afee0aff8314d4639c863bc47c66cb67;hb=617190f684cf21ccb586bc41ec9fb07e0f6b6e33;hp=c7f235485b02a2c9f115bba749fd26ebb310f75d;hpb=f17e54cb727fb3422838ea3803ead236148f4810;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index c7f2354..9ede4ee 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,30 +1,34 @@
 Summary:	Red Hat & PLD Package Manager
 Summary(pl):	Aplikacja do zarz±dzania pakietami
 Name:		rpm
-Version:	3.0.4
-Release:	9
+Version:	3.0.5
+Release:	13
 Group:		Base
+Group(de):	Gründsätzlich
 Group(pl):	Podstawowe
 License:	GPL
 Source0:	ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/%{name}-%{version}.tar.gz
-Source1:	rpm.groups
-Source2:	rpm.macros
-Source3:	rpm-find-requires
-Source5:	rpm-install-tree
-Patch0:		rpm-rpmrc.patch
-Patch1:		rpm-find-requires.patch
-Patch2:		rpm-macros.patch
-Patch3:		rpm-arch.patch
-Patch4:		rpm-rpmpopt.patch
-Patch5:		rpm-find-provides.patch
-Patch6:		rpm-perl-macros.patch
-Patch7:		rpm-find-lang-all-name.patch
-Patch8:		rpm-bzip2.patch
-Patch9:		rpm-file3.31.patch
-Patch10:	rpm-find-lang-name-matching.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
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
-BuildRequires:	bzip2-static >= 1.0.0
+Requires:	glibc >= 2.1
+BuildRequires:	bzip2-static >= 1.0.1
 BuildRequires:	gdbm-static
 BuildRequires:	zlib-static
 BuildRequires:	gettext-devel >= 0.10.38-3
@@ -32,25 +36,32 @@ BuildRequires:	libtool
 BuildRequires:	automake
 BuildRequires:	autoconf >= 2.13-8
 BuildRequires:	gettext-devel
-Requires:	glibc >= 2.1
+BuildRequires:	db3-static >= 3.1.14
 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):	Biblioteki wspó³dzielone rpm-a
 Group:		Libraries
+Group(de):	Libraries
+Group(fr):	Librairies
 Group(pl):	Biblioteki
 Requires:	%{name} = %{version}
 
@@ -64,6 +75,8 @@ do pacote, permiss
 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}-libs = %{version}
 Requires:	%{name} = %{version}
@@ -80,6 +93,8 @@ ferramentas que precisem de conhecimento profundo de pacotes RPM.
 
 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
@@ -92,8 +107,9 @@ Biblioteki statyczne rpm-a.
 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}
@@ -105,26 +121,34 @@ Dodatkowe narz
 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
-Group:		Utilities/File
-Group(pl):	Narzêdzia/Pliki
+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 pakietach rpm.
+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
-Group:		Utilities/File
-Group(pl):	Narzêdzia/Pliki
+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
 
@@ -145,15 +169,18 @@ construir pacotes usando o RPM.
 %patch8 -p1
 %patch7 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 %patch31 -p1
 install %{SOURCE2} macros.pld.in
 install %{SOURCE13} macros.python.in
 (cd scripts; 
-mv perl.req perl.req.in
-mv perl.prov perl.prov.in)
+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
@@ -168,38 +195,34 @@ 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/lib/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
 %{__make} install \
-install %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/install-build-tree
 	pkgbindir="%{_bindir}"
 
+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
-install %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires
-
-strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
-
 #%%_install_langs pl_PL:en_US
 %%distribution PLD
 EOF
 
-gzip -9fn $RPM_BUILD_ROOT%{_mandir}/{{ja,ru,pl}/man8/*,man8/*} \
-	RPM-PGP-KEY CHANGES doc/manual/*
+%find_lang %{name}
 
 %pre
 if [ -L /var/lib/rpm ]; then
-	echo "WARNING: upgrade cannot be done because /var/state/rpm is symlink"
+	echo "WARNING:upgrade cannot be done because /var/state/rpm is symlink"
 	exit 1
 fi
 if [ ! -d /var/lib/rpm ]; then 
@@ -234,6 +257,9 @@ if [ ! -f /var/lib/rpm/packages.rpm ]; then
 	/bin/rpm --initdb
 fi
 
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -249,7 +275,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja) %{_mandir}/ja/man8/rpm.8*
 %lang(ja) %{_mandir}/ja/man8/rpm.8*
 %lang(ko) %{_mandir}/ko/man8/rpm.8*
-%dir /usr/lib/rpm
+%lang(pl) %{_mandir}/pl/man8/rpm.8*
 %lang(ru) %{_mandir}/ru/man8/rpm.8*
 %lang(sk) %{_mandir}/sk/man8/rpm.8*
 
@@ -285,7 +311,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/rpm/freshen.sh
 %files utils
 %defattr(644,root,root,755)
 %{_mandir}/man8/rpm2cpio.8*