[vlc-devel] [patch] vlc.spec -- 0.4 branch

Yves Duret yves at zarb.org
Mon Nov 25 12:20:47 CET 2002 

In order to fix build on recent Mandrake Cooker, few
enhacements/typo/fix and 0.4.6 release.
vlc.spec for 0.5 branch will follow ... asap :)
And please correct my entry in AUTHORS:
E: yves at zarb.org
S: Strasbourg, France
thx.
-- 
Yves Duret
yves at zarb.org
-------------- next part --------------
Index: vlc.spec
===================================================================
RCS file: /var/cvs/videolan/vlc/vlc.spec,v
retrieving revision 1.53.2.8
diff -u -r1.53.2.8 vlc.spec
--- vlc.spec	11 Oct 2002 23:44:01 -0000	1.53.2.8
+++ vlc.spec	25 Nov 2002 11:03:49 -0000
@@ -1,7 +1,5 @@
-
-
 %define name 		vlc
-%define vlc_ver 	0.4.5
+%define vlc_ver 	0.4.6
 %define version		%vlc_ver
 
 %define cvs     	0
@@ -20,7 +18,7 @@
 Name:		%{name}
 Version:	%{version}
 Release:	%{release}
-Packager:	Yves Duret <yduret at mandrakesoft.com>
+Packager:	Yves Duret <yves at zarb.org>
 
 %if %{cvs} 
 Source0:	http://www.videolan.org/pub/videolan/vlc/snapshots/%{cvs_name}.tar.bz2
@@ -36,7 +34,9 @@
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Buildrequires:	libncurses5-devel
+%if %{plugin_qt}
 Buildrequires:	libqt2-devel
+%endif
 Buildrequires:	libgtk+1.2-devel
 Buildrequires:	gnome-libs-devel
 Buildrequires:	db1-devel
@@ -212,19 +212,21 @@
 
 %build
 # yves 0.4.0-1mdk
-# ffmpeg: static linking cause no official ffmpeg release aith a stable ABI
+# ffmpeg: static linking cause no official ffmpeg release with a stable ABI
 # ffmpeg: no plugin posible on ia64 due to the static linking (can not put .a in a .so)
 %configure  --enable-release \
             --enable-dvd --without-dvdcss \
             --enable-gtk --enable-gnome --disable-qt --disable-kde --enable-ncurses --enable-lirc \
             --enable-x11 --enable-xvideo --enable-ggi --enable-sdl --enable-fb --enable-mga --enable-aa \
             --enable-esd --enable-alsa --enable-arts \
-	    --enable-mad --enable-ffmpeg --with-ffmpeg=/usr
+	    --enable-mad --enable-ffmpeg
+	    #--with-ffmpeg=/usr
 export QTDIR=%{_libdir}/qt2 
 %make
 
 %install
 %makeinstall_std
+%find_lang %name
 install -d %buildroot/%_mandir/man1
 install doc/vlc.1 %buildroot/%_mandir/man1
 
@@ -239,9 +241,11 @@
 cat > %buildroot/%{_menudir}/vlc-gnome << EOF
 ?package(vlc-gnome): command="%{_bindir}/gnome-vlc" needs="X11" longtitle="VideoLAN is a free multimedia software solution" section="Multimedia/Video" title="Gnome VideoLAN Client" icon="gnome-vlc.png" hints="Video"
 EOF
+%if %{plugin_qt}
 cat > %buildroot/%{_menudir}/vlc-qt << EOF
-?package(vlc-gnome): command="%{_bindir}/qvlc" needs="X11" longtitle="VideoLAN is a free multimedia software solution" section="Multimedia/Video" title="Qt VideoLAN Client" icon="qvlc.png" hints="Video"
+?package(vlc-qt): command="%{_bindir}/qvlc" needs="X11" longtitle="VideoLAN is a free multimedia software solution" section="Multimedia/Video" title="Qt VideoLAN Client" icon="qvlc.png" hints="Video"
 EOF
+%endif
 
 # icons
 mkdir -p %{buildroot}/{%{_miconsdir},%{_liconsdir}}
@@ -254,12 +258,22 @@
 install -m 644 %buildroot/%_datadir/videolan/gvlc16x16.png %buildroot/%{_miconsdir}/gvlc.png
 install -m 644 %buildroot/%_datadir/videolan/gvlc32x32.png %buildroot/%{_iconsdir}/gvlc.png
 install -m 644 %buildroot/%_datadir/videolan/gvlc48x48.png %buildroot/%{_liconsdir}/gvlc.png
-install -m 644 %buildroot/%_datadir/videolan/kvlc16x16.png %buildroot/%{_miconsdir}/kvlc.png
-install -m 644 %buildroot/%_datadir/videolan/kvlc32x32.png %buildroot/%{_iconsdir}/kvlc.png
-install -m 644 %buildroot/%_datadir/videolan/kvlc48x48.png %buildroot/%{_liconsdir}/kvlc.png
+# yves - 0.4.6 - not used for the moment
+#install -m 644 %buildroot/%_datadir/videolan/kvlc16x16.png %buildroot/%{_miconsdir}/kvlc.png
+#install -m 644 %buildroot/%_datadir/videolan/kvlc32x32.png %buildroot/%{_iconsdir}/kvlc.png
+#install -m 644 %buildroot/%_datadir/videolan/kvlc48x48.png %buildroot/%{_liconsdir}/kvlc.png
+%if %{plugin_qt}
 install -m 644 %buildroot/%_datadir/videolan/qvlc16x16.png %buildroot/%{_miconsdir}/qvlc.png
 install -m 644 %buildroot/%_datadir/videolan/qvlc32x32.png %buildroot/%{_iconsdir}/qvlc.png
 install -m 644 %buildroot/%_datadir/videolan/qvlc48x48.png %buildroot/%{_liconsdir}/qvlc.png
