rpms/vlc/F-14 .cvsignore, 1.34, 1.35 sources, 1.40, 1.41 vlc.spec, 1.103, 1.104
Author: kwizart
Update of /cvs/free/rpms/vlc/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26463
Modified Files:
.cvsignore sources vlc.spec
Log Message:
Update to 1.1.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-14/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore 28 Jan 2011 09:44:35 -0000 1.34
+++ .cvsignore 2 Feb 2011 17:23:53 -0000 1.35
@@ -1 +1 @@
-vlc-1.1.6.tar.bz2
+vlc-1.1.7.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-14/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources 28 Jan 2011 09:44:35 -0000 1.40
+++ sources 2 Feb 2011 17:23:53 -0000 1.41
@@ -1 +1 @@
-c47f3ebc886f2aff8c95b98c564d1759 vlc-1.1.6.tar.bz2
+932ce1fa4afa54b56ac0ccc0655667b6 vlc-1.1.7.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-14/vlc.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- vlc.spec 28 Jan 2011 09:44:35 -0000 1.103
+++ vlc.spec 2 Feb 2011 17:23:53 -0000 1.104
@@ -25,8 +25,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 1.1.6
-Release: 2%{?dist}
+Version: 1.1.7
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -35,11 +35,8 @@
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
%endif
Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
-Patch1: 0001-Libnotify-depends-on-a-gtk.patch
Patch3: vlc-1.1.6-hardode_font_patch.patch
Patch4: vlc-1.1.4-tls_path.patch
-Patch5: vlc-backport-lirc_fix.patch
-Patch6: vlc-backport-signal_fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -215,6 +212,8 @@
Provides: ffmpeg4vlc-devel = 0.6-0.5
Obsoletes: ffmpeg4vlc-libs < 0.6-0.5
Obsoletes: ffmpeg4vlc-devel < 0.6-0.5
+Provides: vlc-nox = %{version}-%{release}
+Obsoletes: vlc-nox < 1.1.5-2
%{?live555date:Requires: live555date%{_isa} = %{live555date}}
%description core
@@ -224,8 +223,7 @@
Summary: VLC media player with extras modules
Group: Applications/Multimedia
Requires: vlc-core%{_isa} = %{version}-%{release}
-Provides: vlc-nox = %{version}-%{release}
-Obsoletes: vlc-nox < 1.1.5-2
+
%description extras
VLC media player extras modules.
@@ -245,11 +243,8 @@
%setup -q -D -T -a 2 -n %{name}-%{version}%{?vlc_rc}
%endif
%patch0 -p1 -b .noerror
-%patch1 -p1 -b .gtk23
%patch3 -p1 -b .hardode_path
%patch4 -p1 -b .tls_path
-%patch5 -p1 -b .lirc_fix
-%patch6 -p1 -b .signal_fix
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
rm modules/access/videodev2.h
@@ -557,6 +552,13 @@
%changelog
+* Wed Feb 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.7-1
+- Update to 1.1.7
+
+* Sat Jan 29 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.6.1-1
+- Update to 1.1.6.1
+- Remove merged patches
+
* Mon Jan 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.6-2
- Update to 1.1.6
- backport lirc and signal fixes