use $(LINK) not $(CC) to link

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index f53c3cc804c9484884de2dfa83db069b0ef34f01..b1e9963485307e8cfc4d6d6fd598d81ad589fe70 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:       81.9
+Release:       91
 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
@@ -391,6 +393,8 @@ construir pacotes usando o RPM.
 %patch38 -p1
 %patch39 -p1
 %patch40 -p1
+%patch41 -p1
+%patch42 -p1
 
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
@@ -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
@@ -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