+%endif
+
+# yves - 0.4.6-1mdk
+# rpm-4.0.4-20mdk now checks for installed (but unpackaged) files
+rm -f %buildroot/%_datadir/videolan/*
+rm -f %buildroot/%{_libdir}/videolan/vlc/dvdread.so
+rm -f %buildroot/%{_libdir}/videolan/vlc/xmga.so
+
 
 %post
 %update_menus
@@ -269,7 +283,7 @@
 %clean
 rm -fr %buildroot
 
-%files
+%files -f %name.lang
 %defattr(-,root,root)
 %doc README COPYING
 %{_bindir}/vlc
@@ -280,15 +294,16 @@
 %{_libdir}/videolan/vlc/dsp.so
 %{_libdir}/videolan/vlc/dummy.so
 %{_libdir}/videolan/vlc/dvd.so
+#%{_libdir}/videolan/vlc/dvdread.so
 %{_libdir}/videolan/vlc/fb.so
 %{_libdir}/videolan/vlc/file.so
+%{_libdir}/videolan/vlc/filter_clone.so
+%{_libdir}/videolan/vlc/filter_crop.so
 %{_libdir}/videolan/vlc/filter_deinterlace.so
 %{_libdir}/videolan/vlc/filter_distort.so
 %{_libdir}/videolan/vlc/filter_invert.so
-%{_libdir}/videolan/vlc/filter_transform.so
+%{_libdir}/videolan/vlc/filter_transform.so 
 %{_libdir}/videolan/vlc/filter_wall.so
-%{_libdir}/videolan/vlc/filter_clone.so
-%{_libdir}/videolan/vlc/filter_crop.so
 %{_libdir}/videolan/vlc/fx_scope.so
 %{_libdir}/videolan/vlc/http.so
 %{_libdir}/videolan/vlc/ipv4.so
@@ -297,17 +312,19 @@
 %{_libdir}/videolan/vlc/lpcm_adec.so
 %{_libdir}/videolan/vlc/memcpy.so
 %{_libdir}/videolan/vlc/mga.so
+%{_libdir}/videolan/vlc/mpeg_audio.so
 %{_libdir}/videolan/vlc/mpeg_es.so
 %{_libdir}/videolan/vlc/mpeg_ps.so
 %{_libdir}/videolan/vlc/mpeg_ts.so
 %{_libdir}/videolan/vlc/null.so
 %{_libdir}/videolan/vlc/rc.so
+%{_libdir}/videolan/vlc/rtp.so
 %{_libdir}/videolan/vlc/spudec.so
 %{_libdir}/videolan/vlc/udp.so
 %{_libdir}/videolan/vlc/vcd.so
 %{_libdir}/videolan/vlc/x11.so
 #%{_libdir}/videolan/vlc/xmga.so
-
+	    
 %{_mandir}/man1/*
 %{_menudir}/vlc
 %{_miconsdir}/vlc.png
@@ -411,20 +428,28 @@
 %{_libdir}/videolan/vlc/alsa.so
 
 %changelog
-* Fri Oct 11 2002 Yves Duret <yduret at mandrakesoft.com> 0.4.5-1mdk
-- new upstream release
-
-* Sun Aug 11 2002 Yves Duret <yduret at mandrakesoft.com> 0.4.4-1mdk
-- new upstream release
-
-* Fri Jul 26 2002 Yves Duret <yduret at mandrakesoft.com> 0.4.3-1mdk
-- new upstream release
-
-* Sun Jul 7 2002 Yves Duret <yduret at mandrakesoft.com> 0.4.2-1mdk
-- new upstream release
-
-* Mon Jun 3 2002 Yves Duret <yduret at mandrakesoft.com> 0.4.1-1mdk
-- new upstream release
+* Mon Nov 25 2002 Yves Duret <yves at zarb.org> 0.4.6-1mdk
+- new upstream release: 0.4.6.
+- add forgotten .mo files.
+- add rtp, mpeg_audio plugins.
+
+* Mon Oct 28 2002 Yves Duret <yves at zarb.org> 0.4.5-1mdk
+- bump to last upstream version 0.4.5 for a few hours.
+
+* Thu Aug 08 2002 Yves Duret <yduret at mandrakesoft.com> 0.4.3-1mdk
+- new upstream version: 0.4.3.
+
+* Thu Jul 11 2002 Lenny Cartier <lenny at mandrakesoft.com> 0.4.2-2mdk
+- forgot to bzip patch
+
+* Thu Jul 11 2002 Lenny Cartier <lenny at mandrakesoft.com> 0.4.2-1mdk
+- 0.4.2
+- patch0: fix ffmpeg.c
+
+* Tue Jun 04 2002 Yves Duret <yduret at mandrakesoft.com> 0.4.1-1mdk
+- new upstream version 0.4.1.
+- added 2 new filters: clone and crop.
+- the libqt2 buildrequires is now in a condif.
 
 * Thu May 23 2002 Yves Duret <yduret at mandrakesoft.com> 0.4.0-1mdk
 - version 0.4.0 with MPEG4 (DivX) support thx ffmpeg.

More information about the vlc-devel mailing list