rpms/kiconedit/F-9 .cvsignore,1.7,1.8 kiconedit.spec,1.11,1.12

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kiconedit.spec 
Log Message:
* Mon Nov 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
- scriptlet, dependency fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kiconedit/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2008 11:30:25 -0000	1.7
+++ .cvsignore	17 Nov 2008 18:17:58 -0000	1.8
@@ -1 +1 @@
-kiconedit-4.1.3.tar.bz2
+kiconedit-4.1.2.tar.bz2


Index: kiconedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kiconedit/F-9/kiconedit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kiconedit.spec	11 Nov 2008 11:30:25 -0000	1.11
+++ kiconedit.spec	17 Nov 2008 18:17:58 -0000	1.12
@@ -1,9 +1,8 @@
-# Review Request:
-# https://bugzilla.redhat.com/show_bug.cgi?id=432139
+# Review Request: http://bugzilla.redhat.com/432139
 
 Name:           kiconedit
 Version:        4.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An icon editor
 
 Group:          Applications/Publishing
@@ -12,21 +11,16 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libutempter-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
-Requires: oxygen-icon-theme
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
-Conflicts: kdegraphics <= 4
-
 %description
 KIconEdit is designed to help create icons for 
 KDE using the standard icon palette.
@@ -41,7 +35,6 @@
 %{cmake_kde4} ..
 popd
 
-
 make %{?_smp_mflags} -C %{_target_platform}
 
 
@@ -51,7 +44,8 @@
 
 # validate desktop file
 desktop-file-install --vendor "" \
-    --dir %{buildroot}%{_datadir}/applications/kde4 --remove-key=Path \
+    --dir %{buildroot}%{_datadir}/applications/kde4 \
+    --remove-key=Path \
     %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
 
 %find_lang %{name}
@@ -61,9 +55,11 @@
 
 %post
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -77,6 +73,9 @@
 %{_kde4_iconsdir}/hicolor/*/*/kiconedit.png
 
 %changelog
+* Mon Nov 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
+- scriptlet, dependency fixes
+
 * Sun Nov 09 2008 Sebastian Vahl <fedora at deadbabylon.de> 4.1.3-1
 - 4.1.3