rpms/kiconedit/F-10 .cvsignore, 1.8, 1.9 kiconedit.spec, 1.13, 1.14 sources, 1.9, 1.10

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kiconedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25910

Modified Files:
	.cvsignore kiconedit.spec sources 
Log Message:
* Mon May 11 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-2
- fix %_docdir/HTML/<lang> ownership



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kiconedit/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	3 Oct 2008 15:32:53 -0000	1.8
+++ .cvsignore	11 May 2009 14:50:53 -0000	1.9
@@ -1 +1 @@
-kiconedit-4.1.2.tar.bz2
+kiconedit-4.2.3.tar.bz2


Index: kiconedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kiconedit/F-10/kiconedit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kiconedit.spec	17 Nov 2008 18:17:42 -0000	1.13
+++ kiconedit.spec	11 May 2009 14:50:53 -0000	1.14
@@ -1,7 +1,7 @@
 # Review Request: http://bugzilla.redhat.com/432139
 
 Name:           kiconedit
-Version:        4.1.3
+Version:        4.2.3
 Release:        2%{?dist}
 Summary:        An icon editor
 
@@ -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,67 @@ 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}
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}${HTML_DIR} ]; then
+for lang_dir in %{buildroot}${HTML_DIR}/* ; do
+  if [ -d ${lang_dir} ]; then
+    lang=$(basename ${lang_dir})
+    echo "%lang(${lang}) ${HTML_DIR}/${lang}/%{name}/" >> %{name}.lang
+  fi
+done
+fi
+
+
+%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
+* Mon May 11 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-2
+- fix %%_docdir/HTML/<lang> ownership
+
+* 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
+
+* Fri Jan 23 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Mon Nov 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
 - scriptlet, dependency fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kiconedit/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Nov 2008 16:00:41 -0000	1.9
+++ sources	11 May 2009 14:50:53 -0000	1.10
@@ -1 +1 @@
-2ec07cdaa6b0d63e6ea04a42184b6069  kiconedit-4.1.3.tar.bz2
+a67500b03166d9fb8532d05129e9063d  kiconedit-4.2.3.tar.bz2