commit 7cf857f2dab39731c52fbe7a0e8a6277bdd07535 Author: Elan Ruusamäe <g...@delfi.ee> Date: Fri Mar 29 21:43:55 2013 +0200
drop ruby macros here, duplicate. provided by rpm-build-macros rpm.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- diff --git a/rpm.spec b/rpm.spec index 1559c2f..23ff1dd 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: 45 +Release: 46 License: LGPL Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm @@ -621,7 +621,7 @@ Summary(ru.UTF-8): Скрипты и утилиты, необходимые дл Summary(uk.UTF-8): Скрипти та утиліти, необхідні для побудови пакетів Group: Applications/File Requires(pre): findutils -Requires: %{name}-build-macros >= 1.653 +Requires: %{name}-build-macros >= 1.656 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -1137,6 +1137,13 @@ 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} @@ -1471,7 +1478,6 @@ 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 ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/7cf857f2dab39731c52fbe7a0e8a6277bdd07535 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit