From 3b644c29e61e2ae33aadd7613b0af1eaec52cf05 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 26 Apr 2013 01:17:55 +0300 Subject: [PATCH] ruby: re-enable macros.d/ruby for autodeps previously disabled in cd352fdab2c780ade042a95bf0e4ec2e4c8fafba due duplication need to define only __ruby_provides and __ruby_requires, but as other macros.d/* provide macros later overriden by macros.build, going to accept this duplication here as well (macros.build always overrides macros.d/* contents via due load order specified by --with-path-macros configure option) --- rpm.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rpm.spec b/rpm.spec index 7047191..e8b549a 100644 --- a/rpm.spec +++ b/rpm.spec @@ -52,7 +52,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.4.10 -Release: 47 +Release: 48 License: LGPL Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm @@ -1141,14 +1141,11 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/vpkg-provides* rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh -rm $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/ruby rm $RPM_BUILD_ROOT%{_rpmlibdir}/lib/liblua.a rm $RPM_BUILD_ROOT%{_rpmlibdir}/lib/liblua.la rm $RPM_BUILD_ROOT%{_rpmlibdir}/mono-find-provides rm $RPM_BUILD_ROOT%{_rpmlibdir}/mono-find-requires -%{__sed} -i -e '/macros.d\/ruby/ s/^/#/' $RPM_BUILD_ROOT%{_rpmlibdir}/macros - # not installed since 4.4.8 (-tools-perl subpackage) install scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir} @@ -1482,6 +1479,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/macros.d/php %{_rpmlibdir}/macros.d/pkgconfig %{_rpmlibdir}/macros.d/python +%{_rpmlibdir}/macros.d/ruby %{_rpmlibdir}/macros.d/selinux %{_rpmlibdir}/macros.d/tcl %{_rpmlibdir}/macros.rpmbuild -- 2.44.0