rpms/kdegraphics/F-9 kdegraphics.spec,1.159,1.160

Thu Jan 8 05:50:53 UTC 2009

Author: kkofler

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

Modified Files:
	kdegraphics.spec 
Log Message:
* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-6
- BR ebook-tools-devel


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160

--- kdegraphics.spec	14 Nov 2008 16:21:24 -0000	1.159
+++ kdegraphics.spec	8 Jan 2009 05:50:23 -0000	1.160
@@ -1,12 +1,14 @@
 
-%if 0%{?fedora} < 10
+%if 0%{?fedora} > 9 
+%define obsolete_kde3_kipi 1
+%else
 %define omit_kde3_conflicts 1
 %endif
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.1.3
-Release:        1%{?dist}.1
+Release:        6%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -22,18 +24,22 @@
 
 ## kipi framework backports from trunk (4.2)
 ## don't bother updating these, rediff them from the next tag instead!
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.2/kdegraphics/libs/libkexiv2 \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkexiv2 >kdegraphics-4.1.2-libkexiv2-0.4.0.patch
-Patch200: kdegraphics-4.1.2-libkexiv2-0.4.0.patch
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.2/kdegraphics/libs/libkdcraw \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkdcraw >kdegraphics-4.1.2-libkdcraw-0.4.0.patch
-Patch201: kdegraphics-4.1.2-libkdcraw-0.4.0.patch
+# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkexiv2 \
+# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkexiv2 >kdegraphics-4.1.3-libkexiv2-0.5.0.patch
+Patch200: kdegraphics-4.1.3-libkexiv2-0.5.0.patch
+# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkdcraw \
+# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkdcraw >kdegraphics-4.1.3-libkdcraw-0.4.0.patch
+Patch201: kdegraphics-4.1.3-libkdcraw-0.4.0.patch
+# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkipi \
+# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkipi >kdegraphics-4.1.3-libkipi-0.3.0.patch
+Patch202: kdegraphics-4.1.3-libkipi-0.3.0.patch
 
 BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  cmake
 BuildRequires:  chmlib-devel
 BuildRequires:  djvulibre-devel
+BuildRequires:  ebook-tools-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 %if 0%{?fedora} > 9
@@ -50,9 +56,6 @@
 BuildRequires:  qimageblitz-devel
 BuildRequires:  sane-backends-devel
 BuildRequires:  lcms-devel
-# TODO (not packaged yet):
-# + libepub: A library for reading EPub documents <http://sourceforge.net/projects/ebook-tools>
-# Support for EPub documents in Okular.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
@@ -61,7 +64,7 @@
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kdegraphics-extras < 7:4.0.0 
 Obsoletes: gwenview < 2
 Provides: gwenview = 2
 
@@ -78,7 +81,11 @@
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Obsoletes: %{name}-libs-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+%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}.
 
@@ -92,7 +99,7 @@
 Requires: pkgconfig
 %if ! 0%{?omit_kde3_conflicts}
 Obsoletes: libkdcraw-devel < 0.4.0, libkexiv2-devel < 0.4.0, libkipi-devel < 0.2.0
-Provides:  libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.4.0-2, libkipi-devel = 0.2.0-1
+Provides:  libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel = 0.3.0-1
 %endif
 %description devel
 %{summary}.
@@ -102,14 +109,18 @@
 %setup -q -n kdegraphics-%{version}
 
 # upstream patches
-# libkexiv2 0.4.0 backport
+# libkexiv2 backport
 pushd libs/libkexiv2
 %patch200 -p0
 popd
-# libkdcraw 0.4.0 backport
+# libkdcraw backport
 pushd libs/libkdcraw
 %patch201 -p0
 popd
+# libkipi backport
+pushd libs/libkipi
+%patch202 -p0
+popd
 
 
 %build
@@ -146,9 +157,13 @@
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %files
@@ -161,7 +176,7 @@
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_docdir}/HTML/en/okular/
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
@@ -171,11 +186,18 @@
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_docdir}/HTML/en/gwenview/
 %{_kde4_docdir}/HTML/en/kamera/
-%{_kde4_docdir}/HTML/en/ksnapshot/
+%{_kde4_docdir}/HTML/en/kgamma/
 %{_kde4_docdir}/HTML/en/kolourpaint/
+%{_kde4_docdir}/HTML/en/ksnapshot/
 %{_kde4_docdir}/HTML/en/kruler/
-%{_kde4_docdir}/HTML/en/kgamma/
-%{_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,-)
@@ -184,6 +206,9 @@
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/strigi/*
+%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.*
+%{_kde4_iconsdir}/hicolor/*/apps/kipi.*
+%{_kde4_datadir}/kde4/servicetypes/kipiplugin.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -201,8 +226,21 @@
 
 
 %changelog
-* Fri Nov 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-1.1
-- include libkdcraw/libkexiv2 backports
+* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-6
+- BR ebook-tools-devel
+
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-5
+- libkipi backport too (makes kde42 transition easier later)
+
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-4
+- cleanup Obsoletes: kdegraphics-extras
+
+* Tue Nov 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-3
+- respin libkdcraw/libkexiv2 patches
+- Obsoletes: libkdcraw libkexiv2 libkipi (F10+)
+
+* Tue Nov 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
+- move (remaining) libkipi/libkdcraw runtime bits to -libs (#472874)
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3


