rpms/redhat-artwork/devel redhat-artwork.spec,1.185,1.186

[Ray Strode (rstrode)]

Author: rstrode

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

Modified Files:
	redhat-artwork.spec 
Log Message:
- move kde stuff to subpackage (bug 239495)



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- redhat-artwork.spec	8 May 2007 19:58:49 -0000	1.185
+++ redhat-artwork.spec	9 May 2007 17:44:24 -0000	1.186
@@ -1,13 +1,10 @@
-
-# define to include kde widget/styles
-#define kde 1
 %define qtdir qt-3.3
 %define po_package redhat-artwork
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 7.0.0
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -17,14 +14,13 @@
 # Add a fedora metatheme
 Source5: index.theme
 Source6: index.theme.icon
-Patch0: redhat-artwork-5.0.12-kde.patch
 Group: User Interface/Desktops
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-root
 Conflicts: gtk-engines < 0.11-13
 Conflicts: gnome-session <= 2.0.1-3
-%{?kde:Conflicts: qt < 1:3.0.4-11}
-%{?kde:Conflicts: kdebase <= 6:3.0.3-1}
+Conflicts: qt < 1:3.0.4-11
+Conflicts: kdebase <= 6:3.0.3-1
 Conflicts: gdm <= 2.6.0.8-5
 Conflicts: redhat-menus < 5.5.5
 # we don't want to require gtk/qt
@@ -32,7 +28,7 @@
 
 BuildRequires: gtk2-devel >= 2.9.0
 BuildRequires: qt-devel >= 1:3.3.4-10
-%{?kde:BuildRequires: kdebase-devel >= 3.2.0}
+BuildRequires: kdebase-devel >= 3.2.0
 BuildRequires: xorg-x11-apps
 BuildRequires: icon-slicer >= 0.3-6
 BuildRequires: netpbm-progs
@@ -54,27 +50,26 @@
 # for gtk-update-icon-cache
 Requires(post): gtk2 >= 2.9.0
 
-
 %description
 redhat-artwork contains the themes and icons that make up the Red Hat default 
 look and feel.
 
+%package kde
+Summary: Artwork specific to KDE
+Group: User Interface/Desktops
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description kde
+redhat-artwork-kde contains artwork specific to KDE
+
 %prep
 %setup -q
 
 mkdir post-install
 (cd post-install; tar xzvf %{SOURCE2})
 
-%if "%{?kde}" != "1"
-%patch0 -p1 -b .kde
-%endif
-
-autoreconf
-
-
 %build
 
-%if "%{?kde}" == "1"
 ## this is apparently how Qt finds itself.
 ## they need pkg-config gospel.
 unset QTDIR
@@ -82,7 +77,6 @@
 . /etc/profile.d/qt.sh
 echo "QTDIR is $QTDIR"
 export QTDIR
-%endif
 
 export LANG=en_US.ISO-8859-1 ## workaround for intltool sucking in UTF-8
 %configure
@@ -430,8 +424,6 @@
 %ghost %{_datadir}/icons/Bluecurve/icon-theme.cache
 %{_datadir}/pixmaps/*
 %{_datadir}/xmms
-%{?kde:%{_libdir}/kde3}
-%{?kde:%{_datadir}/apps/kdm/themes/Bluecurve}
 %{_libdir}/gtk-2.0/2.10.0/engines/*
 %{_libdir}/%{qtdir}
 %config %{_sysconfdir}/gtk-2.0/gtkrc
@@ -439,8 +431,15 @@
 %{_datadir}/icons/Fedora/*
 %ghost %{_datadir}/icons/Fedora/icon-theme.cache
 
+%files kde
+%{_libdir}/kde3
+%{_datadir}/apps/kdm/themes/Bluecurve
+
 %changelog
-* Mon May  8 2007 Ray Strode <rstrode at redhat.com> 7.0.0-1
+* Wed May  9 2007 Ray Strode <rstrode at redhat.com> 7.0.0-2
+- move kde stuff to subpackage (bug 239495)
+
+* Tue May  8 2007 Ray Strode <rstrode at redhat.com> 7.0.0-1
 - change the default gdm theme to look better at low resolutions
 
 * Mon May  7 2007 Matthias Clasen <mclasen at redhat.com> 5.0.12-9