X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=e21f73327805b7f5efaa936895d3147eef0f5414;hb=9ebc76cb49666781372856845ffd937dc0343e42;hp=fb7f038ad43dedef15edea26ffc64b985a8d2330;hpb=9bff505238c01c15f62f3aa6dcde689907c6411d;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index fb7f038..e21f733 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -7,7 +7,7 @@ Summary(pl):	Aplikacja do zarz
 Summary(pt_BR):	Gerenciador de pacotes RPM
 Name:		rpm
 Version:	4.0.2
-Release:	58
+Release:	87
 License:	GPL
 Group:		Base
 Source0:	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/%{name}-%{version}.tar.gz
@@ -24,6 +24,14 @@ Source10:	%{name}-find-provides
 Source11:	%{name}-find-requires
 Source12:	%{name}-non-english-man-pages.tar.bz2
 Source13:	%{name}-macros.python
+Source14:	%{name}-groups-po.awk
+Source15:	%{name}-compress-doc
+Source16:	%{name}-check-files
+Source17:	%{name}-php-provides
+Source18:	%{name}-php-requires
+Source19:	%{name}-find-php-provides
+Source20:	%{name}-find-php-requires
+Source21:	%{name}-macros.php
 Patch0:		%{name}-rpmrc.patch
 Patch1:		%{name}-macros.patch
 Patch2:		%{name}-arch.patch
@@ -58,8 +66,15 @@ Patch30:	%{name}-athlon.patch
 Patch31:	%{name}-athlon-identify.patch
 Patch32:	%{name}-gettext-in-header.patch
 Patch33:	%{name}-perlprov-perl5.6.patch
+Patch34:	%{name}-ac25x.patch
+Patch35:        %{name}-signverify-fix.patch
+Patch36:        %{name}-compress-doc.patch
 Patch37:        %{name}-short_circuit.patch
-Patch38:        %{name}-section_test.patch
+Patch38:        %{name}-test_stage.patch
+Patch39:        %{name}-exclude.patch
+Patch40:        %{name}-check_files.patch
+Patch41:        %{name}-choke-on-evil-doc.patch
+Patch42:	%{name}-rpmlog-fix.patch
 URL:		http://www.rpm.org/
 Icon:		rpm.gif
 BuildRequires:	autoconf >= 2.50
@@ -68,8 +83,8 @@ BuildRequires:	bzip2-devel >= 1.0.1
 BuildRequires:	db1-devel >= 1.85
 BuildRequires:	db3-devel >= 3.1.17-9
 BuildRequires:	gettext-devel >= 0.10.38-3
-BuildRequires:	python-devel >= 2.2
-BuildRequires:	python-modules >= 2.2
+BuildRequires:	libtool
+BuildRequires:	patch >= 2.2
 BuildRequires:	python-devel >= 2.2.1
 BuildRequires:	python-modules >= 2.2.1
 BuildRequires:	zlib-devel >= 1.1.4
@@ -81,6 +96,7 @@ BuildRequires:	db3-static >= 3.1.17-9
 BuildRequires:	glibc-static >= 2.2.0
 BuildRequires:	zlib-static >= 1.1.4
 %endif
+Requires:	zlib >= 1.1.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	rpm-libs
 Conflicts:	glibc < 2.2
@@ -91,6 +107,7 @@ Conflicts:	glibc < 2.2
 %define		py_ver		%(echo `python -c "import sys; print sys.version[:3]"`)
 %define		py_prefix	%(echo `python -c "import sys; print sys.prefix"`)
 %define		py_libdir	%{py_prefix}/lib/python%{py_ver}
+%define		py_sitedir	%{py_libdir}/site-packages
 %define		py_dyndir	%{py_libdir}/lib-dynload
 %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, '.')"`)
 
@@ -240,11 +257,25 @@ software.
 Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w
 Pythonie.
 
+%package php-pearprov
+Summary:	Additional utilities for managing rpm packages and database
+Summary(pl):	Dodatkowe narzêdzia do sprawdzania zale¿no¶ci skryptów php w rpm.
+Group:		Applications/File
+Requires:	%{name} = %{version}
+
+%description php-pearprov
+Additional utilities for checking php pear provides/requires in rpm
+packages.
+
+%description php-pearprov -l pl
+Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów php pear w
+pakietach rpm.
+
 %package -n python-rpm
 Summary:	Python interface to RPM library
-Group:		Development/Languages/Python
+Summary(pl):	Pythonowy interfejs do biblioteki RPM-a
 Summary(pt_BR):	Módulo Python para aplicativos que manipulam pacotes RPM
-%requires_eq	python
+Group:		Libraries/Python
 Requires:	%{name} = %{version}
 %pyrequires_eq	python
 Obsoletes:	rpm-python
