rpms/vlc/F-13 vlc.spec,1.82,1.83

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32484

Modified Files:
	vlc.spec 
Log Message:
- Adds support for vlc-cache-gen
- Drop support for vlc-handlers.schemas
  (will be handled in .desktop file)



Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/vlc.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- vlc.spec	28 Aug 2010 14:29:54 -0000	1.82
+++ vlc.spec	5 Sep 2010 10:50:07 -0000	1.83
@@ -21,7 +21,7 @@
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
 Version:	1.1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org
@@ -29,7 +29,6 @@
 %if 0%{?live555_date:1}
 Source2:	http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
 %endif
-Source10:	vlc-handlers.schemas
 Patch0:		vlc-1.1.0-vlc-cache-gen_noerror.patch
 Patch1:		0001-Libnotify-depends-on-a-gtk.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -354,10 +353,6 @@
 #Fix unowned directories
 rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
 
-#Fix CGonf2 url-handler support
-#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
-install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vlc/utils/
-
 
 %find_lang %{name}
 
@@ -366,22 +361,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%pre
-if [ "$1" -gt 1 ] ; then
-if [ -x %{_bindir}/gconftool-2 ] ; then
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule \
-  %{_datadir}/vlc/utils/vlc-handlers.schemas  >/dev/null
-fi
-fi || :
-
-
 %post
-if [ -x %{_bindir}/gconftool-2 ] ; then
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_datadir}/vlc/utils/vlc-handlers.schemas >/dev/null
-fi
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
@@ -390,15 +370,6 @@
 
 %post core -p /sbin/ldconfig
 
-%preun
-if [ "$1" -eq 0 ]; then
-if [ -x %{_bindir}/gconftool-2 ] ; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-        %{_datadir}/vlc/utils/vlc-handlers.schemas >& /dev/null
-fi
-fi || :
-
 %postun
 %{_bindir}/update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor
@@ -408,6 +379,34 @@
 
 %postun core -p /sbin/ldconfig
 
+%posttrans core
+%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+
+%post nox
+if [ $1 == 1 ] ; then
+  %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%post plugin-jack
+if [ $1 == 1 ] ; then
+  %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%postun nox
+if [ $1 == 0 ] ; then
+  %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%postun plugin-jack
+if [ $1 == 0 ] ; then
+  %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%preun core
+if [ $1 == 0 ] ; then
+  rm -rf %{_libdir}/vlc/plugins-*-*.dat
+fi || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -520,6 +519,11 @@
 
 
 %changelog
+* Sun Sep 05 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.4-2
+- Adds support for vlc-cache-gen
+- Drop support for vlc-handlers.schemas
+  (will be handled in .desktop file)
+
 * Sat Aug 28 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.4-1
 - Update to 1.1.4
 - Fix libnotify build on f14