- rpmrc is obsolete

Changed files:
    rpm.spec -> 1.788

diff --git a/rpm.spec b/rpm.spec
index 4a8efb361dd4210e9beb9f2a059509a5a20089dc..e843751a25f45fd742e47d6fe4b924cea0e94adc 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -34,7 +34,7 @@ Summary(ru):  
 Summary(uk):   íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM
 Name:          rpm
 Version:       4.4.7
-Release:       10
+Release:       10.1
 License:       GPL
 Group:         Base
 Source0:       ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -104,7 +104,6 @@ Patch43:    %{name}-patch-quote.patch
 Patch44:       %{name}-no-neon.patch
 Patch45:       %{name}-no-sqlite.patch
 Patch46:       %{name}-mono.patch
-Patch47:       %{name}-rpmrc-resurrect.patch
 Patch48:       %{name}-requireseq.patch
 Patch49:       %{name}-p4.patch
 Patch50:       %{name}-macros.patch
@@ -689,7 +688,6 @@ install %{SOURCE12} scripts/perl.prov
 %{!?with_neon:%patch44 -p1}
 %patch45 -p1
 %patch46 -p1
-%patch47 -p1
 %patch48 -p1
 %patch49 -p1
 %patch50 -p1
@@ -824,11 +822,8 @@ install %{SOURCE33} $RPM_BUILD_ROOT%{_bindir}/banner.sh
 
 install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm
 
-%ifarch %{ix86}
-ix86re=$(echo "(%{ix86})"|sed 's/ /|/g')
-perl -p -i -e 's/^(buildarchtranslate: '"$ix86re"': ).*/\1%{_target_cpu}/' \
-       $RPM_BUILD_ROOT%{_rpmlibdir}/rpmrc
-%endif
+# obsolete but still installed
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/rpmrc
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
 # customized rpm macros - global for host
@@ -994,9 +989,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 #%attr(755,root,root) %{_rpmlibdir}/rpmk
 #%attr(755,root,root) %{_rpmlibdir}/rpm[qv]
 
-#%doc %attr(755,root,root) %{_rpmlibdir}/convertrpmrc.sh
-
-%{_rpmlibdir}/rpmrc
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/macros