rpms/kiconedit/devel .cvsignore, 1.9, 1.10 kiconedit.spec, 1.14, 1.15 sources, 1.10, 1.11

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kiconedit.spec sources 
Log Message:
* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-1
- 4.2.3
- optimize scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kiconedit/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	23 Jan 2009 10:40:38 -0000	1.9
+++ .cvsignore	8 May 2009 14:40:52 -0000	1.10
@@ -1,2 +1 @@
-kiconedit-4.1.2.tar.bz2
-kiconedit-4.2.0.tar.bz2
+kiconedit-4.2.3.tar.bz2


Index: kiconedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kiconedit/devel/kiconedit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- kiconedit.spec	25 Feb 2009 11:18:54 -0000	1.14
+++ kiconedit.spec	8 May 2009 14:40:52 -0000	1.15
@@ -1,8 +1,8 @@
 # Review Request: http://bugzilla.redhat.com/432139
 
 Name:           kiconedit
-Version:        4.2.0
-Release:        2%{?dist}
+Version:        4.2.3
+Release:        1%{?dist}
 Summary:        An icon editor
 
 Group:          Applications/Publishing
@@ -18,16 +18,16 @@ BuildRequires:  gettext
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 %description
 KIconEdit is designed to help create icons for 
 KDE using the standard icon palette.
 
+
 %prep
 %setup -q
 
+
 %build
 
 mkdir -p %{_target_platform}
@@ -40,39 +40,50 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# validate desktop file
-desktop-file-install --vendor "" \
-    --dir %{buildroot}%{_datadir}/applications/kde4 \
-    --remove-key=Path \
-    %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang %{name}
 
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-# FIXME/TODO: Ping upstream to include COPYING
-%doc AUTHORS NEWS
+%doc AUTHORS COPYING NEWS
 %{_kde4_bindir}/kiconedit
 %{_kde4_appsdir}/kiconedit/
 %{_kde4_datadir}/applications/kde4/kiconedit.desktop
 %{_kde4_docdir}/HTML/en/kiconedit/
-%{_kde4_iconsdir}/hicolor/*/*/kiconedit.png
+%{_kde4_iconsdir}/hicolor/*/*/*
+
 
 %changelog
+* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-1
+- 4.2.3
+- optimize scriptlets
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kiconedit/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	23 Jan 2009 10:40:38 -0000	1.10
+++ sources	8 May 2009 14:40:52 -0000	1.11
@@ -1 +1 @@
-b9700b5380880d6bb857ac7594583ff3  kiconedit-4.2.0.tar.bz2
+a67500b03166d9fb8532d05129e9063d  kiconedit-4.2.3.tar.bz2