rpms/subtitlecomposer/devel subtitlecomposer.desktop, 1.4, 1.5 subtitlecomposer.spec, 1.4, 1.5

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/subtitlecomposer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17367

Modified Files:
	subtitlecomposer.desktop subtitlecomposer.spec 
Log Message:
cvs only, no build

* Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-2
- .desktop: Categories: -Video +AudioVideo
- optimize scriptlets (drop xdg-utils, shared-mime-info deps)
- own %{_kde4_appsdir}/subtitlecomposer/



Index: subtitlecomposer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/subtitlecomposer/devel/subtitlecomposer.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- subtitlecomposer.desktop	31 Mar 2009 20:25:12 -0000	1.4
+++ subtitlecomposer.desktop	24 Jul 2009 19:20:00 -0000	1.5
@@ -6,4 +6,4 @@ Exec=subtitlecomposer
 Icon=subtitlecomposer
 Terminal=false
 Type=Application
-Categories=Qt;KDE;Video;AudioVideoEditing;
+Categories=Qt;KDE;AudioVideo;AudioVideoEditing;


Index: subtitlecomposer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subtitlecomposer/devel/subtitlecomposer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- subtitlecomposer.spec	9 Jun 2009 20:07:27 -0000	1.4
+++ subtitlecomposer.spec	24 Jul 2009 19:20:00 -0000	1.5
@@ -1,6 +1,6 @@
 Name:	  	subtitlecomposer
 Version:	0.5.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A text-based subtitles editor
 
 License:	GPLv2+
@@ -18,10 +18,8 @@ BuildRequires:	kdelibs4-devel
 BuildRequires:	gettext
 BuildRequires:	giflib-devel
 BuildRequires:	pcre-devel
-Requires(post):	/sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
-Requires(post): shared-mime-info
-Requires(postun): shared-mime-info
+Requires(post):	/sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 A text-based subtitles editor
@@ -35,7 +33,7 @@ pushd %{_target_platform}
 %{cmake_kde4} .. 
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -43,6 +41,7 @@ rm -rf $RPM_BUILD_ROOT
 
 make install/fast DESTDIR=${RPM_BUILD_ROOT} -C %{_target_platform}
 
+# pixmaps is deprecated, really still needed? -- Rex
 %{__install} -p -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
 desktop-file-install --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 %{SOURCE1}
@@ -54,20 +53,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :  
+if [ $1 -eq 0 ] ; then
+  update-mime-database %{_datadir}/mime &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-mime-database %{_datadir}/mime &> /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_bindir}/subtitlecomposer
+%{_kde4_bindir}/subtitlecomposer
 %attr(644,root,root) %{_datadir}/pixmaps/subtitlecomposer.png
 %{_kde4_datadir}/applications/kde4/subtitlecomposer.desktop
-%{_datadir}/config/subtitlecomposerrc
+%{_kde4_configdir}/subtitlecomposerrc
 %{_kde4_iconsdir}/hicolor/128x128/apps/subtitlecomposer.png
 %{_kde4_iconsdir}/hicolor/128x128/actions/*                                                                  
 %{_kde4_iconsdir}/hicolor/16x16/actions/*                                                                  
@@ -76,11 +82,15 @@ update-mime-database %{_datadir}/mime &>
 %{_kde4_iconsdir}/hicolor/32x32/apps/subtitlecomposer.png
 %{_kde4_iconsdir}/hicolor/48x48/apps/*                                                                    
 %{_kde4_iconsdir}/hicolor/scalable/actions/*
-%{_kde4_appsdir}/subtitlecomposer/*
-%{_kde4_appsdir}/subtitlecomposer/pics/*
+%{_kde4_appsdir}/subtitlecomposer/
 %{_datadir}/mime/packages/subtitlecomposer.xml
 
 %changelog
+* Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-2
+- .desktop: Categories: -Video +AudioVideo
+- optimize scriptlets (drop xdg-utils, shared-mime-info deps)
+- own %%{_kde4_appsdir}/subtitlecomposer/
+
 * Tue Jun 09 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 0.5.3-1
 - New upstream release
 - added Czech, Brazilian Portuguese, Bulgarian, French and German