Author: arekm Date: Thu Feb 8 08:32:54 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - rpmrc is obsolete
---- Files affected: SPECS: rpm.spec (1.787 -> 1.788) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.787 SPECS/rpm.spec:1.788 --- SPECS/rpm.spec:1.787 Tue Feb 6 22:49:08 2007 +++ SPECS/rpm.spec Thu Feb 8 09:32:49 2007 @@ -35,7 +35,7 @@ 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 @@ -105,7 +105,6 @@ 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 @@ -690,7 +689,6 @@ %{!?with_neon:%patch44 -p1} %patch45 -p1 %patch46 -p1 -%patch47 -p1 %patch48 -p1 %patch49 -p1 %patch50 -p1 @@ -825,11 +823,8 @@ 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 @@ -995,9 +990,6 @@ #%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 @@ -1184,6 +1176,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.788 2007/02/08 08:32:49 arekm +- rpmrc is obsolete + Revision 1.787 2007/02/06 21:49:08 arekm - rel 10 with no symbolic thing ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.787&r2=1.788&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
