rpms/kdeartwork-extras/devel .cvsignore, 1.3, 1.4 kdeartwork-extras.spec, 1.4, 1.5 sources, 1.3, 1.4

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdeartwork-extras.spec sources 
Log Message:
* Tue Jan 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.6-2
- kde-3.5.6
- drop extraneous specfile crud



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Oct 2006 19:37:15 -0000	1.3
+++ .cvsignore	22 Feb 2007 17:06:18 -0000	1.4
@@ -1,2 +1,3 @@
 kdeartwork-3.5.4.tar.bz2
 kdeartwork-3.5.5.tar.bz2
+kdeartwork-3.5.6.tar.bz2


Index: kdeartwork-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/kdeartwork-extras.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdeartwork-extras.spec	30 Jan 2007 20:03:31 -0000	1.4
+++ kdeartwork-extras.spec	22 Feb 2007 17:06:18 -0000	1.5
@@ -3,36 +3,19 @@
 # core/icons - http://bugzilla.redhat.com/194279
 # extras - http://bugzilla.redhat.com/196379
 
-## NOTE: can only build *one* of the following at a time
-#  core:   kdeartwork
-#  extras: kdeartwork-extras
-#  icons:  kdeartwork-icons 
-#define core 1
-%define extras 1
-#define icons 1
-
-Version: 3.5.5
-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
+Version: 3.5.6
+Release: 2%{?dist}
+
 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)
+
+BuildRequires: kdebase-devel >= 6:%{version}
+
 # split occured at 3.5.3-6
 Conflicts: kdeartwork < 3.5.3-6
 Requires: kdebase
@@ -50,38 +33,9 @@
 %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
-Requires: %{_datadir}/icons/default/index.theme
-## Consider making .noarch someday...  -- Rex
-#BuildArch: noarch
-## these speed the build process a wee bit
-#define debug_package %{nil}
-#define __spec_install_post %{nil}
-#AutoReq: no
-%endif
-
 BuildRequires: kdebase-devel >= 6:%{version}
 BuildRequires: libart_lgpl-devel
 
-## upstream patches
-# fix GL issues, flickering, see http://bugs.kde.org/73813
-
-%description
-%{summary}.
-
 
 %prep
 %setup -q -n kdeartwork-%{version}
@@ -90,10 +44,6 @@
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
 
-%if "%{?icons:1}" != "1"
-export DO_NOT_COMPILE="$DO_NOT_COMPILE IconThemes"
-%endif
-
 %configure \
   --includedir=%{_includedir}/kde \
   --with-extra-libs=%{_libdir} \
@@ -104,107 +54,22 @@
   --disable-dependency-tracking --enable-final \
   %{?_with_xscreensaver} %{!?_with_xscreensaver:--without-xscreensaver}
 
-%if "%{?core:1}" == "1"
-make %{?_smp_mflags}
-%endif
-
-%if "%{?extras:1}" == "1"
 make %{?_smp_mflags} -C kscreensaver/kxsconfig
-%endif
-
-
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if "%{?core:1}" == "1"
-make install DESTDIR=$RPM_BUILD_ROOT
-%endif
-
-%if "%{?extras:1}" == "1"
 make install DESTDIR=$RPM_BUILD_ROOT -C kscreensaver/kxsconfig
-%endif
-
-%if "%{?icons:1}" == "1"
-make install DESTDIR=$RPM_BUILD_ROOT -C IconThemes
-%endif
 
 # rpmdocs
-for dir in IconThemes/* kscreensaver/kxsconfig kworldclock ; do
+for dir in kscreensaver/kxsconfig ; do
   for file in AUTHORS ChangeLog COPYRIGHT README TODO ; do
     test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
   done
 done
 
-## File lists
-# locale's
-%find_lang kdeartwork || touch kdeartwork.lang
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> kdeartwork.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done  
-fi  
-
 
-%if "%{?core:1}" == "1"
-%files -f kdeartwork.lang
-%defattr(-,root,root,-)
-%doc kwin-styles/smooth-blend/COPYING
-%doc rpmdocs/kworldclock
-%{_bindir}/*
-%{_libdir}/kde3/plugins/styles/*
-%{_libdir}/kde3/*.so
-%{_libdir}/kde3/*.la
-%{_datadir}/applnk/System/ScreenSavers/*.desktop
-%{_datadir}/apps/kfiresaver/
-%{_datadir}/apps/kscreensaver/
-%{_datadir}/apps/kstyle/themes/*
-%{_datadir}/apps/kwin/*
-# note: kworldclock is from kdetoys
-%{_datadir}/apps/kworldclock/
-%{_datadir}/sounds/*
-%{_datadir}/wallpapers/*
-%{_datadir}/emoticons/*
-%endif
-
-%if "%{?icons:1}" == "1"
-%files 
-%defattr(-,root,root,-)
-%doc kwin-styles/smooth-blend/COPYING
-%doc rpmdocs/IconThemes/*
-# own until something else sane, like filesystem, does 
-# see rh bug http://bugzilla.redhat.com/bugzilla/195911
-#dir %{_datadir}/icons
-%{_datadir}/icons/ikons/
-%{_datadir}/icons/kdeclassic/
-%{_datadir}/icons/kids/
-%{_datadir}/icons/Locolor/
-%{_datadir}/icons/slick/
-
-%post
-for icon_theme in ikons kdeclassic kids Locolor slick ; do
-  %{_bindir}/xdg-icon-resource forceupdate --theme ${icon_theme} 2> /dev/null || :
-done
-
-%postun
-for icon_theme in ikons kdeclassic kids Locolor slick ; do
-  %{_bindir}/xdg-icon-resource forceupdate --theme ${icon_theme} 2> /dev/null || :
-done
-%endif
-
-%if "%{?extras:1}" == "1"
 %files
 %defattr(-,root,root,-)
 %{_datadir}/applnk/System/ScreenSavers/*.desktop
@@ -213,7 +78,6 @@
 %defattr(-,root,root,-)
 %doc rpmdocs/kscreensaver/kxs*
 %{_bindir}/kxs*
-%endif
 
 
 %clean   
@@ -221,6 +85,10 @@
 
 
 %changelog
+* Tue Jan 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.6-2
+- kde-3.5.6
+- drop extraneous specfile crud
+
 * Tue Jan 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.5-3
 - -kxs subpkg (#220704)
 - BR: libart_lgpl-devel 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Oct 2006 19:37:15 -0000	1.3
+++ sources	22 Feb 2007 17:06:18 -0000	1.4
@@ -1 +1 @@
-8d35156b506cf870eb9641f72a304c8c  kdeartwork-3.5.5.tar.bz2
+4c817eab517fba30fce8f3b40a6f019d  kdeartwork-3.5.6.tar.bz2