rpms/kdebase-runtime/devel kdebase-runtime.spec,1.19,1.20

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11897

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-4
- oxygen-icon-theme, oxygen-icon-theme-scalable pkgs
- include noarch build hooks (not enabled)



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kdebase-runtime.spec	7 Mar 2008 23:42:48 -0000	1.19
+++ kdebase-runtime.spec	20 Mar 2008 19:07:38 -0000	1.20
@@ -9,7 +9,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.0.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -19,6 +19,13 @@
 Source1:       khelpcenter.desktop
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#ifarch noarch
+%define icons 1
+%define icons_svg 1
+#else
+%define rest 1
+#endif
+
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
 
@@ -32,8 +39,6 @@
 Requires: eject
 %endif
 
-Provides: oxygen-icon-theme = %{version}-%{release}
-
 BuildRequires: alsa-lib-devel
 BuildRequires: cmake
 BuildRequires: clucene-core-devel
@@ -65,6 +70,20 @@
 provided by KDE 3 because of file and configuration setting conflicts.
 %endif
 
+%package -n oxygen-icon-theme
+Summary: Oxygen icon theme
+Group: User Interface/Desktops
+%{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
+%description -n oxygen-icon-theme
+%{summary}.
+
+%package -n oxygen-icon-theme-scalable
+Summary: Oxygen icon theme, scalable(svg) icons
+Group: User Interface/Desktops
+Requires: oxygen-icon-theme = %{version}-%{release}
+%description -n oxygen-icon-theme-scalable
+%{summary}.
+
 
 %prep
 %setup -q -n kdebase-runtime-%{version}
@@ -77,20 +96,37 @@
 %{cmake_kde4} ..
 popd
 
+%if 0%{?rest}
 make %{?_smp_mflags} -C %{_target_platform}
+%endif
 
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
+
+%if 0%{?rest}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
+%endif
 
-# omit gigantic oxygen scalable/svg icons, for now -- Rex
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
+%if 0%{?icons}
+make install DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
+%else
+rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen
+%endif
 
 ## Unpackaged files
 rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
 
+%if 0%{?icons_svg}
+find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" > svg.list
+sed -e "s|^%{buildroot}||" svg.list > svg-include.list
+sed -e "s|^%{buildroot}|%exclude |" svg.list > svg-exclude.list
+%else
+find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | \
+  xargs --no-run-if-empty rm -fv
+%endif
+
+%if 0%{?rest}
 %if 0%{?kde3_desktop}
 # remove files which conflict with KDE 3
 rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
@@ -170,6 +206,7 @@
 #       so we can't use desktop-file-install for it.
 install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop
 %endif
+%endif
 
 
 %clean
@@ -179,16 +216,31 @@
 %post
 /sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
+%if 0%{?icons}
+%post -n oxygen-icon-theme
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
+%postun -n oxygen-icon-theme
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%endif
+
+%if 0%{?icons_svg}
+%post -n oxygen-icon-theme-scalable
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
+%postun -n oxygen-icon-theme-scalable
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%endif
+
+
+%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
@@ -197,7 +249,6 @@
 %{_kde4_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/services/*
-%{_kde4_iconsdir}/oxygen/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/*
@@ -221,9 +272,25 @@
 %{_kde4_datadir}/locale/l10n/*/entry.desktop
 %{_datadir}/services/khelpcenter.desktop
 %endif
+%endif
+
+%if 0%{?icons}
+%files -n oxygen-icon-theme %{?icons_svg:-f svg-exclude.list}
+%defattr(-,root,root,-)
+%{_kde4_iconsdir}/oxygen/
+
+%if 0%{?icons_svg}
+%files -n oxygen-icon-theme-scalable -f svg-include.list
+%defattr(-,root,root,-)
+%endif
+%endif
 
 
 %changelog
+* Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-4
+- oxygen-icon-theme, oxygen-icon-theme-scalable pkgs
+- include noarch build hooks (not enabled)
+
 * Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-3
 - BR libxcb-devel everywhere (including F7)