Release 1.4.1

Change-Id: I4c7ea1305cb5c9fd02670bb70929aef47eec54f1
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/.gbs.conf b/.gbs.conf
deleted file mode 100644 (file)
index fa9fdc5..0000000
--- a/.gbs.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[general]
-upstream_branch = upstream
-upstream_tag = ${upstreamversion}

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644 (file)
index 1ba590b..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "common"]
-        path = common
-        url = git://anongit.freedesktop.org/gstreamer/common

diff --git a/gstreamer.manifest b/gstreamer.manifest
new file mode 100644 (file)
index 0000000..97e8c31
--- /dev/null
+++ b/gstreamer.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
deleted file mode 100644 (file)
index 10121bf..0000000
--- a/packaging/baselibs.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-gstreamer
-libgstreamer

diff --git a/packaging/common.tar.bz2 b/packaging/common.tar.bz2
index 5902609..e03bc66 100644 (file)
Binary files a/packaging/common.tar.bz2 and b/packaging/common.tar.bz2 differ

diff --git a/packaging/gitmodules.sh b/packaging/gitmodules.sh
deleted file mode 100755 (executable)
index 71a66cd..0000000
--- a/packaging/gitmodules.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-# @author: Philippe Coval <mailto:philippe.coval@eurogiciel.com>
-# @description: manage git submodules with git-build-package-rpm
-
-set -x
-set -e
-
-cat .gitmodules || return 1
-
-
-git submodule status | awk '{ print $2 }' | while read dir  ; do
-    name=$(basename "$dir" )
-    echo "name="
-    echo "dir=$dir"
-    git submodule init
-    git submodule update
-
-    tar cjvf "./packaging/${name}.tar.bz2" "${dir}"
-
-    cat<<EOF
-# Please add "SourceN: $name.tar.bz2" and "%setup -q -T -D -a N" to "packaging/*.spec"
-EOF
-
-done

diff --git a/packaging/gstreamer.changes b/packaging/gstreamer.changes
deleted file mode 100644 (file)
index 8e4f12f..0000000
--- a/packaging/gstreamer.changes
+++ /dev/null
@@ -1,8 +0,0 @@
-* Fri Mar 29 2013 Anas Nashif <anas.nashif@intel.com> upstream/1.0.6@8cb0dd3
-- Update to 1.0.6
-
-* Mon Mar 18 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130123.171619@c9f5335
-- Fixed package groups
-
-* Wed Jan 23 2013 Anas Nashif <anas.nashif@intel.com> upstream/1.0.5@3de29c4
-- Update to 1.0.5

diff --git a/packaging/gstreamer.macros b/packaging/gstreamer.macros
deleted file mode 100644 (file)
index d8662ff..0000000
--- a/packaging/gstreamer.macros
+++ /dev/null
@@ -1,4 +0,0 @@
-%__gstreamer_provides  %{_rpmconfigdir}/gstreamer-provides
-%__gstreamer_path      libgst
-%__gstreamer_magic     ELF.*shared object
-%__gstreamer_flags     magic_and_path

diff --git a/packaging/gstreamer.manifest b/packaging/gstreamer.manifest
deleted file mode 100644 (file)
index 017d22d..0000000
--- a/packaging/gstreamer.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
- <request>
-    <domain name="_"/>
- </request>
-</manifest>

diff --git a/packaging/gstreamer.prov b/packaging/gstreamer.prov
deleted file mode 100644 (file)
index 304da2f..0000000
--- a/packaging/gstreamer.prov
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# Script to install in:
-# /usr/lib/rpm/redhat/find-provides.d
-#
-# Transform GStreamer auto install info into RPM provides
-#
-# Author: Bastien Nocera <hadess@hadess.net>
-# Based on other provides scripts from RPM
-#
-
-# We need a way to disable automatic gst provides.
-# Simply "%define SKIP_GSTPROVIDES 1" anywhere in the spec file
-grep -q -E '^[^#]?%define\s+SKIP_GSTPROVIDES\s.*[^0\s].*' "$RPMBUILD_SPECFILE" && exit 0
-
-filelist=`grep -e '.so$' | sed "s/['\"]/\\\&/g"`
-
-# --- Alpha does not mark 64bit dependencies•
-case `uname -m` in
-  alpha*)      mark64="" ;;
-  *)           mark64="()(64bit)" ;;
-esac
-
-solist=$(echo $filelist | grep "libgst" | \
-       xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1 )
-
-function getmark()
-{
-       lib64=`if file -L $1 2>/dev/null | \
-               grep "ELF 64-bit" >/dev/null; then echo -n "$mark64"; fi`
-}
-
-function libdir()
-{
-       buildlibdir=`dirname $1`
-       buildlibdir=`dirname $buildlibdir`
-}
-
-for so in $solist ; do
-       getmark $so
-       libdir $so
-       LD_LIBRARY_PATH=$buildlibdir gst-inspect-1.0 --print-plugin-auto-install-info --rpm $so 2> /dev/null | while read line ; do
-               echo -n "$line";
-               echo -n "$lib64"
-               echo
-       done
-done

diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec
index ad60b64..caaee22 100644 (file)
--- a/packaging/gstreamer.spec
+++ b/packaging/gstreamer.spec
@@ -1,32 +1,23 @@
-%bcond_with introspection
+%define gst_branch 1.0
 
 Name:           gstreamer
-Version:        1.2.4
+Version:        1.4.1
 Release:        0
