From d3f9d9d7261084ca2680694cdaa19ae85054f992 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 14 2007 14:52:30 +0000 Subject: - License: GPLv2 - Obsoletes: -extras(-libs) - cleanup BR's, scriptlets - omit devel symlink hacks --- diff --git a/kdegraphics.spec b/kdegraphics.spec index 23afa1e..e753d93 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -4,23 +4,18 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 3.97.0 -Release: 4%{?dist} +Release: 5%{?dist} Name: kdegraphics Obsoletes: kdegraphics4 < %{version}-%{release} Provides: kdegraphics4 = %{version}-%{release} -# kdegraphics now includes gwenview(2) -Obsoletes: gwenview < 2 -Provides: gwenview >= 2 Group: Applications/Multimedia -License: GPLv2+ +License: GPLv2 URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegraphics-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: lpr - BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} BuildRequires: cmake @@ -35,27 +30,26 @@ BuildRequires: pcre-devel BuildRequires: poppler-qt4-devel BuildRequires: qimageblitz-devel BuildRequires: sane-backends-devel -# FIXME/TODO: These ones could be removed when they will be required by kdelibs4-devel (which happens soon) -BuildRequires: libXcomposite-devel -BuildRequires: libXdamage-devel -BuildRequires: libxkbfile-devel -BuildRequires: libXv-devel -BuildRequires: libXxf86misc-devel -BuildRequires: libXScrnSaver-devel -BuildRequires: libXpm-devel -BuildRequires: libXtst-devel # FIXME/TODO: are there other explicit Requires? %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } Requires: kdelibs4 >= %{version} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: oxygen-icon-theme -Requires(post): /sbin/ldconfig xdg-utils -Requires(postun): /sbin/ldconfig xdg-utils +# okular requires lpr (?) +Requires: lpr +Requires(post): xdg-utils +Requires(postun): xdg-utils + +Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release} + +# include gwenview(2), FIXME/TODO: file bug against gwenview to EOL it +Obsoletes: gwenview < 2 +Provides: gwenview = 2 %description -Graphics applications for the K Desktop Environment, including +Graphics applications, including * gwenview (an image viewer) * kamera (digital camera support) * kcolorchooser (a color chooser) @@ -67,19 +61,20 @@ Graphics applications for the K Desktop Environment, including %package libs Summary: Runtime libraries for %{name} Group: System Environment/Libraries +Obsoletes: %{name}-libs-extras < %{?epoch:%{epoch}:}%{version}-%{release} %description libs %{summary}. - %package devel Group: Development/Libraries -Summary: Header files for %{name} +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 %description devel -Header files for developing applications using %{name}. +%{summary}. + %prep %setup -q -n kdegraphics-%{version} @@ -98,27 +93,8 @@ make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} -mkdir %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} -mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel -pushd %{buildroot}%{_kde4_libdir} -for i in lib*.so -do - case "$i" in - libkdeinit4_*.so) - ;; - # libspectreOkular.so is no symlink - libspectreOkular.so) - ;; - *) - linktarget=`readlink "$i"` - rm -f "$i" - ln -sf "../../$linktarget" "kde4/devel/$i" - ;; - esac -done -popd %clean rm -rf %{buildroot} @@ -140,7 +116,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc COPYING COPYING-DOCS README +%doc COPYING README %{_kde4_bindir}/* %{_kde4_appsdir}/okular/ %{_kde4_configdir}/* @@ -149,35 +125,41 @@ rm -rf %{buildroot} %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/* %{_kde4_docdir}/HTML/en/okular/ -%{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_appsdir}/gvpart/ %{_kde4_appsdir}/gwenview/ %{_kde4_appsdir}/kolourpaint4/ %{_kde4_appsdir}/kruler/ %{_kde4_appsdir}/svgpart/* -%{_kde4_datadir}/dbus-1/interfaces/* +%{_datadir}/dbus-1/interfaces/* %{_kde4_docdir}/HTML/en/kamera/ %{_kde4_docdir}/HTML/en/ksnapshot/ %{_kde4_docdir}/HTML/en/kolourpaint4/ %{_kde4_docdir}/HTML/en/kruler/ +%{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/*/* +%{_kde4_libdir}/libkdeinit*.so %files libs %defattr(-,root,root,-) -%doc COPYING %{_kde4_libdir}/lib*.so.* -%{_kde4_libdir}/libspectreOkular.so %{_kde4_libdir}/kde4/* -%exclude %{_kde4_libdir}/kde4/devel/ %{_kde4_libdir}/strigi/* - %files devel %defattr(-,root,root,-) %{_kde4_includedir}/okular/ -%{_kde4_libdir}/kde4/devel/* +%{_kde4_libdir}/lib*.so +%exclude %{_kde4_libdir}/libspectreOkular.so +%exclude %{_kde4_libdir}/libkdeinit*.so + %changelog +* Fri Dec 14 2007 Rex Dieter 3.97.0-5 +- License: GPLv2 +- Obsoletes: -extras(-libs) +- cleanup BR's, scriptlets +- omit devel symlink hacks + * Tue Dec 11 2007 Kevin Kofler 3.97.0-4 - rebuild for changed _kde4_includedir