diff --git a/.cvsignore b/.cvsignore index bf68994..0dcbf28 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -kdeartwork-3.5.7.tar.bz2 -kdeartwork-3.5.8.tar.bz2 +kdeartwork-3.97.0.tar.bz2 diff --git a/kdeartwork.spec b/kdeartwork.spec index 281555d..ef5eacd 100644 --- a/kdeartwork.spec +++ b/kdeartwork.spec @@ -1,50 +1,60 @@ -## Conditional build: -%define _with_xscreensaver --with-xscreensaver - -%define debug 0 -%define final 1 - -Name: kdeartwork -Summary: Additional artwork (themes, sound themes, ...) for KDE -Version: 3.5.8 -Release: 1%{?dist} - -License: GPLv2 -URL: http://www.kde.org/ -Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 - -Source1: webcollagerc - -BuildRequires: gettext -BuildRequires: kdebase3-devel >= %{version} -BuildRequires: libart_lgpl-devel - -Requires: kdebase3 >= %{version} +Name: kdeartwork +Version: 3.97.0 +Release: 1%{?dist} +Summary: Additional artwork (themes, sound themes, ...) for KDE + +License: GPLv2 +Group: User Interface/Desktops +URL: http://www.kde.org/ +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: cmake +BuildRequires: kde-filesystem >= 4 +%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } +BuildRequires: kdelibs4-devel >= %{version} +BuildRequires: kdebase-workspace-devel >= %{version} + +# FIXME/TODO: are there other explicit Requires? +Requires(post): xdg-utils +Requires(postun): xdg-utils +Requires: kdelibs4 >= %{version} +Requires: kdebase-workspace >= %{version} %description Additional artwork (themes, sound themes, screensavers ...) for KDE. -# TODO: build this subpkg noarch +# FIXME/TODO: build this subpkg noarch +%package icons-crystalsvg +Summary: The crystalsvg icon theme +Group: User Interface/Desktops +Provides: crystalsvg-icon-theme = %{version}-%{release} +%description icons-crystalsvg +This package contains the crystalsvg icon theme. +It was the standard theme in KDE3 and is needed for KDE3 applications. + +# FIXME/TODO: build this subpkg noarch %package icons -Summary: icon themes (kdeclassic, slick ....) for KDE +Summary: Additional icon themes for KDE Group: User Interface/Desktops %description icons -The kdeartwork-icons package contains icon themes (kdeclassic, slick ...) -for KDE. +This contains icon themes: +* Locolor +* ikons +* kdeclassic +* kids +* slick -%if "%{?_with_xscreensaver:1}" == "1" %package extras Summary: Artwork Extras, including xscreensaver-based screensavers Group: Amusements/Graphics -Requires: kdebase3 >= %{version} +Requires: kdebase-workspace >= %{version} BuildRequires: xscreensaver-extras xscreensaver-gl-extras Requires: xscreensaver-extras xscreensaver-gl-extras Requires: %{name}-kxs = %{version}-%{release} %description extras -The kdeartwork-extras contains xscreensaver-based screensavers. +%{summary}. %package kxs Summary: Support for xscreensaver-based screensavers @@ -52,121 +62,113 @@ Group: Amusements/Graphics Requires: xscreensaver-base %description kxs %{summary}. -%endif %prep %setup -q + %build -unset QTDIR || : ; . /etc/profile.d/qt.sh - -%configure \ - --disable-rpath \ - --enable-new-ldflags \ - --disable-dependency-tracking \ -%if %{debug} == 0 - --disable-debug \ - --disable-warnings \ -%endif -%if %{final} - --enable-final \ -%endif - %{?_with_xscreensaver} %{!?_with_xscreensaver:--without-xscreensaver} - -make %{?_smp_mflags} + +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake_kde4} .. +popd + +make %{?_smp_mflags} -C %{_target_platform} + %install rm -rf %{buildroot} -make install DESTDIR="%{buildroot}" - -# webcollage -root -directory /usr/share/backgrounds/images #227683 -%if "%{?_with_xscreensaver:1}" == "1" -install -p -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/config/webcollagerc -%endif - -# rpmdocs -for dir in IconThemes/* kworldclock kscreensaver/kxsconfig ; do - for file in AUTHORS ChangeLog COPYRIGHT README TODO ; do - test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" - done -done - -# File lists -%find_lang kdeartwork || touch kdeartwork.lang -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> kdeartwork.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi +mkdir -p %{buildroot} +make install DESTDIR=%{buildroot} -C %{_target_platform} + + +%clean +rm -rf %{buildroot} + %post icons -for i in locolor ikons kdeclassic kids slick ; do - touch --no-create %{_datadir}/icons/$i 2>/dev/null || : - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : -done +%{_bindir}/xdg-icon-resource forceupdate --theme Locolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme ikons 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme kids 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme slick 2> /dev/null || : + +%post icons-crystalsvg +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : %postun icons -for i in locolor ikons kdeclassic kids slick ; do - touch --no-create %{_datadir}/icons/$i 2>/dev/null || : - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : -done +%{_bindir}/xdg-icon-resource forceupdate --theme Locolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme ikons 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme kids 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme slick 2> /dev/null || : -%clean -rm -rf %{buildroot} +%postun icons-crystalsvg +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : -%files -f kdeartwork.lang + +%files %defattr(-,root,root,-) -%doc kwin-styles/smooth-blend/COPYING -%doc rpmdocs/kworldclock -%{_bindir}/*.kss -%{_libdir}/kde3/plugins/styles/* -%{_libdir}/kde3/*.so -%{_libdir}/kde3/*.la -%{_datadir}/applnk/System/ScreenSavers/*.desktop -%{_datadir}/apps/kfiresaver/ -%{_datadir}/apps/kscreensaver/ -%{_datadir}/apps/kstyle/themes/* -%{_datadir}/apps/kwin/* -%{_datadir}/apps/kworldclock/ -%{_datadir}/sounds/* -%{_datadir}/wallpapers/* -%{_datadir}/emoticons/* +%doc COPYING README +%{_kde4_appsdir}/* +%{_kde4_datadir}/emoticons/* +%{_kde4_datadir}/sounds/* +%{_kde4_datadir}/wallpapers/* +%{_kde4_libdir}/kde4/* %files icons %defattr(-,root,root,-) -%doc rpmdocs/IconThemes/* -%{_datadir}/icons/ikons/ -%{_datadir}/icons/kdeclassic/ -%{_datadir}/icons/kids/ -%{_datadir}/icons/Locolor/ -%{_datadir}/icons/slick/ - -%if "%{?_with_xscreensaver:1}" == "1" +%{_kde4_iconsdir}/Locolor/ +%{_kde4_iconsdir}/ikons/ +%{_kde4_iconsdir}/kdeclassic/ +%{_kde4_iconsdir}/kids/ +%{_kde4_iconsdir}/slick/ + +%files icons-crystalsvg +%defattr(-,root,root,-) +%{_kde4_iconsdir}/crystalsvg/ + %files extras %defattr(-,root,root,-) -%{_datadir}/applnk/System/ScreenSavers/*.desktop -%config(noreplace) %{_datadir}/config/*rc +%{_kde4_bindir}/*.kss +%{_kde4_datadir}/kde4/services/ScreenSavers/* %files kxs %defattr(-,root,root,-) -%doc rpmdocs/kscreensaver/kxs* %{_bindir}/kxs* -%endif %changelog +* Mon Dec 10 2007 Rex Dieter 3.97.0-1 +- kde-3.97.0 +- touchup for cvs import +- rework subpkg names a bit + +* Fri Nov 30 2007 Sebastian Vahl 3.96.2-1 +- kde-3.96.2 + +* Fri Nov 23 2007 Sebastian Vahl 3.96.1-1 +- kde-3.96.1 + +* Mon Nov 19 2007 Sebastian Vahl 3.96.0-5 +- put crystalsvg-icon-theme in it's own subpkg + +* Mon Nov 19 2007 Sebastian Vahl 3.96.0-4 +- BR: kde-filesystem >= 4 + +* Sun Nov 18 2007 Sebastian Vahl 3.96.0-3 +- BR: libXtst-devel +- Require kdebase-workspace not kdebase-workspace-devel + +* Sun Nov 18 2007 Sebastian Vahl 3.96.0-2 +- kdeartwork-icons: Provide: crystalsvg-icon-theme + +* Sun Nov 18 2007 Sebastian Vahl 3.96.0-1 +- Initial version for Fedora + * Sat Oct 13 2007 Rex Dieter 3.5.8-1 - kde-3.5.8 diff --git a/sources b/sources index 115529a..39299ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03becf82a233e6007e9372ffa5756d0b kdeartwork-3.5.8.tar.bz2 +def225e9f8c6c0f2d488935909d8a9f8 kdeartwork-3.97.0.tar.bz2 diff --git a/webcollagerc b/webcollagerc deleted file mode 100644 index fc90145..0000000 --- a/webcollagerc +++ /dev/null @@ -1,3 +0,0 @@ -[directory] -Value=/usr/share/backgrounds/images/ -