6:23 p.m.
Author: kwizart
Update of /cvs/free/rpms/vlc/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10743
Modified Files:
vlc.spec sources
Log Message:
Update to 0.9.9-rc2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-10/vlc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vlc.spec 5 Dec 2008 01:58:29 -0000 1.16
+++ vlc.spec 6 Mar 2009 18:23:51 -0000 1.17
@@ -4,7 +4,8 @@
%define with_internal_live555 0
%define live555_date 2008.07.25
%define vlc_git 0
-%define vlc_date 20080915
+%define vlc_rc -rc2
+%define vlc_date 20090210
%define with_mozilla 1
%define with_dc1394 0
%define with_directfb 1
@@ -17,9 +18,9 @@
%define _version %{version}-git
%define release_tag 0.1.%{vlc_date}git
%else
-Version: 0.9.8a
+Version: 0.9.9
%define _version %{version}
-%define release_tag 1
+%define release_tag 0.4rc2
%endif
Release: %{release_tag}%{?dist}
License: GPLv2+
@@ -28,7 +29,7 @@
%if %vlc_git
Source0:
http://nightlies.videolan.org/build/source/trunk-%{vlc_date}-0024/vlc-sna...
%else
-Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{_version}....
+Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{_version}%...
%endif
%if %with_internal_live555
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
@@ -108,7 +109,7 @@
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libmusicbrainz-devel
-%{?_with_lua:BuildRequires: lua-devel}
+BuildRequires: lua-devel
BuildRequires: mpeg2dec-devel >= 0.3.2
BuildRequires: ncurses-devel
BuildRequires: opencv-devel
@@ -173,14 +174,14 @@
%if %with_dc1394
BuildRequires: compat-libdc1394-devel
BuildRequires: compat-libraw1394-devel
-%else
-BuildRequires: libraw1394-devel
+#else
+#BuildRequires: libraw1394-devel
%endif
Requires: vlc-core = %{version}-%{release}
%if 0%{?fedora} > 10
-Requires: dejavu-fonts-sans
+Requires: dejavu-sans-fonts
%else
Requires: dejavu-fonts
%endif
@@ -201,7 +202,6 @@
Non-default rpmbuild options:
--with dirac: Enable dirac codec support
--with kate: Enable kate codec support
---with lua: Enable lua support
%description devel
@@ -259,11 +259,13 @@
%endif
%prep
-%setup -q -n %{name}-%{_version}
+%setup -q -n %{name}-%{_version}%{?vlc_rc}
%if %with_internal_live555
-%setup -q -D -T -a 2 -n %{name}-%{_version}
+%setup -q -D -T -a 2 -n %{name}-%{_version}%{?vlc_rc}
%endif
%patch0 -p1 -b .default_font
+%if %vlc_git
+%else
%patch1 -p1 -b .pulse_default
%patch2 -p1 -b .embedded
#http://trac.videolan.org/vlc/ticket/1383
@@ -274,6 +276,7 @@
chmod -x modules/gui/qt4/qt4*
#./bootstrap
+%endif
%build
@@ -295,7 +298,7 @@
--with-tuning=no \
--enable-switcher \
--enable-shout \
- %{?_with_lua:--enable-lua --enable-lua} \
+ --enable-lua \
--enable-live555 \
%if %with_internal_live555
--with-live555-tree=live \
@@ -372,7 +375,6 @@
make %{?_smp_mflags}
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -440,12 +442,8 @@
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/vlc.png
%{_datadir}/vlc/skins2/
-%{_bindir}/cvlc
-%{_bindir}/nvlc
%{_bindir}/qvlc
-%{_bindir}/rvlc
%{_bindir}/svlc
-%{_bindir}/vlc-wrapper
%{_libdir}/vlc/gui/libqt4_plugin.so
%{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
%{_libdir}/vlc/access/libscreen_plugin.so
@@ -473,6 +471,10 @@
%files core -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/vlc
+%{_bindir}/cvlc
+%{_bindir}/nvlc
+%{_bindir}/rvlc
+%{_bindir}/vlc-wrapper
%exclude %{_datadir}/vlc/skins2
%{_datadir}/vlc/
%{_libdir}/*.so.*
@@ -507,7 +509,7 @@
%exclude %{_libdir}/vlc/access/libdc1394_plugin.so
%endif
%{_libdir}/vlc/
-%{_mandir}/man1/vlc.1*
+%{_mandir}/man1/vlc*.1*
%files nox
%defattr(-,root,root,-)
@@ -541,6 +543,10 @@
%changelog
+* Fri Mar 6 2009 kwizart < kwizart at gmail.com > - 0.9.9-0.4rc2
+- Update to 0.9.9-rc2
+- Add lua support by default
+
* Fri Dec 5 2008 kwizart < kwizart at gmail.com > - 0.9.8a-1
- Update to 0.9.8a
Security update:
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 5 Dec 2008 01:58:29 -0000 1.8
+++ sources 6 Mar 2009 18:23:51 -0000 1.9
@@ -1 +1 @@
-8ffa2ff763badd5de7592004d8d69a63 vlc-0.9.8a.tar.bz2
+d9e43e626c183052a6d44954eb366f08 vlc-0.9.9-rc2.tar.bz2