rpms/kdeartwork/devel kdeartwork.spec,1.68,1.69

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Mar 20 19:11:51 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12117

Modified Files:
	kdeartwork.spec 
Log Message:
* Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-2
- -icons: Provides: *-icon-theme (Locolor, ikons, kdeclassic, kids, slick)
- include noarch build hooks (not enabled)



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdeartwork.spec	28 Feb 2008 17:48:05 -0000	1.68
+++ kdeartwork.spec	20 Mar 2008 19:11:10 -0000	1.69
@@ -1,7 +1,7 @@
 
 Name:           kdeartwork
 Version:        4.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
 License:        GPLv2
@@ -10,6 +10,12 @@
 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
+
 BuildRequires:  cmake
 BuildRequires:  kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -25,7 +31,6 @@
 %description
 Additional artwork (themes, sound themes, screensavers ...) for KDE.
 
-# FIXME/TODO: build this subpkg noarch
 %package icons-crystalsvg
 Summary: The crystalsvg icon theme
 Group: User Interface/Desktops
@@ -34,10 +39,14 @@
 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: Additional icon themes for KDE
+Summary: Additional icon themes
 Group: User Interface/Desktops
+Provides: Locolor-icon-theme = %{version}-%{release}
+Provides: ikons-icon-theme = %{version}-%{release}
+Provides: kdeclassic-icon-theme = %{version}-%{release}
+Provides: kids-icon-theme = %{version}-%{release}
+Provides: slick-icon-theme = %{version}-%{release} 
 %description icons
 This contains icon themes:
 * Locolor
@@ -75,20 +84,34 @@
 %{cmake_kde4} ..
 popd
 
+%if 0%{?rest}
 make %{?_smp_mflags} -C %{_target_platform}
+%endif
+
+%if 0%{?icons}
+make %{?_smp_mflags} -C %{_target_platform}/IconThemes
+%endif
 
 
 %install
 rm -rf %{buildroot}
 
-mkdir -p %{buildroot}
+%if 0%{?rest}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
+%endif
+
+%if 0%{?icons}
+make install DESTDIR=%{buildroot} -C %{_target_platform}/IconThemes
+%else
+rm -rf %{buildroot}%{_kde4_iconsdir}/
+%endif
 
 
 %clean
 rm -rf %{buildroot}
 
 
+%if 0%{?icons}
 %post icons
 %{_bindir}/xdg-icon-resource forceupdate --theme Locolor 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme ikons 2> /dev/null || :
@@ -108,8 +131,10 @@
 
 %postun icons-crystalsvg
 %{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
+%endif
 
 
+%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -120,6 +145,17 @@
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/kde4/plugins/styles/
 
+%files extras
+%defattr(-,root,root,-)
+%{_kde4_bindir}/*.kss
+%{_kde4_datadir}/kde4/services/ScreenSavers/*
+
+%files kxs
+%defattr(-,root,root,-)
+%{_bindir}/kxs*
+%endif
+
+%if 0%{?icons}
 %files icons
 %defattr(-,root,root,-)
 %{_kde4_iconsdir}/Locolor/
@@ -131,18 +167,14 @@
 %files icons-crystalsvg
 %defattr(-,root,root,-)
 %{_kde4_iconsdir}/crystalsvg/
-
-%files extras
-%defattr(-,root,root,-)
-%{_kde4_bindir}/*.kss
-%{_kde4_datadir}/kde4/services/ScreenSavers/*
-
-%files kxs
-%defattr(-,root,root,-)
-%{_bindir}/kxs*
+%endif
 
 
 %changelog
+* Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-2
+- -icons: Provides: *-icon-theme (Locolor, ikons, kdeclassic, kids, slick)
+- include noarch build hooks (not enabled)
+
 * Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.0.2-1
 - 4.0.2
 




More information about the fedora-extras-commits mailing list