packages (DEVEL): avidemux/avidemux.spec - add ui based .desktop file - fix...

[glen]

Author: glen                         Date: Thu Dec 17 17:41:20 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- add ui based .desktop file
- fix qt4 packaging

---- Files affected:
packages/avidemux:
   avidemux.spec (1.71.2.12 -> 1.71.2.13) 

---- Diffs:

================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.71.2.12 packages/avidemux/avidemux.spec:1.71.2.13
--- packages/avidemux/avidemux.spec:1.71.2.12	Thu Dec 17 18:31:21 2009
+++ packages/avidemux/avidemux.spec	Thu Dec 17 18:41:14 2009
@@ -4,7 +4,6 @@
 # - the bconds don't work with cmake, all gets enabled if BR found -- needs some cmake magican to fixup the bconds
 # - use external seamonkey (cmake fix needed): Checking for SpiderMonkey -- Skipping check and using bundled version.
 # - sync or use .desktop from sources
-# - subpackages for qt4/gtk2 ui engine
 # - uses patched ffmpeg
 # - Could not find Gettext -- libintl not required for gettext support
 #
@@ -25,12 +24,13 @@
 Summary(pl.UTF-8):	Mały edytor audio/wideo dla Linuksa
 Name:		avidemux
 Version:	2.5.1
-Release:	0.10
+Release:	0.13
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 Source0:	http://dl.sourceforge.net/avidemux/%{name}_%{version}.tar.gz
 # Source0-md5:	081db3af87f1f93c7b4e5d5975e07e40
 Source1:	%{name}.desktop
+Source2:	%{name}-qt4.desktop
 Patch0:		gcc44.patch
 Patch1:		types.patch
 Patch2:		qtlocale.patch
@@ -160,7 +160,8 @@
 
 mv $RPM_BUILD_ROOT%{_bindir}/avidemux2{_cli,}
 cp -a man/avidemux.1 $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-gtk.desktop
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-qt4.desktop
 cp -a avidemux_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 %find_lang %{name}
@@ -294,11 +295,12 @@
 %lang(tr) %{_datadir}/%{name}/i18n/*_tr.qm
 %lang(zh_TW) %{_datadir}/%{name}/i18n/*_zh_TW.qm
 
-%{_desktopdir}/*.desktop
 %{_pixmapsdir}/*.png
 
 %files ui-gtk
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/avidemux2_gtk
+%{_desktopdir}/%{name}-gtk.desktop
 %attr(755,root,root) %{_libdir}/libADM_UIGtk.so
 %attr(755,root,root) %{_libdir}/libADM_render_gtk.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Gtk.so
@@ -310,6 +312,7 @@
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_contrast_gtk.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Crop_gtk.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_eq2_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_equalizer_gtk.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_hue_gtk.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mpdelogo_gtk.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mplayerResize_gtk.so
@@ -317,7 +320,9 @@
 
 %if %{with qt4}
 %files ui-qt4
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/avidemux2_qt4
+%{_desktopdir}/%{name}-qt4.desktop
 %attr(755,root,root) %{_libdir}/libADM_UIQT4.so
 %attr(755,root,root) %{_libdir}/libADM_render_qt4.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Qt.so
@@ -329,7 +334,6 @@
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_contrast_qt4.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_crop_qt4.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_eq2_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_equalizer_gtk.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_equalizer_qt4.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_hue_qt4.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mpdelogo_qt4.so
@@ -343,6 +347,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71.2.13  2009/12/17 17:41:14  glen
+- add ui based .desktop file
+- fix qt4 packaging
+
 Revision 1.71.2.12  2009/12/17 17:31:21  glen
 - ui-gtk/ui-qt4 packages
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/avidemux.spec?r1=1.71.2.12&r2=1.71.2.13&f=u