From 6b27e204bd9d5c24df384d6b8ffedcededb6a5ba Mon Sep 17 00:00:00 2001
From: kwizart <kwizart@liet.kwizart.net>
Date: Fri, 26 Nov 2010 15:16:26 +0100
Subject: [PATCH] Update to 1.2.1

---
 .gitignore                         |  1 +
 frei0r-plugins-1.1.21-libdir.patch | 24 ------------------------
 frei0r-plugins.spec                | 19 ++++++++++++-------
 sources                            |  2 +-
 4 files changed, 14 insertions(+), 32 deletions(-)
 delete mode 100644 frei0r-plugins-1.1.21-libdir.patch

diff --git a/.gitignore b/.gitignore
index 3d7a6fa..46229fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 frei0r-plugins-1.1.22.tar.gz
+/frei0r-plugins-1.2.1.tar.gz
diff --git a/frei0r-plugins-1.1.21-libdir.patch b/frei0r-plugins-1.1.21-libdir.patch
deleted file mode 100644
index 70d2032..0000000
--- a/frei0r-plugins-1.1.21-libdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up frei0r-plugins-1.1.21/src/Makefile.am.libdir frei0r-plugins-1.1.21/src/Makefile.am
---- frei0r-plugins-1.1.21/src/Makefile.am.libdir	2008-06-07 15:21:48.000000000 +0200
-+++ frei0r-plugins-1.1.21/src/Makefile.am	2008-06-07 15:23:30.000000000 +0200
-@@ -112,7 +112,7 @@ AM_CPPFLAGS = -I@top_srcdir@/include 
- AM_CFLAGS = -I@top_srcdir@/include 
- AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
- 
--plugindir = @prefix@/lib/frei0r-1
-+plugindir = @libdir@/frei0r-1
- 
- 
- install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-diff -up frei0r-plugins-1.1.21/src/Makefile.in.libdir frei0r-plugins-1.1.21/src/Makefile.in
---- frei0r-plugins-1.1.21/src/Makefile.in.libdir	2008-06-07 15:21:44.000000000 +0200
-+++ frei0r-plugins-1.1.21/src/Makefile.in	2008-06-07 15:23:08.000000000 +0200
-@@ -583,7 +583,7 @@ RGB_la_SOURCES = mixer3/RGB/RGB.c
- AM_CPPFLAGS = -I@top_srcdir@/include 
- AM_CFLAGS = -I@top_srcdir@/include 
- AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
--plugindir = @prefix@/lib/frei0r-1
-+plugindir = @libdir@/frei0r-1
- all: all-am
- 
- .SUFFIXES:
diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec
index 66f9918..2f6f597 100644
--- a/frei0r-plugins.spec
+++ b/frei0r-plugins.spec
@@ -1,13 +1,12 @@
 Name:           frei0r-plugins
-Version:        1.1.22
-Release:        5%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        Frei0r - a minimalistic plugin API for video effects
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.piksel.org/frei0r
 Source0:        http://propirate.net/frei0r/frei0r-plugins-%{version}.tar.gz
-Patch0:         frei0r-plugins-1.1.21-libdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gavl-devel >= 0.2.3
@@ -30,9 +29,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%if %{_lib} == lib64
-%patch0 -p1 -b .libdir
-%endif
+
 
 %build
 %configure --disable-static
@@ -43,6 +40,10 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
+#Remove installed doc
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,14 +51,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README TODO
 %{_libdir}/frei0r-1/*.so
 
 %files -n frei0r-devel
 %defattr(-,root,root,-)
 %{_includedir}/frei0r.h
+%{_libdir}/pkgconfig/frei0r.pc
 
 %changelog
+* Fri Nov 26 2010 Nicolas Chauvet <kwizart@gmail.com> - 1.2.1-1
+- Update to 1.2.1
+
 * Sat Jun 26 2010 Nicolas Chauvet <kwizart@gmail.com> - 1.1.22-5
 - Rebuilt for opencv
 
diff --git a/sources b/sources
index a3523e5..d5b2dc4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8123893c67fc5ce01ddcb09853d47ed4  frei0r-plugins-1.1.22.tar.gz
+e46089c27cdf1deb5e27e24520791ddb  frei0r-plugins-1.2.1.tar.gz