From 375ecde18e18654dc37ca34702ad3695f5c8f9d2 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@fedoraproject.org>
Date: Tue, 27 Oct 2009 23:08:18 +0000
Subject: [PATCH] Update to 1.1.1

---
 .cvsignore                                    |  2 +-
 ...atch => gavl-1.1.1-system_libgdither.patch | 20 +++++++++----------
 gavl.spec                                     |  7 ++++---
 import.log                                    |  1 +
 sources                                       |  2 +-
 5 files changed, 17 insertions(+), 15 deletions(-)
 rename gavl-1.1.0-system_libgdither.patch => gavl-1.1.1-system_libgdither.patch (67%)

diff --git a/.cvsignore b/.cvsignore
index 151d315..6ef485a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gavl-1.1.0.tar.gz
+gavl-1.1.1.tar.gz
diff --git a/gavl-1.1.0-system_libgdither.patch b/gavl-1.1.1-system_libgdither.patch
similarity index 67%
rename from gavl-1.1.0-system_libgdither.patch
rename to gavl-1.1.1-system_libgdither.patch
index f87a7bc..15aae44 100644
--- a/gavl-1.1.0-system_libgdither.patch
+++ b/gavl-1.1.1-system_libgdither.patch
@@ -1,7 +1,7 @@
-diff -up gavl-1.1.0/configure.ac.gdither gavl-1.1.0/configure.ac
---- gavl-1.1.0/configure.ac.gdither	2008-09-30 22:41:05.000000000 +0200
-+++ gavl-1.1.0/configure.ac	2009-03-24 01:32:40.000000000 +0100
-@@ -189,6 +189,27 @@ TOP_SRCDIR=`cd ${srcdir} && pwd` 
+diff -up gavl-1.1.1/configure.ac.gdither gavl-1.1.1/configure.ac
+--- gavl-1.1.1/configure.ac.gdither	2009-07-13 22:42:38.000000000 +0200
++++ gavl-1.1.1/configure.ac	2009-10-28 00:02:31.461428785 +0100
+@@ -217,6 +217,27 @@ TOP_SRCDIR=`cd ${srcdir} && pwd` 
  AC_SUBST(TOP_SRCDIR)
  
  dnl
@@ -29,10 +29,10 @@ diff -up gavl-1.1.0/configure.ac.gdither gavl-1.1.0/configure.ac
  dnl Output variables
  dnl
  
-diff -up gavl-1.1.0/gavl/Makefile.am.gdither gavl-1.1.0/gavl/Makefile.am
---- gavl-1.1.0/gavl/Makefile.am.gdither	2008-08-20 22:18:08.000000000 +0200
-+++ gavl-1.1.0/gavl/Makefile.am	2009-03-24 01:32:40.000000000 +0100
-@@ -39,8 +39,15 @@ threednow_libs = 
+diff -up gavl-1.1.1/gavl/Makefile.am.gdither gavl-1.1.1/gavl/Makefile.am
+--- gavl-1.1.1/gavl/Makefile.am.gdither	2009-05-13 17:10:37.000000000 +0200
++++ gavl-1.1.1/gavl/Makefile.am	2009-10-28 00:04:37.837435280 +0100
+@@ -40,8 +40,15 @@ threednow_libs = 
  threednow_subdirs =
  endif
  
@@ -49,12 +49,12 @@ diff -up gavl-1.1.0/gavl/Makefile.am.gdither gavl-1.1.0/gavl/Makefile.am
  $(sse_subdirs) \
  $(sse2_subdirs) \
  $(sse3_subdirs) \
-@@ -104,7 +111,7 @@ $(sse3_libs) \
+@@ -109,7 +116,7 @@ $(sse3_libs) \
  $(threednow_libs) \
  c/libgavl_c.la \
  hq/libgavl_hq.la \
 -libgdither/libgdither.la \
 +$(MAYBE_LIBGDITHER_LA) \
  libsamplerate/libsamplerate.la \
+ @LIBGAVL_LIBS@ \
  -lm
- 
diff --git a/gavl.spec b/gavl.spec
index 2820dc0..a83b82a 100644
--- a/gavl.spec
+++ b/gavl.spec
@@ -1,13 +1,13 @@
 Name:           gavl
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A library for handling uncompressed audio and video data
 
 Group:          System Environment/Libraries
 License:        GPLv3+
 URL:            http://gmerlin.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/gmerlin/gavl-%{version}.tar.gz
-Patch1:         gavl-1.1.0-system_libgdither.patch
+Patch1:         gavl-1.1.1-system_libgdither.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -55,6 +55,7 @@ sed -i -i 's/LQT_OPT_CFLAGS/dnl LQT_OPT_CFLAGS/g' configure.ac
 sh autogen.sh
 
 
+
 %build
 %configure \
   --enable-debug \
diff --git a/import.log b/import.log
index 6f374a0..ed495bc 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 gavl-1_1_0-1_fc10:HEAD:gavl-1.1.0-1.fc10.src.rpm:1239187747
+gavl-1_1_1-1_fc11:HEAD:gavl-1.1.1-1.fc11.src.rpm:1256684797
diff --git a/sources b/sources
index 6cef80e..ed7248e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a631a3468f4fd4213c4ec57d1795e14  gavl-1.1.0.tar.gz
+dc37718ab20ed6728eb9e10d5bb3ad17  gavl-1.1.1.tar.gz