rpms/kipi-plugins/F-11 kipi-plugins-0.4.0-dt_validation.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 kipi-plugins.spec, 1.94, 1.95 sources, 1.28, 1.29 kipi-plugins-use-libgpod-0.6.0.patch, 1.2, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Added Files:
	kipi-plugins-0.4.0-dt_validation.patch 
Removed Files:
	kipi-plugins-use-libgpod-0.6.0.patch 
Log Message:
* Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.0-1
- kipi-plugins-0.5.0


kipi-plugins-0.4.0-dt_validation.patch:
 kipiplugins.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kipi-plugins-0.4.0-dt_validation.patch ---
diff -up kipi-plugins-0.4.0/common/libkipiplugins/kipiplugins.desktop.dt_validation kipi-plugins-0.4.0/common/libkipiplugins/kipiplugins.desktop
--- kipi-plugins-0.4.0/common/libkipiplugins/kipiplugins.desktop.dt_validation	2009-07-03 03:39:04.000000000 -0500
+++ kipi-plugins-0.4.0/common/libkipiplugins/kipiplugins.desktop	2009-07-03 20:31:27.489920856 -0500
@@ -35,6 +35,6 @@ Comment[sv]=KDE:s gränssnitt för bildi
 Comment[uk]=Інтерфейс додатків KDE для роботи з зображеннями
 Comment[x-test]=xxKDE Image Plugins Interfacexx
 X-DocPath=kipi-plugins/index.html
-Categories=Qt;KDE;Graphics;
+#Categories=Qt;KDE;Graphics;
 NoDisplay=true
 Type=Service


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-11/.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:43:01 -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-11/kipi-plugins.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- kipi-plugins.spec	23 May 2009 04:52:44 -0000	1.94
+++ kipi-plugins.spec	24 Jul 2009 15:43:02 -0000	1.95
@@ -2,8 +2,8 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.3.0
-Release: 2%{?dist}
+Version: 0.5.0
+Release: 1%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -11,14 +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)
 
-%if 0%{?fedora} > 10
-%define libgpod_ver 0.7.0
-%else
-%define libgpod_ver 0.6.0
-%endif
-# temporary, until f10 is up'd to libgpod-0.7.0 too
-Patch1: kipi-plugins-use-libgpod-0.6.0.patch
+## upstreamable patches
+Patch50: kipi-plugins-0.4.0-dt_validation.patch
 
+BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
 ## DNG converter
 BuildRequires: expat-devel
@@ -30,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 >= %{libgpod_ver} 
+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
@@ -77,9 +73,7 @@ PrintWizard        : print images in var
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
-%if "%{?libgpod_ver}" == "0.6.0" 
-%patch1 -p1 -b .libgpod-0.6.0
-%endif
+%patch50 -p1 -b .dt_validation
 
 
 %build
@@ -112,6 +106,11 @@ 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}
 
@@ -141,7 +140,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %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
@@ -173,15 +172,23 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_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
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-11/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:43:02 -0000	1.29
@@ -1 +1 @@
-6fa2c7dae38055fb50d90bad458c3412  kipi-plugins-0.3.0.tar.bz2
+f82c95b85f2b434fd03b99451ec5081e  kipi-plugins-0.5.0.tar.bz2


--- kipi-plugins-use-libgpod-0.6.0.patch DELETED ---