X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc.spec;h=e3e108344ee14eb65816aaa49db08db6b98084b6;hb=ea0d4fc4cc68522b35dc7bfcaccfe89368c82efe;hp=4476f7412c1f63b8475c9f4ed75ec6368ccb25d7;hpb=50476b831ac673b0caa9901a7bde6a31435c1317;p=vlc

diff --git a/vlc.spec b/vlc.spec
index 4476f7412c..e3e108344e 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -3,7 +3,7 @@
 Summary: The VideoLAN client, also a very good standalone video player.
 Name: vlc
 Version: 0.7.0
-Release: test1
+Release: 1
 Group: Applications/Multimedia
 License: GPL
 URL: http://www.videolan.org/
@@ -39,8 +39,11 @@ Buildrequires: XFree86-devel, desktop-file-utils, libpostproc >= 1.0
 %{!?_without_mpeg2dec:BuildRequires: mpeg2dec-devel >= 0.3.2}
 %{!?_without_wxwindows:BuildRequires: wxGTK-devel >= 2.4.2}
 %{!?_without_mozilla:BuildRequires: mozilla-devel >= %{mozver}}
+%{!?_without_mozilla:BuildRequires: mozplugger >= 1.3.2}
 %{!?_without_speex:BuildRequires: speex-devel >= 1.0.3}
 %{!?_without_aa:BuildRequires: aalib >= 1.4}
+%{!?_without_mkv:BuildRequires: matroska}
+%{!?_without_fribidi:BuildRequires: fribidi-devel}
 
 Obsoletes: videolan-client
 
@@ -69,9 +72,11 @@ Requires: XFree86, desktop-file-utils
 %{?_with_ncurses:Requires: ncurses}
 %{!?_without_xosd:Requires: xosd >= 2.2.5}
 %{!?_without_lirc:Requires: lirc}
-%{!?_without_mozilla:Requires: mozilla = %{mozver}}
+%{!?_without_mozilla:Requires: mozilla >= %{mozver}}
 %{!?_without_speex:Requires: speex >= 1.0.3}
 %{!?_without_wxwindows:Requires: wxGTK >= 2.4.2}
+%{!?_without_mkv:Requires: matroska}
+%{!?_without_fribidi:Requires: fribidi}
 
 %description
 VideoLAN Client (VLC) is a highly portable multimedia player for various
@@ -81,7 +86,7 @@ well as DVDs, VCDs, and various streaming protocols.
 Available rpmbuild rebuild options :
 --without dvd dvdread dvdplay dvbpsi dv v4l avi asf aac ogg rawdv mad ffmpeg xvid
           mp4 a52 vorbis mpeg2dec flac aa esd arts alsa gtk gnome xosd lsp lirc
-          pth id3tag dv qt kde ncurses faad wxwindows
+          pth id3tag dv qt kde ncurses faad wxwindows mkv fribidi
 
 Options that would need not yet existing add-on packages :
 --with tremor tarkin theora ggi glide svgalib mga
@@ -105,10 +110,10 @@ to link statically to it.
 %setup -q -n vlc-%{version}-%{release}
 
 %build
-#cp %{_libdir}/mozilla/plugins/plugger.so %{_libdir}/mozilla-%{mozver}/plugins/plugger.so.bak -f
-#mv %{_libdir}/mozilla-%{mozver}/plugins/plugger.so.bak %{_libdir}/mozilla-%{mozver}/plugins/plugger.so -f
-#rm %{_libdir}/mozilla -fr
-#ln %{_libdir}/mozilla-%{mozver} %{_libdir}/mozilla -sf
+cp %{_libdir}/mozilla/plugins/mozplugger.so %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so.bak -f
+mv %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so.bak %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so -f
+rm %{_libdir}/mozilla -fr
+ln %{_libdir}/mozilla-%{mozver} %{_libdir}/mozilla -sf
 ln /usr/share/idl/mozilla-%{mozver} /usr/share/idl/mozilla -sf
 #ln %{_libdir}/libxvidcore.so.2 %{_libdir}/libxvidcore.so -sf
 
@@ -155,7 +160,8 @@ ln /usr/share/idl/mozilla-%{mozver} /usr/share/idl/mozilla -sf
 	%{!?_without_esd:--enable-esd} \
 	%{!?_without_arts:--enable-arts} \
 	%{?_with_alsa:--enable-alsa} \
-	--disable-waveout \
+	%{!?_without_fribidi:--enable-fribidi} \
+        --disable-waveout \
 	%{!?_without_gtk:--enable-gtk} \
 	--disable-familiar \
 	%{!?_without_gnome:--enable-gnome} \
@@ -175,7 +181,9 @@ ln /usr/share/idl/mozilla-%{mozver} /usr/share/idl/mozilla -sf
 	%{!?_without_mozilla:--enable-mozilla} \
         %{?_without_speex:--disable-speex} \
 	--disable-testsuite \
-	--enable-plugins
+	--enable-plugins \
+        %{?_without_mkv:--disable-mkv} \
+        %{!?_without_fribidi:--enable-fribidi}
 make %{?_smp_mflags}
 
 %install
@@ -206,25 +214,24 @@ desktop-file-install --vendor gnome --delete-original             \
 
 %post
 ln /dev/cdrom /dev/dvd -sf
-ln %{_libdir}/libxvidcore.so.2 %{_libdir}/libxvidcore.so -sf
 
 %postun
 rm -f /dev/dvd
 rm /usr/share/idl/mozilla -fr
-rm %{_libdir}/libxvidcore.so -f
 
 %clean
 rm -rf %{buildroot}
 rm /usr/share/idl/mozilla -fr
-#rm /usr/lib/mozilla -fr
-#mkdir /usr/lib/mozilla/plugins -p --mode=755
-#mv %{_libdir}/mozilla-%{mozver}/plugins/plugger.so %{_libdir}/mozilla/plugins -f
-#rm %{_libdir}/libxvidcore.so -f
+rm /usr/lib/mozilla -fr
+mkdir /usr/lib/mozilla/plugins -p --mode=755
+mv %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so %{_libdir}/mozilla/plugins -f
 
 %files -f vlc.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog MAINTAINERS README THANKS
-%doc doc/fortunes.txt doc/web-streaming.html
+%doc doc/fortunes.txt doc/web-streaming.html doc/intf-vcd.txt doc/vlc-howto.sgml
+%doc doc/bugreport-howto.txt
+%exclude %{_datadir}/doc/vlc/*
 %{_bindir}/*vlc
 %{_libdir}/vlc
 %{_libdir}/libvlc_pic.a
@@ -241,6 +248,14 @@ rm /usr/share/idl/mozilla -fr
 %{_libdir}/libvlc.a
 
 %changelog
+* Tue Dec 2 2003 Jason Luka
+- Added fribidi support
+- Added fribidi and mkv options to configure
+
+* Sat Nov 29 2003 Jason Luka
+- Fixed Matroska/EBML problem
+- Updated script for mozilla plugin installation
+
 * Fri Nov 28 2003 Jason Luka
 - Update to 0.7.0-test1
 - Updated version numbers on dependancies