packages: vlc/vlc.spec - up to 1.0.6, rtmp somewhy not built - move mozilla...

[glen]

Author: glen                         Date: Sun May 23 18:13:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.0.6, rtmp somewhy not built
- move mozilla files to browser plugin pkg, cleanup win32 ico

---- Files affected:
packages/vlc:
   vlc.spec (1.218 -> 1.219) 

---- Diffs:

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.218 packages/vlc/vlc.spec:1.219
--- packages/vlc/vlc.spec:1.218	Sun Apr 25 22:48:52 2010
+++ packages/vlc/vlc.spec	Sun May 23 20:13:08 2010
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
 # TODO
-# - use fonts-TTF-freefont as R
+# - use fonts-TTF-freefont as R (vlc-X11 package) (see also vlc-defaultfont.patch)
+#   ./modules/misc/freetype.c:#define DEFAULT_FONT "/usr/share/vlc/skins2/fonts/FreeSans.ttf"
+#   ./modules/gui/skins2/parser/builder.cpp:            string path = (*it) + sep + "fonts" + sep + "FreeSans.ttf";
 # - %{_prefix}/lib cleanup for x86_64
 #
 # Conditional build:
@@ -32,17 +34,17 @@
 %bcond_without	udev		# udev services discovery
 %bcond_without	upnp		# upnp plugin
 %bcond_without	x264		# build without x264 support
-#
+
 Summary:	VLC - a multimedia player and stream server
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:		vlc
-Version:	1.0.5
-Release:	4
+Version:	1.0.6
+Release:	0.1
 License:	GPL
 Group:		X11/Applications/Multimedia
 # use the bz2 src, its a 4mb difference
 Source0:	http://download.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	d3d99e489ba1ae996af7e1065c0ef313
+# Source0-md5:	246a3865ec037f8f5757ef6b973a80fc
 Patch0:		%{name}-buildflags.patch
 Patch1:		%{name}-defaultfont.patch
 Patch2:		%{name}-real_codecs_path.patch
@@ -110,8 +112,8 @@
 BuildRequires:	libtheora-devel
 BuildRequires:	libtool
 %{?with_upnp:BuildRequires:	libupnp-devel}
-BuildRequires:	libvorbis-devel
 BuildRequires:	libv4l-devel
+BuildRequires:	libvorbis-devel
 %{?with_x264:BuildRequires:	libx264-devel}
 BuildRequires:	libxml2-devel
 %{?with_lirc:BuildRequires:	lirc-devel}
@@ -247,6 +249,7 @@
 Group:		X11/Applications/Multimedia
 Requires:	%{name} = %{version}-%{release}
 Requires:	browser-plugins >= 2.0
+Requires:	browser-plugins >= 2.0
 Requires:	browser-plugins(%{_target_base_arch})
 
 %description -n browser-plugin-%{name}
@@ -358,7 +361,7 @@
 	npvlcdir=%{_browserpluginsdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/vlc
+rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
 
 %if "%{_lib}" != "lib"
 install -d $RPM_BUILD_ROOT%{_prefix}/lib
@@ -375,6 +378,9 @@
 # tet (Tetum)
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{ckb,co,tet}
 
+# .ico is win32 only
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/vlc*.ico
+
 %find_lang %{name}
 
 %clean
@@ -402,9 +408,9 @@
 %attr(755,root,root) %{_bindir}/vlc
 %attr(4754,root,video) %{_bindir}/vlc-wrapper
 %attr(755,root,root) %{_libdir}/libvlc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvlc.so.[0-9]
+%attr(755,root,root) %ghost %{_libdir}/libvlc.so.2
 %attr(755,root,root) %{_libdir}/libvlccore.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvlccore.so.[0-9]
+%attr(755,root,root) %ghost %{_libdir}/libvlccore.so.2
 
 %if "%{_lib}" != "lib"
 %{_prefix}/lib/vlc
@@ -733,9 +739,6 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/http
 %{_datadir}/%{name}/lua
-%if %{with mozilla}
-%{_datadir}/%{name}/mozilla
-%endif
 %{_datadir}/%{name}/osdmenu
 %dir %{_datadir}/%{name}/utils
 %attr(755,root,root) %{_datadir}/%{name}/utils/*.sh
@@ -768,7 +771,6 @@
 %{_datadir}/%{name}/skins2
 %{_datadir}/%{name}/vlc*.xpm
 %{_datadir}/%{name}/vlc*.png
-%{_datadir}/%{name}/vlc*.ico
 %{_desktopdir}/*.desktop
 
 %if %{with ggi}
@@ -796,6 +798,7 @@
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_browserpluginsdir}/libvlcplugin.so
+%{_datadir}/%{name}/mozilla
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -804,6 +807,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.219  2010/05/23 18:13:08  glen
+- up to 1.0.6, rtmp somewhy not built
+- move mozilla files to browser plugin pkg, cleanup win32 ico
+
 Revision 1.218  2010/04/25 20:48:52  arekm
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.218&r2=1.219&f=u