- add provides/requires scripts macros for perl and python

diff --git a/prov-req-macros b/prov-req-macros
new file mode 100644 (file)
index 0000000..ef7867e
--- /dev/null
+++ b/prov-req-macros
@@ -0,0 +1,4 @@
+%__perl_provides       %{_rpmhome}/perl.prov
+%__perl_requires       %{_rpmhome}/perl.req
+%__python_provides     %{_rpmhome}/pythoneggs.py --provides
+%__python_requires     %{_rpmhome}/pythoneggs.py --requires

diff --git a/rpm.spec b/rpm.spec
index e15868dd797762a2fe9144858916ba075d469d28..2db85595fd087de5ccf14747dc1d6e8ac3a8a048 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -82,6 +82,7 @@ Source26:     %{name}db_checkversion.c
 Source27:      macros.lang
 Source28:      %{name}db_reset.c
 Source29:      dbupgrade.sh
 Source27:      macros.lang
 Source28:      %{name}db_reset.c
 Source29:      dbupgrade.sh

+Source30:      prov-req-macros

 Patch0:                %{name}-branch.patch
 Patch1:                %{name}-man_pl.patch
 Patch2:                %{name}-popt-aliases.patch
 Patch0:                %{name}-branch.patch
 Patch1:                %{name}-man_pl.patch
 Patch2:                %{name}-popt-aliases.patch


@@ -1239,6 +1240,8 @@ for m in gstreamer mono; do
        echo "%%{load:%{_rpmlibdir}/macros.d/$m}" >$RPM_BUILD_ROOT%{_rpmlibdir}/macros.$m
 done
 
        echo "%%{load:%{_rpmlibdir}/macros.d/$m}" >$RPM_BUILD_ROOT%{_rpmlibdir}/macros.$m
 done
 

+install %{SOURCE30} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/prov-req
+

 # moved to rpm-build-macros 1.699
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/kernel
 # moved to rpm-build-macros 1.744
 # moved to rpm-build-macros 1.699
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/kernel
 # moved to rpm-build-macros 1.744


@@ -1524,6 +1527,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/macros.d/libtool
 %{_rpmlibdir}/macros.d/mono
 %{_rpmlibdir}/macros.d/pkgconfig
 %{_rpmlibdir}/macros.d/libtool
 %{_rpmlibdir}/macros.d/mono
 %{_rpmlibdir}/macros.d/pkgconfig

+%{_rpmlibdir}/macros.d/prov-req

 %{_rpmlibdir}/macros.d/selinux
 %{_rpmlibdir}/macros.rpmbuild
 # compat wrappers
 %{_rpmlibdir}/macros.d/selinux
 %{_rpmlibdir}/macros.rpmbuild
 # compat wrappers