Author: kwizart
Update of /cvs/free/rpms/vlc/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23246/F-15
Modified Files:
vlc.spec
Log Message:
Disable obsoletes mozilla-vlc
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-15/vlc.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- vlc.spec 22 Dec 2011 19:56:57 -0000 1.131
+++ vlc.spec 1 Jan 2012 19:39:49 -0000 1.132
@@ -1,7 +1,7 @@
#global live555_date 2009.07.28
#global vlc_rc -rc3
%global vlc_bootstrap 1
-%global tarball_version 1.1.13
+%global tarball_version 1.1.13
%global _with_workaround_circle_deps 1
%global _with_freeworld 1
%if 0%{?_with_freeworld:1}
@@ -30,7 +30,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 1.1.13
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL:
http://www.videolan.org
@@ -155,7 +155,6 @@
%{!?_without_mozilla:BuildRequires: gecko-devel nspr-devel}
-%{?_without_mozilla:Obsoletes: mozilla-vlc < %{version}-%{release}}
%{?_with_workaround_circle_deps:BuildRequires: phonon-backend-gstreamer}
@@ -565,6 +564,9 @@
%changelog
+* Sun Jan 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.13-3
+- Don't obsoletes mozilla-vlc (now handled by npapi-vlc).
+
* Thu Dec 22 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.13-2
- Disable mozilla-vlc (moving to npapi-vlc).