From 053882e133ed4f98695ddf95e2f9858f27089aa0 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Sat, 28 Aug 2010 14:29:54 +0000
Subject: [PATCH] - Update to 1.1.4 - Fix libnotify build on f14 - Obsoletes
 ffmpeg4vlc - Raise selinux requirements that fix rhbz#591854

---
 .gitignore                            |  2 +-
 0001-Libnotify-depends-on-a-gtk.patch | 27 +++++++++++++++++++++++++++
 sources                               |  2 +-
 vlc.spec                              | 17 ++++++++++++++++-
 4 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 0001-Libnotify-depends-on-a-gtk.patch

diff --git a/.gitignore b/.gitignore
index fe8818b..f0816fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-vlc-1.1.3.tar.bz2
+vlc-1.1.4.tar.bz2
diff --git a/0001-Libnotify-depends-on-a-gtk.patch b/0001-Libnotify-depends-on-a-gtk.patch
new file mode 100644
index 0000000..66e378f
--- /dev/null
+++ b/0001-Libnotify-depends-on-a-gtk.patch
@@ -0,0 +1,27 @@
+From 967294c285981da403d3c3cd9c7d5616a6f96288 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dominique@leuenberger.net>
+Date: Fri, 27 Aug 2010 22:30:00 +0200
+Subject: [PATCH] Libnotify depends on *a* GTK version (can be gtk-2.0 or gtk-3.0).
+
+As both are possible, libnotify can not drag the dependency in automatically, and as such
+the applications being built have to decide upon it. At this time, gtk-2.0 is the logical choice.
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7650ade..a60e4c5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1691,7 +1691,7 @@ AS_IF([test "${enable_growl}" != "no"], [
+ dnl
+ dnl Libnotify notification plugin
+ dnl
+-PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto])
++PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-2.0], [libnotify notification], [auto])
+ 
+ dnl
+ dnl Taglibplugin
+-- 
+1.7.1
+
diff --git a/sources b/sources
index bacec43..806ec3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8ba8b6687d19dadcf3eb148ca525603  vlc-1.1.3.tar.bz2
+b71aacaa242f8050a64c6ffe09d6f067  vlc-1.1.4.tar.bz2
diff --git a/vlc.spec b/vlc.spec
index a3dc505..2896217 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -20,7 +20,7 @@
 
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
-Version:	1.1.3
+Version:	1.1.4
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -31,6 +31,7 @@ Source2:	http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
 %endif
 Source10:	vlc-handlers.schemas
 Patch0:		vlc-1.1.0-vlc-cache-gen_noerror.patch
+Patch1:		0001-Libnotify-depends-on-a-gtk.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -193,6 +194,13 @@ web browsers.
 %package core
 Summary:	VLC media player core
 Group:		Applications/Multimedia
+%if 0%{?fedora} >= 13
+Conflicts:	selinux-policy-targeted < 3.7.19-51
+%endif
+Provides:	ffmpeg4vlc-libs = 0.6-0.5
+Provides:	ffmpeg4vlc-devel = 0.6-0.5
+Obsoletes:	ffmpeg4vlc-libs < 0.6-0.5
+Obsoletes:	ffmpeg4vlc-devel < 0.6-0.5
 
 %description core
 VLC media player core components
@@ -220,6 +228,7 @@ JACK audio plugin for the VLC media player.
 %setup -q -D -T -a 2 -n %{name}-%{version}%{?vlc_rc}
 %endif
 %patch0 -p1 -b .noerror
+%patch1 -p1 -b .gtk23
 
 rm modules/access/videodev2.h
 ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
@@ -511,6 +520,12 @@ fi || :
 
 
 %changelog
+* Sat Aug 28 2010 Nicolas Chauvet <kwizart@gmail.com> - 1.1.4-1
+- Update to 1.1.4
+- Fix libnotify build on f14
+- Obsoletes ffmpeg4vlc
+- Raise selinux requirements that fix rhbz#591854
+
 * Sat Aug 21 2010 Nicolas Chauvet <kwizart@gmail.com> - 1.1.3-1
 - Update to 1.1.3
 - move some plugin from core to main