rpms/kipi-plugins/F-10 .cvsignore, 1.28, 1.29 kipi-plugins.spec, 1.80, 1.81 sources, 1.28, 1.29

Fri Jul 24 15:41:40 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24328

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.0-1
- kipi-plugins-0.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29

--- .cvsignore	12 May 2009 10:49:26 -0000	1.28
+++ .cvsignore	24 Jul 2009 15:41:39 -0000	1.29
@@ -1 +1 @@
-kipi-plugins-0.3.0.tar.bz2
+kipi-plugins-0.5.0.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-10/kipi-plugins.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- kipi-plugins.spec	27 May 2009 03:30:51 -0000	1.80
+++ kipi-plugins.spec	24 Jul 2009 15:41:39 -0000	1.81
@@ -2,8 +2,8 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.3.0
-Release: 1%{?dist}.1
+Version: 0.5.0
+Release: 1%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -11,6 +11,10 @@ Url:	 http://www.kipi-plugins.org/
 Source0: http://downloads.sourceforge.net/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+Patch50: kipi-plugins-0.4.0-dt_validation.patch
+
+BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
 ## DNG converter
 BuildRequires: expat-devel
@@ -22,7 +26,7 @@ BuildRequires: kdelibs4-devel >= 4.2.0
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
 Requires: kdelibs4 >= %{kdelibs4_version}
 BuildRequires: kdepimlibs-devel
-BuildRequires: libgpod-devel >= 0.7.0
+BuildRequires: libgpod-devel >= 0.7.0 
 BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: libkdcraw-devel >= 0.4.0-2
 BuildRequires: libkexiv2-devel >= 0.5.0
@@ -35,8 +39,8 @@ BuildRequires: expat-devel
 ## RemoveRedeye
 BuildRequires: opencv-devel
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 ## jpeglossless plugin
 Requires: ImageMagick
@@ -69,6 +73,8 @@ PrintWizard        : print images in var
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
+%patch50 -p1 -b .dt_validation
+
 
 %build
 mkdir -p %{_target_platform}
@@ -100,28 +106,41 @@ cat *.lang > %{name}-all.lang
 rm -f %{buildroot}%{_kde4_libdir}/lib*.so
 
 
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/dngconverter.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kipiplugins.desktop
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null  ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen  &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor >& /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor >& /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 
 
 %files -f %{name}-all.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_kde4_bindir}/dngconverter
-%{_kde4_libdir}/libkipiplugins.so.*
+%{_kde4_libdir}/libkipiplugins.so.1*
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
 %{_kde4_libdir}/kde4/kipiplugin_advancedslideshow.so
 %{_kde4_libdir}/kde4/kipiplugin_batchprocessimages.so
@@ -153,17 +172,25 @@ xdg-desktop-menu forceupdate 2> /dev/nul
 %{_kde4_appsdir}/kipiplugin_imageviewer/
 %{_kde4_appsdir}/kipiplugin_metadataedit/
 %{_kde4_appsdir}/kipiplugin_picasawebexport/
+%{_kde4_appsdir}/kipiplugin_printimages/
 %{_kde4_appsdir}/kipiplugin_removeredeyes/
 %{_kde4_appsdir}/kipiplugin_smug/
 %{_kde4_datadir}/applications/kde4/dngconverter.desktop
+%{_kde4_datadir}/applications/kde4/kipiplugins.desktop
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
 
 %changelog
-* Tue May 26 2009 Todd Zullinger <tmz at pobox.com> - 0.3.0-1.1
-- Rebuild against libgpod-0.7.0
+* Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.0-1
+- kipi-plugins-0.5.0
+
+* Fri Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> 0.4.0-1
+- kipi-plugins-0.4.0
+
+* Fri May 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-2
+- optimize scriptlets
 
 * Tue May 12 2009 Lukáš Tinkl <ltinkl at redhat.com> - 0.3.0-1
 - latest upstream bugfix release 0.3.0, many fixes 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	12 May 2009 10:49:26 -0000	1.28
+++ sources	24 Jul 2009 15:41:39 -0000	1.29
@@ -1 +1 @@
-6fa2c7dae38055fb50d90bad458c3412  kipi-plugins-0.3.0.tar.bz2
+f82c95b85f2b434fd03b99451ec5081e  kipi-plugins-0.5.0.tar.bz2


