Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19895/devel Modified Files: .cvsignore sources vlc.spec Added Files: 0001-Libnotify-depends-on-a-gtk.patch Log Message: - Update to 1.1.4 - Fix libnotify build on f14 - Obsoletes ffmpeg4vlc - Raise selinux requirements that fix rhbz#591854 0001-Libnotify-depends-on-a-gtk.patch: configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE 0001-Libnotify-depends-on-a-gtk.patch --- From: Dominique Leuenberger <dominique(a)leuenberger.net&gt; 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 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 20 Aug 2010 22:30:24 -0000 1.31 +++ .cvsignore 28 Aug 2010 14:29:55 -0000 1.32 @@ -1 +1 @@ -vlc-1.1.3.tar.bz2 +vlc-1.1.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 20 Aug 2010 22:30:24 -0000 1.37 +++ sources 28 Aug 2010 14:29:56 -0000 1.38 @@ -1 +1 @@ -b8ba8b6687d19dadcf3eb148ca525603 vlc-1.1.3.tar.bz2 +b71aacaa242f8050a64c6ffe09d6f067 vlc-1.1.4.tar.bz2 Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- vlc.spec 20 Aug 2010 22:35:13 -0000 1.91 +++ vlc.spec 28 Aug 2010 14:29:56 -0000 1.92 @@ -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 @@ %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 @@ %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 @@ %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 @@ %changelog +* Sat Aug 28 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 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(a)gmail.com&gt; - 1.1.3-1 - Update to 1.1.3 - move some plugin from core to main