- update-desktop-database (.desktop specifies MimeType)

[packages/vlc.git] / vlc.spec

diff --git a/vlc.spec b/vlc.spec
index 342a0517a3c1faa02b996362d5a2743d4e543d0c..80e82f3c0f3b16547b965c31d57bbc226ed5cf90 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -41,18 +41,19 @@
 Summary:       VLC - a multimedia player and stream server
 Summary(pl.UTF-8):     VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:          vlc
-Version:       1.1.9
-Release:       2
+Version:       1.1.11
+Release:       5
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 # use the bz2 src, its a 4mb difference
 Source0:       http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 06adb1848e6b87fbe1ced77ec0f91e4c
+# Source0-md5: a64846d6f21ea179ae8e8bfb6f9447fe
 Patch0:                %{name}-buildflags.patch
 Patch1:                %{name}-defaultfont.patch
 Patch2:                %{name}-osdmenu_path.patch
 Patch3:                %{name}-system-minizip.patch
 Patch4:                %{name}-upnp.patch
+Patch5:                %{name}-ffmpeg.patch
 URL:           http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 BuildRequires: OpenGL-devel
@@ -69,7 +70,7 @@ BuildRequires:        dbus-devel
 BuildRequires: faad2-devel >= 2.5
 BuildRequires: ffmpeg-devel >= 0.4.9-4.20080131.1
 BuildRequires: flac-devel >= 1.1.3
-BuildRequires: fluidsynth-devel
+BuildRequires: fluidsynth-devel >= 1.1.1-3
 BuildRequires: freetype-devel
 BuildRequires: fribidi-devel
 BuildRequires: game-music-emu-devel
@@ -140,6 +141,7 @@ BuildRequires:      taglib-devel
 %{?with_twolame:BuildRequires: twolame-devel}
 %{?with_udev:BuildRequires:    udev-devel >= 1:142}
 BuildRequires: vcdimager-devel
+BuildRequires: xcb-util-keysyms-devel
 BuildRequires: xorg-lib-libXpm-devel
 %{?with_mozilla:BuildRequires: xorg-lib-libXt-devel}
 BuildRequires: xosd-devel
@@ -193,6 +195,7 @@ Summary:    VLC - X11 output plugin
 Summary(pl.UTF-8):     Klient VLC - wtyczka wyjścia X11
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
+Requires:      desktop-file-utils
 Obsoletes:     vlc-gnome
 Obsoletes:     vlc-gtk
 
@@ -297,6 +300,7 @@ Wtyczka do przeglądarki internetowej Mozilla.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -307,6 +311,7 @@ cp -f /usr/share/automake/config.* .
 %configure \
        CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -I/usr/include/xulrunner/stable -I/usr/include/liveMedia" \
        --enable-shared \
+       --disable-silent-rules \
        %{!?with_static_libs:--disable-static} \
 %ifarch ppc
        --disable-altivec \
@@ -385,7 +390,7 @@ rm -rf $RPM_BUILD_ROOT
        npvlcdir=%{_browserpluginsdir} \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/vlc
 
 %if "%{_lib}" != "lib"
 install -d $RPM_BUILD_ROOT%{_prefix}/lib
@@ -393,17 +398,17 @@ ln -sf %{_libdir}/vlc $RPM_BUILD_ROOT%{_prefix}/lib
 %endif
 
 # rm -f *.{a,la}
-find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.?a$' | xargs rm -f
+find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.?a$' | xargs %{__rm}
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{pt_PT,pt}
 # unsupported:
 # ckb (Sorani Kurdish - maybe ku_IQ/ku_IR?)
 # co (Corsican)
 # tet (Tetum)
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{ckb,co,tet}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/{ach,cgg,ckb,co,ff,tet}
 
 # .ico is win32 only
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/vlc*.ico
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/vlc*.ico
 
 %find_lang %{name}
 
@@ -421,6 +426,9 @@ if [ "$1" = 0 ]; then
        %update_browser_plugins
 fi
 
+%post X11
+%update_desktop_database
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS HACKING NEWS README THANKS