@@ -290,6 +321,7 @@ Requires:	findutils
 Requires:	gcc >= 3.0.3
 %else
 Requires:	gcc
+%endif
 Requires:	glibc-devel
 Requires:	grep
 Requires:	gzip
@@ -352,43 +384,59 @@ construir pacotes usando o RPM.
 %patch31 -p1
 %endif
 
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
 
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
 install %{SOURCE5} macros.perl.in
 install %{SOURCE13} macros.python.in
+install %{SOURCE21} macros.php.in
 install %{SOURCE6} scripts/find-perl-provides
 install %{SOURCE7} scripts/find-perl-requires
 install %{SOURCE9} scripts/find-lang.sh
+install %{SOURCE17} scripts/php.prov.in
+install %{SOURCE18} scripts/php.req.in
+install %{SOURCE19} scripts/find-php-provides
+install %{SOURCE20} scripts/find-php-requires
+
 
 (cd scripts;
 mv -f perl.req perl.req.in
 mv -f perl.prov perl.prov.in)
+
+chmod +x %{SOURCE4}
+
 %build
 # generate Group translations to *.po
 awk -f %{SOURCE14} %{SOURCE1}
 
 cd popt
-autoconf
-automake -a -c
+rm -f missing
+%{__libtoolize}
 aclocal
 autoheader
-automake -a -c -f
+%{__autoconf}
 %{__automake}
 cd ..
 
 rm -f missing
-libtoolize --force --copy
-autoconf
+%{__libtoolize}
+%{__gettextize}
 aclocal
 autoupdate
 autoheader || :
 %{__autoconf}
-automake -a -c
+# ugly workaround for automake
 sed -e 's#cpio.c $(DBLIBOBJS) depends.c#cpio.c depends.c#g' \
 	lib/Makefile.am > lib/Makefile.am.new
 mv -f lib/Makefile.am.new lib/Makefile.am
@@ -412,7 +460,6 @@ mv -f macros.tmp macros.in
 	--enable-v1-packages \
 	--with-python
 
-
 %{__make} %{?_without_static:rpm_LDFLAGS="\\$(myLDFLAGS)"}
 
 %install
@@ -422,15 +469,20 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgbindir="%{_bindir}"
 
-install macros.perl $RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
-install macros.python $RPM_BUILD_ROOT%{_libdir}/rpm/macros.python
+install macros.perl	$RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
+install macros.python	$RPM_BUILD_ROOT%{_libdir}/rpm/macros.python
+install macros.php	$RPM_BUILD_ROOT%{_libdir}/rpm/macros.php
 
 install %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/install-build-tree
+install %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/rpm/find-rpm-provides
 install %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm/find-spec-bcond
 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 rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm
 
@@ -444,11 +496,6 @@ EOF
 
 %find_lang %{name}
 
-# DON'T BREAK BUILD TREE!!!
-# rm -f doc/manual/Makefile*
-
-gzip -9nf RPM-PGP-KEY CHANGES doc/manual/*
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -457,7 +504,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc RPM-PGP-KEY.gz CHANGES.gz doc/manual/*
+%doc RPM-PGP-KEY CHANGES doc/manual/[a-z]*
 
 %attr(755,root,root) /bin/rpm
 %attr(755,root,root) %{_bindir}/rpmdb
@@ -484,7 +531,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/rpm
 %dir %{_libdir}/rpm
 
-%{_libdir}/rpm/macros.python
 %doc %attr(755,root,root) %{_libdir}/rpm/convertrpmrc.sh
 
 %{_libdir}/rpm/rpmrc
@@ -506,7 +552,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/rpm/ppc*
 %endif
 
-
 %files build
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rpmbuild
@@ -519,10 +564,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/rpm/find-spec-bcond
 %attr(755,root,root) %{_libdir}/rpm/find-lang.sh
 %attr(755,root,root) %{_libdir}/rpm/mkinstalldirs
+%attr(755,root,root) %{_libdir}/rpm/config.*
 %attr(755,root,root) %{_libdir}/rpm/getpo.sh
 %attr(755,root,root) %{_libdir}/rpm/install-build-tree
 %attr(755,root,root) %{_libdir}/rpm/brp-*
 %attr(755,root,root) %{_libdir}/rpm/check-prereqs
+%attr(755,root,root) %{_libdir}/rpm/check-files
 %attr(755,root,root) %{_libdir}/rpm/compress-doc
 %attr(755,root,root) %{_libdir}/rpm/cpanflute
 %attr(755,root,root) %{_libdir}/rpm/http.req
@@ -575,6 +622,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/rpm/macros.python
 
+%files php-pearprov
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/rpm/php*
+%attr(755,root,root) %{_libdir}/rpm/find-php*
+%{_libdir}/rpm/macros.php
+
 %files -n python-rpm
 %defattr(755,root,root,755)
 %{py_sitedir}/*.so