[kdegraphics] placeholder metapackage
Rex Dieter
rdieter at fedoraproject.org
Fri Jul 15 12:47:48 UTC 2011
commit bb32d39aa208d1644be89907cbbd7cb7123762ee
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Jul 15 07:47:27 2011 -0500
placeholder metapackage
.gitignore | 16 -
kdegraphics-4.5.1-okular_dt.patch | 10 -
...s-4.5.80-OkularConfig-dont-hardcode-paths.patch | 30 --
kdegraphics-4.6.80-find_ksane.patch | 16 -
kdegraphics-4.6.90-okular-landscape.patch | 427 --------------------
kdegraphics.spec | 307 ++------------
sources | 16 -
7 files changed, 43 insertions(+), 779 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ad4c2c..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +0,0 @@
-/gwenview-4.6.95.tar.bz2
-/kamera-4.6.95.tar.bz2
-/kcolorchooser-4.6.95.tar.bz2
-/kdegraphics-strigi-analyzer-4.6.95.tar.bz2
-/kdegraphics-thumbnailers-4.6.95.tar.bz2
-/kgamma-4.6.95.tar.bz2
-/kolourpaint-4.6.95.tar.bz2
-/kruler-4.6.95.tar.bz2
-/ksaneplugin-4.6.95.tar.bz2
-/ksnapshot-4.6.95.tar.bz2
-/libkdcraw-4.6.95.tar.bz2
-/libkexiv2-4.6.95.tar.bz2
-/libkipi-4.6.95.tar.bz2
-/libksane-4.6.95.tar.bz2
-/okular-4.6.95.tar.bz2
-/svgpart-4.6.95.tar.bz2
diff --git a/kdegraphics.spec b/kdegraphics.spec
index dd23fdc..b64c39c 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -1,313 +1,92 @@
-# gphoto support
-%define gphoto 1
-# sane implies gphoto support (via -devel deps)
-%define sane 1
-
-# TODO: automate this somehow, extract versions from CMakeLists.txt or something
-# or... just start using automatic pkgconfig dependencies from rpm
-%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.95
-Release: 1%{?dist}
+Release: 10%{?dist}
Name: kdegraphics
-#Obsoletes: kdegraphics4 < %{version}-%{release}
Provides: kdegraphics4 = %{version}-%{release}
Group: Applications/Multimedia
License: GPLv2
URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-strigi-analyzer-%{version}.tar.bz2
-Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-thumbnailers-%{version}.tar.bz2
-Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/gwenview-%{version}.tar.bz2
-Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kamera-%{version}.tar.bz2
-Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kcolorchooser-%{version}.tar.bz2
-Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kgamma-%{version}.tar.bz2
-Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kolourpaint-%{version}.tar.bz2
-Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kruler-%{version}.tar.bz2
-Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/ksaneplugin-%{version}.tar.bz2
-Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/ksnapshot-%{version}.tar.bz2
-Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/svgpart-%{version}.tar.bz2
-Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libksane-%{version}.tar.bz2
-Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libkexiv2-%{version}.tar.bz2
-Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libkdcraw-%{version}.tar.bz2
-Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libkipi-%{version}.tar.bz2
-Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/okular-%{version}.tar.bz2
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+BuildRequires: kde-filesystem
-# 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 printing of landscape documents in Okular (#509645, kde#181290)
-# https://git.reviewboard.kde.org/r/101513/
-Patch54: kdegraphics-4.6.90-okular-landscape.patch
-
-## upstream patches
-
-%if 0%{?fedora}
-BuildRequires: chmlib-devel
-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
-BuildRequires: lcms-devel
-%if 0%{?gphoto}
-BuildRequires: gphoto2-devel
-%endif
-%if 0%{?sane}
-BuildRequires: sane-backends-devel
-%endif
-BuildRequires: libspectre-devel
-BuildRequires: libtiff-devel
-BuildRequires: libXxf86vm-devel
-BuildRequires: pcre-devel
-BuildRequires: poppler-qt4-devel
-BuildRequires: qca2-devel
-BuildRequires: qimageblitz-devel
-BuildRequires: shared-desktop-ontologies-devel
-BuildRequires: soprano-devel
-
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
-# used by okular
-Requires: kio_msits = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires: cups
-
-Obsoletes: gwenview < 2
-Provides: gwenview = 2
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+
+Requires: gwenview >= %{version}
+Requires: kamera >= %{version}
+Requires: kcolorchooser >= %{version}
+Requires: kdegraphics-strigi-analyzer >= %{version}
+Requires: kdegraphics-thumbnailers >= %{version}
+Requires: kgamma >= %{version}
+Requires: kolourpaint >= %{version}
+Requires: kruler >= %{version}
+Requires: ksaneplugin >= %{version}
+Requires: ksnapshot >= %{version}
+Requires: okular >= %{version}
+Requires: svgpart >= %{version}
%description
-Graphics applications, including
-* gwenview (an image viewer)
-%{?gphoto:* kamera (digital camera support)}
-* kcolorchooser (a color chooser)
-* kolourpaint4 (an easy-to-use paint program)
-* kruler (screen ruler and color measurement tool)
-* ksnapshot (screen capture utility)
-* okular (a document viewer)
+Kdegraphics metapackage, to ease migration to split applications
+
+%package common
+Summary: Common files for %{name}
+%description common
+%{summary}.
%package libs
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
-Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
-Provides: libkdcraw%{?_isa} = %{libkdcraw_version}
-Provides: libkexiv2%{?_isa} = %{libkexiv2_version}
-Provides: libkipi%{?_isa} = %{libkipi_version}
-%if 0%{?sane}
-Provides: libksane%{?_isa} = %{libksane_version}
-%endif
-%{?_kde4_version:Requires: kdelibs4%{?isa} >= %{_kde4_version}}
+#Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: libkipi >= %{version}
+Requires: libkdcraw >= %{version}
+Requires: libkexiv2 >= %{version}
+Requires: libksane >= %{version}
%description libs
%{summary}.
%package devel
Group: Development/Libraries
Summary: Developer files for %{name}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-#Obsoletes: kdegraphics4-devel < %{version}-%{release}
-Provides: kdegraphics4-devel = %{version}-%{release}
-Requires: kdelibs4-devel
-Requires: pkgconfig
-Obsoletes: libkdcraw-devel < 0.4.0, libkexiv2-devel < 0.4.0, libkipi-devel < 0.2.0
-Provides: libkdcraw-devel = %{libkdcraw_version}
-Provides: libkexiv2-devel = %{libkexiv2_version}
-Provides: libkipi-devel = %{libkipi_version}
-%if 0%{?sane}
-Provides: libksane-devel = %{libksane_version}
-%endif
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: libkipi-devel
+Requires: libkdcraw-devel
+Requires: libkexiv2-devel
+Requires: libksane-devel
+Requires: okular-devel
%description devel
%{summary}.
-%package -n kio_msits
-Group: System Environment/Libraries
-Summary: A kioslave for displaying WinHelp files
-%description -n kio_msits
-%{summary}.
-
-
%prep
-%setup -q -n %{name}-%{version}%{?alphatag} -c -a 0 -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
-
-# 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 okular;
-do
- mv $f-%{version} $f;
- test -d ${f}/cmake/modules && \
- printf "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} "\${CMAKE_SOURCE_DIR}/${f}/cmake/modules/")\n" >> CMakeLists.txt
- printf "add_subdirectory ($f)\n" >> CMakeLists.txt
-done
-
-%patch10 -p1 -b .find_ksane
-
-%patch50 -p1 -b .okular_dt
-%patch51 -p1 -b .OkularConfig
-%patch54 -p1 -b .okular-landscape
-
+# blank
%build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} ..
-popd
-
-make %{?_smp_mflags} -C %{_target_platform}
+# blank
%install
-rm -rf %{buildroot}
-
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-
-
-%check
-for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
- desktop-file-validate $f
-done
-export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
-test "$(pkg-config --modversion libkdcraw)" = "%{libkdcraw_version}"
-test "$(pkg-config --modversion libkexiv2)" = "%{libkexiv2_version}"
-test "$(pkg-config --modversion libkipi)" = "%{libkipi_version}"
-%if 0%{?sane}
-test "$(pkg-config --modversion libksane)" = "%{libksane_version}"
-%endif
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
-%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
-
-%postun
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
-fi
-
-%post libs
-/sbin/ldconfig
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
-%posttrans libs
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
-%postun libs
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-fi
+# blank
%files
-%defattr(-,root,root,-)
-%{_kde4_bindir}/*
-%{_kde4_appsdir}/okular/
-%{_kde4_appsdir}/kgamma/
-%{_kde4_datadir}/applications/kde4/*
-%{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/kde4/services/*.desktop
-%if 0%{?gphoto}
-%{_kde4_datadir}/kde4/services/camera.protocol
-%{_kde4_libdir}/kde4/kcm_kamera.so
-%{_kde4_libdir}/kde4/kio_kamera.so
-%endif
-%{_kde4_datadir}/kde4/services/ServiceMenus/slideshow.desktop
-%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
-%{_kde4_appsdir}/gvpart/
-%{_kde4_appsdir}/gwenview/
-%{_kde4_appsdir}/libkexiv2/
-%{_kde4_appsdir}/kolourpaint/
-%{_kde4_appsdir}/kruler/
-%{_kde4_appsdir}/solid/actions/*.desktop
-%{_kde4_appsdir}/svgpart/
-%{_kde4_libdir}/kde4/gsthumbnail.so
-%{_kde4_libdir}/kde4/gvpart.so
-%if 0%{?sane}
-%{_kde4_libdir}/kde4/ksaneplugin.so
-%{_kde4_iconsdir}/hicolor/*/actions/*
-%endif
-%{_kde4_libdir}/kde4/kcm_kgamma.so
-%{_kde4_libdir}/kde4/okularGenerator_*.so
-%{_kde4_libdir}/kde4/okularpart.so
-%{_kde4_libdir}/kde4/rawthumbnail.so
-%{_kde4_libdir}/kde4/svgpart.so
-%{_datadir}/dbus-1/interfaces/*.xml
-%{_kde4_docdir}/HTML/en/*/
-%{_kde4_iconsdir}/hicolor/*/apps/gwenview.*
-%{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.*
-%{_kde4_iconsdir}/hicolor/*/apps/kolourpaint.*
-%{_kde4_iconsdir}/hicolor/*/apps/kruler.*
-%{_kde4_iconsdir}/hicolor/*/apps/ksnapshot.*
-%{_kde4_iconsdir}/hicolor/*/apps/okular.*
+# blank
%files libs
-%defattr(-,root,root,-)
-%{_kde4_appsdir}/kipi/
-%{_kde4_iconsdir}/hicolor/*/apps/kipi.*
-%{_kde4_datadir}/kde4/servicetypes/kipiplugin.desktop
-%{_kde4_appsdir}/libkdcraw/
-%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.*
-%{_kde4_libdir}/libgwenviewlib.so.4*
-%{_kde4_libdir}/libkdcraw.so.20*
-%{_kde4_libdir}/libkexiv2.so.10*
-%{_kde4_libdir}/libkipi.so.8*
-%{_kde4_libdir}/libkolourpaint_lgpl.so.4*
-%if 0%{?sane}
-%{_kde4_libdir}/libksane.so.0*
-%endif
-%{_kde4_libdir}/libokularcore.so.1*
-%{_kde4_libdir}/strigi/strigiea_dvi.so
-%{_kde4_libdir}/strigi/strigiea_tiff.so
-
+# blank
%files devel
-%defattr(-,root,root,-)
-%{_kde4_includedir}/libkdcraw/
-%{_kde4_includedir}/libkexiv2/
-%{_kde4_includedir}/libkipi/
-%if 0%{?sane}
-%{_kde4_includedir}/libksane/
-%endif
-%{_kde4_includedir}/okular/
-%{_kde4_libdir}/lib*.so
-%{_kde4_libdir}/cmake/KSane/
-%{_kde4_libdir}/cmake/Okular/
-%{_libdir}/pkgconfig/*.pc
-
-%files -n kio_msits
-%defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/kio_msits.so
-%{_kde4_datadir}/kde4/services/msits.protocol
+# blank
%changelog
-* Mon Jul 11 2011 Jaroslav Reznik <jreznik at redhat.com> - 7:4.6.95-1
+* Mon Jul 15 2011 Rex Dieter <rdieter at fedoraproject.org> 7:4.6.95-10
+- placeholder metapackage
+
+-* Mon Jul 11 2011 Jaroslav Reznik <jreznik at redhat.com> - 7:4.6.95-1
- 4.6.95 (rc2)
* Mon Jun 27 2011 Than Ngo <than at redhat.com> - 7:4.6.90-1
diff --git a/sources b/sources
index d82ef62..e69de29 100644
--- a/sources
+++ b/sources
@@ -1,16 +0,0 @@
-460f4a9a28406562626905319b623f18 gwenview-4.6.95.tar.bz2
-3ccca1d00ad22ffa8eb7a0fcf20e00be kamera-4.6.95.tar.bz2
-a6e056a7471cdc4491f57654d52fcd4a kcolorchooser-4.6.95.tar.bz2
-a0c71a2bd8b9a34c766df60e7e4087e0 kdegraphics-strigi-analyzer-4.6.95.tar.bz2
-703b1cc4f469ac2d8ec48304b7f13d22 kdegraphics-thumbnailers-4.6.95.tar.bz2
-c98e96de45b0f4026c4d6acadd809a58 kgamma-4.6.95.tar.bz2
-0da5882fb246c5dbeb8f8e0f3edbc946 kolourpaint-4.6.95.tar.bz2
-f164c3b47767a183a7c0573790bd2abe kruler-4.6.95.tar.bz2
-d1d5d52a7a50c2300f1bc7fe8c8653be ksaneplugin-4.6.95.tar.bz2
-94fd0a3909ef2076a8ad88bb0b4e4149 ksnapshot-4.6.95.tar.bz2
-f56c2278ab6d7800c79469912f3fd310 libkdcraw-4.6.95.tar.bz2
-22b0f97d850e1df1ca1b045ac4aedc6d libkexiv2-4.6.95.tar.bz2
-24b917b0fc4c1a9d0d053d8e8e36854b libkipi-4.6.95.tar.bz2
-64c5485c143a9fd83f815152e09747ac libksane-4.6.95.tar.bz2
-bde02f3faccc7688fd172b0b7ed05dff okular-4.6.95.tar.bz2
-cfcda81274ca05d7633acf7747ab1964 svgpart-4.6.95.tar.bz2
More information about the scm-commits
mailing list