rpms/kdegraphics/F-9 gwenview-fix-version.diff, NONE, 1.1 kdegraphics.spec, 1.164, 1.165

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdegraphics.spec 
Added Files:
	gwenview-fix-version.diff 
Log Message:
* Mon Mar 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-3
- gwenview-fix-version.diff


gwenview-fix-version.diff:

--- NEW FILE gwenview-fix-version.diff ---
diff --git a/gwenview/app/main.cpp b/gwenview/app/main.cpp
index 8bdf041..74dd694 100644
--- a/gwenview/app/main.cpp
+++ b/gwenview/app/main.cpp
@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) {
 		"gwenview",        /* appname */
 		0,                 /* catalogName */
 		ki18n("Gwenview"), /* programName */
-		"2.2.0");          /* version */
+		"2.2.1");          /* version */
 	aboutData.setShortDescription(ki18n("An Image Viewer"));
 	aboutData.setLicense(KAboutData::License_GPL);
 	aboutData.setCopyrightStatement(ki18n("Copyright 2000-2008 Aurélien Gâteau"));


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- kdegraphics.spec	2 Mar 2009 10:29:26 -0000	1.164
+++ kdegraphics.spec	9 Mar 2009 14:33:44 -0000	1.165
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -20,6 +20,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
+Patch100: gwenview-fix-version.diff
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -71,6 +72,8 @@
 %if 0%{?obsolete_kde3_kipi}
 Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
 %endif
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 %description libs
 %{summary}.
 
@@ -94,6 +97,8 @@
 %setup -q -n kdegraphics-%{version}
 
 # upstream patches
+%patch100 -p1 -b .gwenview_fix_version
+
 
 %build
 
@@ -102,7 +107,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -122,16 +127,20 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post libs -p /sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%postun libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%postun libs
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %files
@@ -144,24 +153,49 @@
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_docdir}/HTML/en/okular/
+%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
 %{_kde4_appsdir}/kolourpaint/
 %{_kde4_appsdir}/kruler/
 %{_kde4_appsdir}/svgpart/
+%{_kde4_libdir}/kde4/gsthumbnail.so
+%{_kde4_libdir}/kde4/gvpart.so
+%{_kde4_libdir}/kde4/kcm_kamera.so
+%{_kde4_libdir}/kde4/kcm_kgamma.so
+%{_kde4_libdir}/kde4/kio_kamera.so
+%{_kde4_libdir}/kde4/kio_msits.so
+%{_kde4_libdir}/kde4/ksaneplugin.so
+%{_kde4_libdir}/kde4/okularGenerator_*.so
+%{_kde4_libdir}/kde4/okularpart.so
+%{_kde4_libdir}/kde4/svgpart.so
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_docdir}/HTML/en/*/
-%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/hicolor/*/actions/*
+%{_kde4_iconsdir}/hicolor/*/apps/gwenview.*
+%{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.*
+%{_kde4_iconsdir}/hicolor/*/apps/kgamma.*
+%{_kde4_iconsdir}/hicolor/*/apps/kolourpaint.*
+%{_kde4_iconsdir}/hicolor/*/apps/kruler.*
+%{_kde4_iconsdir}/hicolor/*/apps/ksnapshot.*
+%{_kde4_iconsdir}/hicolor/*/apps/okular.*
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kipi/
+%{_kde4_iconsdir}/hicolor/*/apps/kipi.*
+%{_kde4_datadir}/kde4/servicetypes/kipiplugin.desktop
 %{_kde4_appsdir}/libkdcraw/
-%{_kde4_libdir}/lib*.so.*
-%{_kde4_libdir}/kde4/*
-%{_kde4_libdir}/strigi/*
+%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.*
+%{_kde4_libdir}/libgwenviewlib.so.4*
+%{_kde4_libdir}/libkdcraw.so.7*
+%{_kde4_libdir}/libkexiv2.so.7*
+%{_kde4_libdir}/libkipi.so.6*
+%{_kde4_libdir}/libkolourpaint_lgpl.so.4*
+%{_kde4_libdir}/libksane.so.0*
+%{_kde4_libdir}/libokularcore.so.1*
+%{_kde4_libdir}/strigi/strigita_dvi.so
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -179,6 +213,12 @@
 
 
 %changelog
+* Mon Mar 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-3
+- gwenview-fix-version.diff
+
+* Sun Mar 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-2
+- missing dependency on kipiplugin.desktop (#489218)
+
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1