rpms/kdeartwork-extras/FC-6 .cvsignore, 1.2, 1.3 kdeartwork-extras.spec, 1.2, 1.3 sources, 1.2, 1.3 kdeartwork-3.5.3-inherits.patch, 1.1, NONE

Tue Jan 30 20:03:10 UTC 2007

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18745

Modified Files:
	.cvsignore kdeartwork-extras.spec sources 
Removed Files:
	kdeartwork-3.5.3-inherits.patch 
Log Message:
kdeartwork-3.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	2 Oct 2006 14:54:31 -0000	1.2
+++ .cvsignore	30 Jan 2007 20:02:40 -0000	1.3
@@ -1 +1,2 @@
 kdeartwork-3.5.4.tar.bz2
+kdeartwork-3.5.5.tar.bz2


Index: kdeartwork-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/FC-6/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:19:47 -0000	1.2
+++ kdeartwork-extras.spec	30 Jan 2007 20:02:40 -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 
@@ -11,32 +11,56 @@
 %define extras 1
 #define icons 1
 
-Version: 3.5.4
-Release: 6%{?dist}
+Version: 3.5.5
+Release: 3%{?dist}
 
 %if "%{?core}" == "1"
 Name:    kdeartwork 
 Summary: Additional artwork (themes, sound themes, ...) for KDE 
-# For (kde) opengl screensavers, workaround http://bugzilla.redhat.com/193741
-#BuildRequires: libGL-devel libGLU-devel
+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
@@ -49,17 +73,8 @@
 #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
-
 BuildRequires: kdebase-devel >= 6:%{version}
+BuildRequires: libart_lgpl-devel
 
 ## upstream patches
 # fix GL issues, flickering, see http://bugs.kde.org/73813
@@ -71,8 +86,6 @@
 %prep
 %setup -q -n kdeartwork-%{version}
 
-%patch1 -p1 -b .inherits
-
 
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
@@ -182,23 +195,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
 
 
@@ -207,14 +221,21 @@
 
 
 %changelog
-* Fri Oct 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-6
+* 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
 
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.5-1
+- 3.5.5
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-5
 - -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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2006 14:54:31 -0000	1.2
+++ sources	30 Jan 2007 20:02:40 -0000	1.3
@@ -1 +1 @@
-c7ff9048b9b68c976de08ed418598e40  kdeartwork-3.5.4.tar.bz2
+8d35156b506cf870eb9641f72a304c8c  kdeartwork-3.5.5.tar.bz2


--- kdeartwork-3.5.3-inherits.patch DELETED ---


