rpms/kdeartwork-extras/devel kdeartwork-extras.spec,1.2,1.3

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdeartwork-extras.spec 
Log Message:
* Tue Jan 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.5-3
- -kxs subpkg (#220704)
- BR: libart_lgpl-devel 



Index: kdeartwork-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/kdeartwork-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdeartwork-extras.spec	27 Oct 2006 19:37:15 -0000	1.2
+++ kdeartwork-extras.spec	3 Jan 2007 04:08:24 -0000	1.3
@@ -1,9 +1,9 @@
 
-# Fedora Reviews:
+## Fedora Reviews:
 # core/icons - http://bugzilla.redhat.com/194279
 # extras - http://bugzilla.redhat.com/196379
 
-# NOTE: can only build *one* of the following at a time
+## NOTE: can only build *one* of the following at a time
 #  core:   kdeartwork
 #  extras: kdeartwork-extras
 #  icons:  kdeartwork-icons 
@@ -12,29 +12,55 @@
 #define icons 1
 
 Version: 3.5.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if "%{?core}" == "1"
 Name:    kdeartwork 
 Summary: Additional artwork (themes, sound themes, ...) for KDE 
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeartwork-%{version}.tar.bz2
+URL:     http://www.kde.org/
+License: GPL
+Group:   Amusements/Graphics
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: kdebase
 %endif
 
 %if "%{?extras}" == "1"
 Name:	 kdeartwork-extras
 Summary: Artwork Extras, including xscreensaver-based screensavers
-%define _with_xscreensaver --with-xscreensaver
-%define xsc xscreensaver-extras xscreensaver-gl-extras
-BuildRequires: %{xsc}
-Requires:      %{xsc} xscreensaver-base
+License: GPL
+Group:   Amusements/Graphics
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeartwork-%{version}.tar.bz2
+URL:     http://www.kde.org/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # split occured at 3.5.3-6
 Conflicts: kdeartwork < 3.5.3-6
 Requires: kdebase
+Requires: kdeartwork-kxs = %{version}-%{release}
+%define _with_xscreensaver --with-xscreensaver
+BuildRequires: xscreensaver-extras xscreensaver-gl-extras
+Requires:      xscreensaver-extras xscreensaver-gl-extras
+%description
+%{summary}.
+
+%package -n kdeartwork-kxs
+Summary: Support for xscreensaver-based screensavers
+Group: Amusements/Graphics
+Requires: xscreensaver-base
+%description -n kdeartwork-kxs
+%{summary}.
+
 %endif
 
 %if "%{?icons}" == "1"
 Name:    kdeartwork-icons
 Summary: Additional icon themes, including: ikons, kdeclassic, kids, Locolor, slick. 
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeartwork-%{version}.tar.bz2
+URL:     http://www.kde.org/
+License: GPL
+Group:   Amusements/Graphics
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 # included icon themes Inherits= from these
 #Requires: %{_datadir}/icons/hicolor/index.theme
 Requires: hicolor-icon-theme
@@ -47,18 +73,11 @@
 #AutoReq: no
 %endif
 
-License: GPL
-Group:   Amusements/Graphics
-URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeartwork-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-
 # kdeclassic missing Inherits=
-Patch1: kdeartwork-3.5.3-inherits.patch
+#Patch1: kdeartwork-3.5.3-inherits.patch
 
 BuildRequires: kdebase-devel >= 6:%{version}
-BuildRequires: gettext
+BuildRequires: libart_lgpl-devel
 
 ## upstream patches
 # fix GL issues, flickering, see http://bugs.kde.org/73813
@@ -70,7 +89,7 @@
 %prep
 %setup -q -n kdeartwork-%{version}
 
-%patch1 -p1 -b .inherits
+#patch1 -p1 -b .inherits
 
 
 %build
@@ -181,23 +200,24 @@
 
 %post
 for icon_theme in ikons kdeclassic kids Locolor slick ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  %{_bindir}/xdg-icon-resource forceupdate --theme ${icon_theme} 2> /dev/null || :
 done
 
 %postun
 for icon_theme in ikons kdeclassic kids Locolor slick ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  %{_bindir}/xdg-icon-resource forceupdate --theme ${icon_theme} 2> /dev/null || :
 done
 %endif
 
 %if "%{?extras:1}" == "1"
-%files -f kdeartwork.lang
+%files
 %defattr(-,root,root,-)
-%doc rpmdocs/kscreensaver/kxsconfig
-%{_bindir}/kxs*
 %{_datadir}/applnk/System/ScreenSavers/*.desktop
+
+%files -n kdeartwork-kxs
+%defattr(-,root,root,-)
+%doc rpmdocs/kscreensaver/kxs*
+%{_bindir}/kxs*
 %endif
 
 
@@ -206,6 +226,10 @@
 
 
 %changelog
+* Tue Jan 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.5-3
+- -kxs subpkg (#220704)
+- BR: libart_lgpl-devel 
+
 * Fri Oct 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.5-2
 - -extras: Requires: xscreensaver-base
 
@@ -216,7 +240,7 @@
 - -extras: %doc COPYING (use copy from kwin-styles/smooth-blend/COPYING)
 
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-4
-- -extras: drop (Build)Requires: xscreensaver-base
+- extras: drop (Build)Requires: xscreensaver-base
 
 * Sat Sep 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-3
 - use %%_foo style macros in %%changelog