rpms/kdeartwork/F-9 .cvsignore, 1.45, 1.46 kdeartwork.spec, 1.90, 1.91 sources, 1.51, 1.52

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
sync from devel/ for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	5 Nov 2008 17:24:56 -0000	1.45
+++ .cvsignore	2 Apr 2009 14:50:56 -0000	1.46
@@ -1 +1 @@
-kdeartwork-4.1.3.tar.bz2
+kdeartwork-4.2.2.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/kdeartwork.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- kdeartwork.spec	27 Feb 2009 15:29:20 -0000	1.90
+++ kdeartwork.spec	2 Apr 2009 14:50:56 -0000	1.91
@@ -1,7 +1,7 @@
 Name:           kdeartwork
-Version:        4.2.1
-Release:        1%{?dist}
-Summary:        Additional artwork (themes, sound themes, ...) for KDE
+Version:        4.2.2
+Release:        3%{?dist}
+Summary:        Additional artwork for KDE
 
 License:        GPLv2
 Group:          User Interface/Desktops
@@ -9,29 +9,26 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#ifarch noarch
-%define icons 1
-#else
-%define rest 1
-#endif
-
 # We currently don't ship crystalsvg from kdeartwork because the actions have
 # been partially renamed to KDE 4 names, making the theme useless for KDE 3 apps
 # and yet not yet useful for KDE 4.
 # TODO: Revisit this issue once the renaming is complete. -- Kevin
 #define include_crystalsvg 1
 
+BuildRequires:  eigen2-devel
 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}
 
+%if 0%{fedora} < 11
+# upgrade path
+Requires: %{name}-sounds = %{version}-%{release}
+Requires: %{name}-wallpapers = %{version}-%{release}
+%endif
+
 %description
-Additional artwork (themes, sound themes, screensavers ...) for KDE.
+%{summary}, including additional styles, themes.
 
 %if 0%{?include_crystalsvg}
 %package -n crystalsvg-icon-theme
@@ -39,30 +36,34 @@
 Group: User Interface/Desktops
 Obsoletes: kdeartwork-icons-crystalsvg < %{version}-%{release}
 Provides:  kdeartwork-icons-crystalsvg = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n crystalsvg-icon-theme
 This package contains the crystalsvg icon theme.
 It was the standard theme in KDE3 and is needed for KDE3 applications.
 %endif
 
-%package icons
-Summary: Additional icon themes
+%package -n kdeclassic-icon-theme 
+Summary: KDE classic icon theme 
 Group: User Interface/Desktops
-Provides: kdeclassic-icon-theme = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-%description icons
-This contains icon themes:
-* kdeclassic
+Obsoletes: kdeartwork-icons < 4.2.2-3
+Provides:  kdeartwork-icons = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n kdeclassic-icon-theme 
+%{summary}.
 
-%package extras
-Summary: Artwork Extras, including xscreensaver-based screensavers
+%package screensavers 
+Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
+Obsoletes: kdeartwork-extras < 4.2.2-3
+Provides:  kdeartwork-extras = %{version}-%{release}
 BuildRequires: xscreensaver-extras xscreensaver-gl-extras
 Requires:      xscreensaver-extras xscreensaver-gl-extras
 Requires: %{name}-kxs = %{version}-%{release}
-%description extras
+%description screensavers 
 %{summary}.
 
 %package kxs
@@ -73,102 +74,139 @@
 %description kxs
 %{summary}.
 
+%package wallpapers
+Summary: Additional wallpapers
+Group: Amusements/Graphics
+Requires: kde-filesystem
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description wallpapers
+%{summary}.
+
+%package sounds
+Summary: Additional sounds
+Group: Amusements/Graphics
+Requires: kde-filesystem
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description sounds
+%{summary}.
+
 
 %prep
 %setup -q
 
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-%if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
-%endif
-
-%if 0%{?icons}
-make %{?_smp_mflags} -C %{_target_platform}/IconThemes
-%endif
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%endif
 
-%if 0%{?icons}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/IconThemes
 %if ! 0%{?include_crystalsvg}
 rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg/
 %endif
-%else
-rm -rf %{buildroot}%{_kde4_iconsdir}/
-%endif
+
 
 %clean
 rm -rf %{buildroot}
 
 
-%if 0%{?icons}
-%post icons
-%{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
+%post -n kdeclassic-icon-theme 
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+
+%posttrans -n kdeclassic-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+
+%postun -n kdeclassic-icon-theme 
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+fi
 
 %if 0%{?include_crystalsvg}
 %post -n crystalsvg-icon-theme
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%endif
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 
-%postun icons
-%{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
+%posttrans -n crystalsvg-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 
-%if 0%{?include_crystalsvg}
 %postun -n crystalsvg-icon-theme
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%endif
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 %endif
 
 
-%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_kde4_appsdir}/*
+%{_kde4_appsdir}/color-schemes/*.colors
+%{_kde4_appsdir}/desktoptheme/
+%{_kde4_appsdir}/kstyle/
 %{_kde4_datadir}/emoticons/*
-%{_kde4_datadir}/sounds/*
-%{_kde4_datadir}/wallpapers/*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/styles/
+%{_kde4_libdir}/kde4/plugins/styles/*.so
 
-%files extras
+%if 0%{?include_crystalsvg}
+%files -n crystalsvg-icon-theme
 %defattr(-,root,root,-)
-%{_kde4_bindir}/*.kss
-%{_kde4_datadir}/kde4/services/ScreenSavers/*
+%{_kde4_iconsdir}/crystalsvg/
+%endif
+
+%files -n kdeclassic-icon-theme 
+%defattr(-,root,root,-)
+%{_kde4_iconsdir}/kdeclassic/
 
 %files kxs
 %defattr(-,root,root,-)
-%{_bindir}/kxs*
-%endif
+%{_kde4_bindir}/kxsconfig
+%{_kde4_bindir}/kxsrun
 
-%if 0%{?icons}
-%files icons
+%files screensavers 
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/kdeclassic/
+%{_kde4_appsdir}/kfiresaver/
+%{_kde4_appsdir}/kscreensaver/
+%{_kde4_bindir}/*.kss
+%{_kde4_datadir}/kde4/services/ScreenSavers/*
 
-%if 0%{?include_crystalsvg}
-%files -n crystalsvg-icon-theme
+%files sounds
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/crystalsvg/
-%endif
-%endif
+%{_kde4_datadir}/sounds/*
+
+%files wallpapers
+%defattr(-,root,root,-)
+%{_kde4_datadir}/wallpapers/*
 
 
 %changelog
-* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- optimize scriptlets
+- omit (unused) noarch hacks, use f10+ support
+- -extras -> -screensavers rename
+- -icons -> kdeclassic-icon-theme rename
+- main pkg, Requires: -wallpapers, -sounds (upgrade path)
+- -wallpapers, -sounds: drop Req: kdebase-workspace
+- BR: eigen2-devel
+
+* Tue Mar 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.2-2
+- split wallpapers and sounds
+- noarch subpackages
+
+* Mon Mar 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	27 Feb 2009 15:29:20 -0000	1.51
+++ sources	2 Apr 2009 14:50:56 -0000	1.52
@@ -1 +1 @@
-2712142e1cd452f6ada441a310a971d6  kdeartwork-4.2.1.tar.bz2
+2315d64bb543decdb602b01376f5fc1e  kdeartwork-4.2.2.tar.bz2