- release 87 - rebuild with fixed php-requires script - STBR

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index d16ae6de1906a660774803ee5e1026b2d8dbbbd8..e21f73327805b7f5efaa936895d3147eef0f5414 100644 (file)
--- 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:       78
+Release:       87
 License:       GPL
 Group:         Base
 Source0:       ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/%{name}-%{version}.tar.gz
@@ -73,6 +73,8 @@ Patch37:        %{name}-short_circuit.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
@@ -390,7 +392,9 @@ construir pacotes usando o RPM.
 %patch37 -p1
 %patch38 -p1
 %patch39 -p1
-#%patch40 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
 
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
@@ -400,8 +404,8 @@ 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.req.in
-install %{SOURCE18} scripts/php.prov.in
+install %{SOURCE17} scripts/php.prov.in
+install %{SOURCE18} scripts/php.req.in
 install %{SOURCE19} scripts/find-php-provides
 install %{SOURCE20} scripts/find-php-requires
 
@@ -418,7 +422,7 @@ awk -f %{SOURCE14} %{SOURCE1}
 
 cd popt
 rm -f missing
-libtoolize --force --copy
+%{__libtoolize}
 aclocal
 autoheader
 %{__autoconf}
@@ -426,7 +430,7 @@ autoheader
 cd ..
 
 rm -f missing
-libtoolize --force --copy
+%{__libtoolize}
 %{__gettextize}
 aclocal
 autoupdate
@@ -456,7 +460,6 @@ mv -f macros.tmp macros.in
        --enable-v1-packages \
        --with-python
 
-
 %{__make} %{?_without_static:rpm_LDFLAGS="\\$(myLDFLAGS)"}
 
 %install
@@ -477,7 +480,7 @@ 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 %{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/
 
@@ -549,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
@@ -567,7 +569,7 @@ rm -rf $RPM_BUILD_ROOT
 %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/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