updated self-build-vlc

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2226 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/self-build-vlc/self-build-vlc-vl.spec

@@ -1,6 +1,6 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 1.1.4
+%define version 1.1.5
 %define release 1%{?_dist_release}
 
 %if %{?_dist_release} == "vl4"
@@ -29,8 +29,10 @@ Obsoletes:	vlc-devel < 1.1.0
 
 Source0:	%{pkgname}-vl.spec
 
-Source10:       vlc-handlers.schemas
 Source100:      vlc-1.1.0-vlc-cache-gen_noerror.patch
+Source101:	0001-Libnotify-depends-on-a-gtk.patch
+Source103:	vlc-1.1.4-hardode_font_patch.patch
+Source104:	vlc-1.1.4-tls_path.patch
 
 License:	GPLv2+
 Group:		Restricted Software
@@ -217,10 +219,9 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %{__install} -m 644 \
-    %{SOURCE100} \
+    %{SOURCE100} %{SOURCE101} %{SOURCE103} %{SOURCE104} \
     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 
@@ -228,7 +229,7 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 1195000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 1216000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -238,6 +239,9 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 
 
 %changelog
+* Sun Nov 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.5-1
+- new upstream release
+
 * Mon Aug 30 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.4-1
 - new upstream release
 

nonfree/self-build-vlc/vlc-vl.spec

@@ -14,7 +14,7 @@
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	1.1.4
+Version:	1.1.5
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -23,9 +23,10 @@ Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}
 # %if %with_internal_live555
 # 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:          vlc-1.1.0-bugfix-dlopen.patch
+Patch1:		0001-Libnotify-depends-on-a-gtk.patch
+Patch3:		vlc-1.1.4-hardode_font_patch.patch
+Patch4:		vlc-1.1.4-tls_path.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -289,9 +290,11 @@ VLC plugins for libdc1394
 %endif
 	--enable-dvdread --enable-dvdnav \
 	%{?_with_opencv:--enable-opencv} \
+	--enable-sftp				\
 	--enable-v4l				\
 	--enable-pvr				\
 	--enable-gnomevfs			\
+    %{?_with_vcdimager--enable-vcdx} \
 	--enable-cddax				\
 	--enable-wma-fixed			\
 	--enable-shine				\
@@ -362,7 +365,7 @@ desktop-file-install --vendor vine			\
 	--mode 644					\
 	$RPM_BUILD_ROOT%{_datadir}/applications/vlc.desktop
 
-# Remove installed fonts for skin2 - needs
+# Remove installed fonts for skin2
 %__rm -rf $RPM_BUILD_ROOT%{_datadir}/vlc/skin2/fonts/*.ttf
 %__ln_s -f ../../../fonts/dejavu/DejaVuSans.ttf \
   $RPM_BUILD_ROOT%{_datadir}/vlc/skins2/fonts/FreeSans.ttf
@@ -372,8 +375,6 @@ desktop-file-install --vendor vine			\
 #Fix unowned directories
 %__rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
 
-#Fix CGonf2 url-handler support
-%__install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vlc/utils/
 
 %find_lang %{name}
 
@@ -381,42 +382,18 @@ desktop-file-install --vendor vine			\
 %clean
 %__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
 fi 
-%{_bindir}/update-desktop-database %{_datadir}/applications || :
+%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 /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
+%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
@@ -425,6 +402,18 @@ fi || :
 /sbin/ldconfig
 
 
+%posttrans
+[ -f /var/lib/dbus/machine-id ] || \
+    %{_bindir}/dbus-uuidgen > /var/lib/dbus/machine-id
+%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null || :
+
+%preun
+if [ $1 == 0 ] ; then
+  %__rm -rf %{_libdir}/vlc/plugins-*-*.dat
+fi || :
+
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS
@@ -461,6 +450,9 @@ fi || :
 
 
 %changelog
+* Sun Nov 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.5-1
+- new upstream release
+
 * Mon Aug 30 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.4-1
 - new upstream release