-%define gst_branch 1.0
 Summary:        Streaming-Media Framework Runtime
 License:        LGPL-2.1+
 Group:          Multimedia/Framework
 Url:            http://gstreamer.freedesktop.org/
-Source0:        http://download.gnome.org/sources/gstreamer/1.0/%{name}-%{version}.tar.xz
-Source1:        gstreamer.macros
-Source2:        gstreamer.prov
-Source99:       baselibs.conf
+Source0:        http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.xz
 Source100:      common.tar.bz2
-Source1001:    gstreamer.manifest
 BuildRequires:  bison
-BuildRequires: gettext-tools
+BuildRequires:  gettext-tools
 BuildRequires:  check-devel
 BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  glib2-devel >= 2.32.0
 BuildRequires:  libtool
-BuildRequires:  gst-common
 BuildRequires:  libxml2-devel
-%if %{with introspection}
 BuildRequires:  gobject-introspection-devel >= 1.31.1
-%endif
-Requires:       libgstreamer >= %{version}
 
 %description
 GStreamer is a streaming-media framework, based on graphs of filters
@@ -36,33 +27,6 @@ about anything else media-related.  Its plug-in-based architecture
 means that new data types or processing capabilities can be added by
 installing new plug-ins.
 
-%package -n libgstreamer
-Summary:        Streaming-Media Framework Runtime
-Group:          Multimedia/Framework
-# We want to have core modules installed:
-Requires:       %{name}
-
-%description -n libgstreamer
-GStreamer is a streaming-media framework, based on graphs of filters
-which operate on media data. Applications using this library can do
-anything from real-time sound processing to playing videos, and just
-about anything else media-related.  Its plug-in-based architecture
-means that new data types or processing capabilities can be added by
-installing new plug-ins.
-
-%package -n typelib-Gst
-Summary:        Streaming-Media Framework Runtime -- Introspection bindings
-Group:          Multimedia/Framework
-
-%description -n typelib-Gst
-GStreamer is a streaming-media framework, based on graphs of filters
-which operate on media data. Applications using this library can do
-anything from real-time sound processing to playing videos, and just
-about anything else media-related.  Its plug-in-based architecture
-means that new data types or processing capabilities can be added by
-installing new plug-ins.
-
-This package provides the GObject Introspection bindings for GStreamer.
 
 %package utils
 Summary:        Streaming-Media Framework Runtime
@@ -79,27 +43,26 @@ about anything else media-related.  Its plug-in-based architecture
 means that new data types or processing capabilities can be added by
 installing new plug-ins.
 
+
 %package devel
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries
-Requires:       %{name} = %{version}
 # gstreamer-utils is required for the gstreamer-provides rpm magic.
 Requires:       gstreamer-utils = %{version}
-Requires:       libgstreamer = %{version}
-%if %{with introspection}
-Requires:       typelib-Gst = %{version}
-%endif
+Requires:       %{name} = %{version}
 
 %description devel
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
+
 %lang_package
 
+
 %prep
 %setup -q -n gstreamer-%{version}
 %setup -q -T -D -a 100
-cp %{SOURCE1001} .
+
 
 %build
 # FIXME: GTKDOC_CFLAGS, GST_OBJ_CFLAGS:
@@ -114,6 +77,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
        --disable-static
 make %{?_smp_mflags}
 
+
 %install
 %make_install
 mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
@@ -124,14 +88,14 @@ rm -rf %{buildroot}%{_datadir}/gtk-doc
 rm -rf %{buildroot}%{_docdir}/%{name}/manual
 rm -rf %{buildroot}%{_docdir}/%{name}/pwg
 mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
-%__install -m644 -D %{S:1} %{buildroot}%{_libexecdir}/rpm/fileattrs/gstreamer.attr
-%__install -m755 -D %{S:2} %{buildroot}%{_libexecdir}/rpm/gstreamer-provides
 %fdupes %{buildroot}
 
 
-%post -n libgstreamer -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
 
-%postun -n libgstreamer -p /sbin/ldconfig
 
 %files
 %manifest %{name}.manifest
@@ -143,23 +107,13 @@ mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
 %{_libdir}/gstreamer-%{gst_branch}/*.so
 %dir %{_libexecdir}/gstreamer-%{gst_branch}
 %{_libexecdir}/gstreamer-%{gst_branch}/gst-plugin-scanner
-
-%files -n libgstreamer
-%manifest %{name}.manifest
-%defattr(-, root, root)
 %{_libdir}/*.so.*
-
-
-%if %{with introspection}
-%files -n typelib-Gst
-%manifest %{name}.manifest
-%defattr(-, root, root)
 %{_libdir}/girepository-1.0/Gst-1.0.typelib
 %{_libdir}/girepository-1.0/GstBase-1.0.typelib
 %{_libdir}/girepository-1.0/GstCheck-1.0.typelib
 %{_libdir}/girepository-1.0/GstController-1.0.typelib
 %{_libdir}/girepository-1.0/GstNet-1.0.typelib
-%endif
+
 
 %files utils
 %manifest %{name}.manifest
@@ -167,6 +121,7 @@ mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
 %{_bindir}/*-%{gst_branch}
 %doc %{_mandir}/man?/*-%{gst_branch}.*
 
+
 %files devel
 %manifest %{name}.manifest
 %defattr(-, root, root)
@@ -174,10 +129,6 @@ mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%{_libexecdir}/rpm/gstreamer-provides
-%{_libexecdir}/rpm/fileattrs/gstreamer.attr
-%if %{with introspection}
 %{_datadir}/gir-1.0/*.gir
-%endif
 
 %changelog