commit 6ca8dd960ff685bd743a314a47bdaddd974f517f
Author: Marcin Banasiak <[email protected]>
Date: Wed Sep 26 11:09:13 2012 +0200
Remove gstreamer-rpmdeps.sh and redefine __gst_inspect
gstreamer-rpmdeps.sh | 30 ------------------------------
gstreamer0.10.spec | 8 ++------
2 files changed, 2 insertions(+), 36 deletions(-)
---
diff --git a/gstreamer0.10.spec b/gstreamer0.10.spec
index 54d2c1e..2f5f2d5 100644
--- a/gstreamer0.10.spec
+++ b/gstreamer0.10.spec
@@ -7,7 +7,6 @@ License: LGPL v2+
Group: Libraries
Source0:
http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.xz
# Source0-md5: 15389c73e091b1dda915279c388b9cb2
-Source1: gstreamer-rpmdeps.sh
Patch0: gstreamer-without_ps_pdf.patch
Patch1: gstreamer-eps.patch
Patch2: gstreamer-inspect-rpm-format.patch
@@ -38,12 +37,12 @@ BuildRequires: xz
Requires: glib2 >= 1:2.24
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define __gst_inspect %{_bindir}/gst-inspect-0.10
+
%define vmajor %(echo %{version} | cut -d. -f1,2)
%define _gstlibdir %{_libdir}/gstreamer-%{vmajor}
%define _gstincludedir %{_includedir}/gstreamer-%{vmajor}
-%define rpmlibdir /usr/lib/rpm
-
%description
GStreamer is a streaming-media framework, based on graphs of filters
which operate on media data. Applications using this library can do
@@ -133,8 +132,6 @@ install -d
$RPM_BUILD_ROOT{%{_docdir}/gstreamer-devel-%{version},%{rpmlibdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{rpmlibdir}/gstreamerdeps.sh
-
mv $RPM_BUILD_ROOT%{_docdir}/gstreamer-{%{vmajor},%{version}}
mv $RPM_BUILD_ROOT%{_docdir}/gstreamer-%{version}/{manual,pwg} \
$RPM_BUILD_ROOT%{_docdir}/gstreamer-devel-%{version}
@@ -201,7 +198,6 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/gstreamer-dataprotocol-0.10.pc
%{_pkgconfigdir}/gstreamer-net-0.10.pc
%{_aclocaldir}/gst-element-check-0.10.m4
-%attr(755,root,root) %{rpmlibdir}/gstreamerdeps.sh
%{_datadir}/gir-1.0/Gst-0.10.gir
%{_datadir}/gir-1.0/GstBase-0.10.gir
%{_datadir}/gir-1.0/GstCheck-0.10.gir
diff --git a/gstreamer-rpmdeps.sh b/gstreamer-rpmdeps.sh
deleted file mode 100644
index 93d8d41..0000000
--- a/gstreamer-rpmdeps.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-gstinspect="/usr/bin/gst-inspect"
-
-if [ ! -x $gstinspect ]; then
- cat > /dev/null
- exit 0
-fi
-
-case $1 in
--P|--provides)
- while read filename; do
- case "$filename" in
- *.so)
- $gstinspect --print-plugin-auto-install-info --rpm "$filename"
2> /dev/null | while read line; do
- echo -n "$line"
-
- if file $filename 2> /dev/null | grep "ELF 64-bit"
>/dev/null ; then
- echo -n "()(64bit)"
- fi
-
- echo
- done
- ;;
- esac
- done
- ;;
-esac
-
-exit 0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gstreamer0.10.git/commitdiff/6ca8dd960ff685bd743a314a47bdaddd974f517f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
