[kdegraphics] 4.6.80

Mon Jun 27 06:16:54 UTC 2011

commit 55dde0ea31087ebe36318ab84ee0c87e7c2b6c33
Author: Radek Novacek <rad.n at centrum.cz>
Date:   Mon Jun 27 08:16:37 2011 +0200

    4.6.80

 .gitignore                          |   16 ++++++++++
 kdegraphics-4.6.80-find_ksane.patch |   16 ++++++++++
 kdegraphics.spec                    |   57 +++++++++++++++++++++++++++--------
 sources                             |   17 ++++++++++-
 4 files changed, 92 insertions(+), 14 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 0a7a61b..9fbc7f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,18 @@
 /kdegraphics-4.6.2.tar.bz2
 /kdegraphics-4.6.3.tar.bz2
+/kdegraphics-4.6.80.tar.bz2
+/gwenview-4.6.80.tar.bz2
+/kamera-4.6.80.tar.bz2
+/kcolorchooser-4.6.80.tar.bz2
+/kgamma-4.6.80.tar.bz2
+/kdegraphics-strigi-analyzer-4.6.80.tar.bz2
+/kdegraphics-thumbnailers-4.6.80.tar.bz2
+/kolourpaint-4.6.80.tar.bz2
+/kruler-4.6.80.tar.bz2
+/ksaneplugin-4.6.80.tar.bz2
+/ksnapshot-4.6.80.tar.bz2
+/libkdcraw-4.6.80.tar.bz2
+/libkexiv2-4.6.80.tar.bz2
+/libkipi-4.6.80.tar.bz2
+/libksane-4.6.80.tar.bz2
+/svgpart-4.6.80.tar.bz2
diff --git a/kdegraphics-4.6.80-find_ksane.patch b/kdegraphics-4.6.80-find_ksane.patch
new file mode 100644
index 0000000..c2a7b3f
--- /dev/null
+++ b/kdegraphics-4.6.80-find_ksane.patch
@@ -0,0 +1,16 @@
+diff -up kdegraphics-4.6.80/ksaneplugin/cmake/modules/FindKSane.cmake.find_ksane kdegraphics-4.6.80/ksaneplugin/cmake/modules/FindKSane.cmake
+--- kdegraphics-4.6.80/ksaneplugin/cmake/modules/FindKSane.cmake.find_ksane	2011-05-20 22:36:22.000000000 +0200
++++ kdegraphics-4.6.80/ksaneplugin/cmake/modules/FindKSane.cmake	2011-06-24 11:38:04.416806494 +0200
+@@ -9,10 +9,10 @@ if (KSANE_INCLUDE_DIR)
+   set(KSANE_FIND_QUIETLY TRUE)
+ endif (KSANE_INCLUDE_DIR)
+ 
+-FIND_FILE(KSANE_LOCAL_FOUND libksane/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libksane NO_DEFAULT_PATH)
++FIND_FILE(KSANE_LOCAL_FOUND libksane/version.h.cmake ${CMAKE_SOURCE_DIR}/libksane NO_DEFAULT_PATH)
+ 
+ if (KSANE_LOCAL_FOUND)
+-    set(KSANE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/libksane)
++    set(KSANE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libksane)
+     set(KSANE_DEFINITIONS -I${KSANE_INCLUDE_DIR})
+     set(KSANE_LIBRARY ksane)
+     message(STATUS "Found KSane library in local sub-folder: ${KSANE_LIBRARY}")
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 9d7627a..f3fb333 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -5,15 +5,15 @@
 
 # TODO: automate this somehow, extract versions from CMakeLists.txt or something
 # or... just start using automatic pkgconfig dependencies from rpm
-%define libkdcraw_version 1.2.0
-%define libkexiv2_version 1.2.0
+%define libkdcraw_version 2.0.0
+%define libkexiv2_version 2.0.0
 %define libkipi_version 1.2.0
 %define libksane_version 0.3.0
 
 Summary:        KDE Graphics Applications
 Epoch:          7
-Version:        4.6.3
-Release:        2%{?dist}
+Version:        4.6.80
+Release:        1%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -23,16 +23,32 @@ Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
+Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-strigi-analyzer-%{version}.tar.bz2
+Source2:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-thumbnailers-%{version}.tar.bz2
+Source3:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/gwenview-%{version}.tar.bz2
+Source4:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kamera-%{version}.tar.bz2
+Source5:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kcolorchooser-%{version}.tar.bz2
+Source6:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kgamma-%{version}.tar.bz2
+Source7:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kolourpaint-%{version}.tar.bz2
+Source8:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kruler-%{version}.tar.bz2
+Source9:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/ksaneplugin-%{version}.tar.bz2
+Source10:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/ksnapshot-%{version}.tar.bz2
+Source11:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/svgpart-%{version}.tar.bz2
+Source12:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libksane-%{version}.tar.bz2
+Source13:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libkexiv2-%{version}.tar.bz2
+Source14:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libkdcraw-%{version}.tar.bz2
+Source15:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libkipi-%{version}.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Find locally unpacked ksane library
+Patch10: kdegraphics-4.6.80-find_ksane.patch
+
 ## upstreamable patches
 # okular.desktop : Categories=-Office,+VectorGraphics (http://bugzilla.redhat.com/591089)
 Patch50: kdegraphics-4.5.1-okular_dt.patch
 # don't hardcode paths in OkularConfig.cmake
 Patch51: kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths.patch
