[packages/rpm] Fix typo in gstreamer.in and pass __GST_INSPECT to configure (ready for gstreamer 1.x)

megabajt megabajt at pld-linux.org
Wed Sep 26 09:27:32 CEST 2012


commit bba1059ca5e7aa6f9fef653e710e44a8ece0f974
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Wed Sep 26 09:24:19 2012 +0200

    Fix typo in gstreamer.in and pass __GST_INSPECT to configure
    (ready for gstreamer 1.x)

 rpm-gst-inspect-typo.patch | 11 +++++++++++
 rpm.spec                   |  3 +++
 2 files changed, 14 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index 81ddcaf..7f18ab2 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -138,6 +138,7 @@ Patch47:	%{name}-query-file-always-noisy.patch
 Patch48:	%{name}-verify-ghosts-broken-logic.patch
 Patch49:	%{name}-python-enable-compat-RPMSENSE.patch
 Patch50:	%{name}-dont-treat-gstreamer-modules-as-font.patch
+Patch51:	%{name}-gst-inspect-typo.patch
 
 # Patches imported from Mandriva
 
@@ -814,6 +815,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch48 -p1
 %patch49 -p1
 %patch50 -p1
+%patch51 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -891,6 +893,7 @@ sed -i \
 	CXX="%{__newcxx}" \
 	CPP="%{__newcpp}" \
 	WITH_PERL_VERSION=no \
+	__GST_INSPECT=%{_bindir}/gst-inspect-1.0 \
 	--enable-shared \
 	--enable-static \
 	%{!?with_apidocs:--without-apidocs} \
diff --git a/rpm-gst-inspect-typo.patch b/rpm-gst-inspect-typo.patch
new file mode 100644
index 0000000..74d32fc
--- /dev/null
+++ b/rpm-gst-inspect-typo.patch
@@ -0,0 +1,11 @@
+--- rpm-5.4.10/macros/gstreamer.in.gst	2012-09-26 08:59:44.842368772 +0200
++++ rpm-5.4.10/macros/gstreamer.in	2012-09-26 08:59:48.542348566 +0200
+@@ -2,7 +2,7 @@
+ # To make use of these macros insert the following line into your spec file:
+ # %{load:%{_usrlibrpm}/macros.d/gstreamer}
+ 
+-%__gst_inspect		@__GST_INSPECT
++%__gst_inspect		@__GST_INSPECT@
+ 
+ # Path to scripts to autogenerate gstreamer package dependencies,
+ #
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/bba1059ca5e7aa6f9fef653e710e44a8ece0f974



More information about the pld-cvs-commit mailing list