modify spec to build and merge prev modification

Change-Id: I451dcbc3fd1a087e6a285912e54b101255f018f7

diff --git a/.gbs.conf b/.gbs.conf
index 1b88822..7302e56 100644 (file)
--- a/.gbs.conf
+++ b/.gbs.conf
@@ -1,3 +1,3 @@
 [general]
-upstream_branch = tizen
+upstream_branch = upstream/1.6
 upstream_tag = ${upstreamversion}

diff --git a/Makefile.am b/Makefile.am
index b55de2d..e0aefe4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS=
 
-COMMON_SUBDIRS = ext docs common tests
+COMMON_SUBDIRS = ext common tests
 SUBDIRS = $(LIBAV_SUBDIRS) $(COMMON_SUBDIRS) pkgconfig
 DIST_SUBDIRS = $(COMMON_SUBDIRS) gst-libs pkgconfig
 

diff --git a/packaging/common.tar.bz2 b/packaging/common.tar.bz2
deleted file mode 100644 (file)
index 005f064..0000000
Binary files a/packaging/common.tar.bz2 and /dev/null differ

diff --git a/packaging/common.tar.gz b/packaging/common.tar.gz
new file mode 100644 (file)
index 0000000..25c8f79
Binary files /dev/null and b/packaging/common.tar.gz differ

diff --git a/packaging/gst-libav.spec b/packaging/gst-libav.spec
index 567535c..78461a3 100644 (file)
--- a/packaging/gst-libav.spec
+++ b/packaging/gst-libav.spec
@@ -1,12 +1,12 @@
 Name:       gst-libav
 Summary:    Libav plugin for GStreamer
-Version:    1.4.1
-Release:    4
+Version:    1.6.1
+Release:    1
 Group:      Multimedia/Framework
 License:    LGPL-2.1+
-Source0:    %{name}-%{version}.tar.gz
-Source100:  common.tar.bz2
-Source101:  libav.tar.bz2
+Source:     %{name}-%{version}.tar.gz
+Source100:  common.tar.gz
+Source101:  libav.tar.gz
 URL:        http://cgit.freedesktop.org/gstreamer/gst-libav
 BuildRequires:  gettext
 BuildRequires:  which
@@ -28,7 +28,7 @@ demuxing 30+ formats and colorspace conversion.
 
 
 %prep
-%setup -q
+%setup -q -n gst-libav-%{version}
 %setup -q -T -D -a 100
 %setup -q -T -D -a 101
 
@@ -55,3 +55,4 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/gstreamer-1.0/libgstlibav.so
 
+

diff --git a/packaging/libav.tar.bz2 b/packaging/libav.tar.bz2
deleted file mode 100644 (file)
index 9c72783..0000000
Binary files a/packaging/libav.tar.bz2 and /dev/null differ

diff --git a/packaging/libav.tar.gz b/packaging/libav.tar.gz
new file mode 100644 (file)
index 0000000..d87b0b1
Binary files /dev/null and b/packaging/libav.tar.gz differ