-# fix libjpeg-turbo detection, see also https://bugs.kde.org/show_bug.cgi?id=265431
-# use cmake_try_compile to grok version
-Patch53: kdegraphics-4.6.2-libjpeg_version.patch
 # fix printing of landscape documents in Okular (#509645, kde#181290)
 # https://git.reviewboard.kde.org/r/101513/
 Patch54: kdegraphics-4.6.3-okular-landscape.patch
@@ -45,6 +61,7 @@ BuildRequires:  ebook-tools-devel
 %endif
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
+BuildRequires:  kdebase-devel >= %{version}
 BuildRequires:  djvulibre-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
@@ -64,6 +81,7 @@ BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
 BuildRequires:  shared-desktop-ontologies-devel
 BuildRequires:  soprano-devel
+BuildRequires:  kipi-plugins
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -127,17 +145,27 @@ Summary: A kioslave for displaying WinHelp files
 
 %prep
 %setup -q -n kdegraphics-%{version}%{?alphatag}
+# Unpack all sources
+%setup -q -T -D -c -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -n kdegraphics-%{version}%{?alphatag}
+
+# Remove version number from directory names and add them to CMakeLists.txt
+for f in kdegraphics-strigi-analyzer kdegraphics-thumbnailers gwenview kamera kcolorchooser kgamma kolourpaint kruler ksaneplugin ksnapshot svgpart libksane libkdcraw libkexiv2 libkipi;
+do
+    mv $f-%{version} $f;
+    printf "add_subdirectory ($f)\n" >> CMakeLists.txt
+done
+
+%patch10 -p1 -b .find_ksane
 
 %patch50 -p1 -b .okular_dt
 %patch51 -p1 -b .OkularConfig
-%patch53 -p1 -b .libjpeg_version
 %patch54 -p1 -b .okular-landscape
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} .. -DCMAKE_MODULE_PATH=../ksaneplugin/cmake/modules
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -225,7 +253,6 @@ fi
 %{_kde4_iconsdir}/hicolor/*/actions/*
 %endif
 %{_kde4_libdir}/kde4/kcm_kgamma.so
-%{_kde4_libdir}/kde4/mobithumbnail.so
 %{_kde4_libdir}/kde4/okularGenerator_*.so
 %{_kde4_libdir}/kde4/okularpart.so
 %{_kde4_libdir}/kde4/rawthumbnail.so
@@ -247,8 +274,8 @@ fi
 %{_kde4_appsdir}/libkdcraw/
 %{_kde4_iconsdir}/hicolor/*/apps/kdcraw.*
 %{_kde4_libdir}/libgwenviewlib.so.4*
-%{_kde4_libdir}/libkdcraw.so.9*
-%{_kde4_libdir}/libkexiv2.so.9*
+%{_kde4_libdir}/libkdcraw.so.20*
+%{_kde4_libdir}/libkexiv2.so.10*
 %{_kde4_libdir}/libkipi.so.8*
 %{_kde4_libdir}/libkolourpaint_lgpl.so.4*
 %if 0%{?sane}
@@ -257,7 +284,6 @@ fi
 %{_kde4_libdir}/libokularcore.so.1*
 %{_kde4_libdir}/strigi/strigiea_dvi.so
 %{_kde4_libdir}/strigi/strigiea_tiff.so
-%{_kde4_libdir}/strigi/strigila_mobi.so
 
 
 %files devel
@@ -281,6 +307,11 @@ fi
 
 
 %changelog
+* Thu Jun 23 2011 Radek Novacek <rnovacek at redhat.com> - 4.6.80-1
+- update to 4.6.80
+- built from multiple tarballs
+- add BR: kdebase-devel (libkonq) and kipi-plugins
+
 * Mon Jun 06 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.6.3-2
 - fix printing of landscape documents in Okular (#509645, kde#181290)
 
diff --git a/sources b/sources
index 619cb48..6a1c85e 100644
--- a/sources
+++ b/sources
@@ -1 +1,16 @@
-26c2eca2d707f9fc69db87c0467e5849  kdegraphics-4.6.3.tar.bz2
+6fee3552a1411a9462ca18163c9aa750  kdegraphics-4.6.80.tar.bz2
+084356ceddea3039e1a8f6bb316ab368  gwenview-4.6.80.tar.bz2
+390dcaf51f028bccc9f0ab0213c16067  kamera-4.6.80.tar.bz2
+ca9607a88585b8114bd6a25ce315d228  kcolorchooser-4.6.80.tar.bz2
+d545b6abaf43ffa0301c4433a25fa9ff  kgamma-4.6.80.tar.bz2
+c58214c6bc46645d5ebc5e2b4b42bf2f  kdegraphics-strigi-analyzer-4.6.80.tar.bz2
+efcdbe1509450d50d1cbd85c44811fa0  kdegraphics-thumbnailers-4.6.80.tar.bz2
+70b1934dd8bb050b2a20013c63aa3513  kolourpaint-4.6.80.tar.bz2
+db5864fad54122f3e756a7c21628cbb0  kruler-4.6.80.tar.bz2
+00eb663e872744341e1ef13857488d3e  ksaneplugin-4.6.80.tar.bz2
+00c01bde333197d5def9725330179789  ksnapshot-4.6.80.tar.bz2
+535dd452623711cd8ebb1b4297d77c73  libkdcraw-4.6.80.tar.bz2
+6478350d2d70d070ca9bdcbf71af78a5  libkexiv2-4.6.80.tar.bz2
+6a3a5ffb73bc2c21cbad98835ef3fa26  libkipi-4.6.80.tar.bz2
+6cfe720d86abe85cda50ed0b64eb8bf7  libksane-4.6.80.tar.bz2
+e9ee6a4beaf192fa122c65329b726c2f  svgpart-4.6.80.tar.bz2
