modify spec to build and merge prev modification

Change-Id: I12d6ff0cd68f351dafa8abe1283a56fcb47434a1

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 1ecaff5..72f77b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,17 @@
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS=--disable-gtk-doc
 
 SUBDIRS = \
-       gst-libs gst ext docs m4 tests common pkgconfig po
+       gst-libs gst ext m4 tests common pkgconfig po
 
 # include before EXTRA_DIST for win32 assignment
 include $(top_srcdir)/common/win32.mak
-       
+
 EXTRA_DIST = \
        gst-plugins-ugly.spec depcomp \
        AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
        ChangeLog gst-plugins-ugly.doap autogen.sh \
        $(win32)
-       
+
 
 DISTCLEANFILES = _stdint.h
 

diff --git a/packaging/common.tar.bz2 b/packaging/common.tar.bz2
deleted file mode 100644 (file)
index ba0ec7a..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..8789ff0
Binary files /dev/null and b/packaging/common.tar.gz differ

diff --git a/packaging/gst-plugins-ugly.spec b/packaging/gst-plugins-ugly.spec
index 288dd3c..ec6a5d5 100644 (file)
--- a/packaging/gst-plugins-ugly.spec
+++ b/packaging/gst-plugins-ugly.spec
@@ -1,11 +1,12 @@
 Name:       gst-plugins-ugly
 Summary:    GStreamer plugins from the "ugly" set
-Version:    1.4.1
-Release:    2
+Version:    1.6.1
+Release:    1
 Group:      Multimedia/Framework
 License:    LGPL-2.0+
-Source0:    %{name}-%{version}.tar.gz
-Source100:      common.tar.bz2
+Source:     http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{version}.tar.xz
+Source100:  common.tar.gz
+
 BuildRequires:  gettext-tools
 BuildRequires:  which
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
@@ -25,10 +26,8 @@ BuildRequires:  pkgconfig(opencore-amrwb)
  This packages contains plugins from the "ugly" set, a set of
  good-quality plug-ins that might pose distribution problems.
 
-
-
 %prep
-%setup -q
+%setup -q -n gst-plugins-ugly-%{version}
 %setup -q -T -D -a 100
 
 %build
@@ -54,8 +53,9 @@ NOCONFIGURE=1 ./autogen.sh
  --disable-twolame\
  --disable-realmedia\
  --disable-xingmux\
- --disable-x264
-
+ --disable-x264\
+ --disable-gtk-doc\
+ --disable-gtk-doc-html
 make %{?jobs:-j%jobs}
 
 %install
@@ -63,10 +63,10 @@ make %{?jobs:-j%jobs}
 
 %files
 %manifest %{name}.manifest
-%defattr(-,root,root,-)
 %license COPYING
 %{_libdir}/gstreamer-1.0/libgstasf.so
 %{_libdir}/gstreamer-1.0/libgstamrnb.so
 %{_libdir}/gstreamer-1.0/libgstamrwbdec.so
 %exclude %{_datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs
 
+