rpms/kdetoys/FC-6 kdetoys.spec,1.7,1.8

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32482

Modified Files:
	kdetoys.spec 
Log Message:
* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.8-1
- kde-3.5.8



Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/FC-6/kdetoys.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdetoys.spec	13 Apr 2007 14:13:23 -0000	1.7
+++ kdetoys.spec	7 Dec 2007 16:11:14 -0000	1.8
@@ -3,10 +3,10 @@
 Name: 	 kdetoys
 Group:	 Amusements/Graphics
 Epoch:	 7
-Version: 3.5.6
-Release: 3%{?dist}
+Version: 3.5.8
+Release: 1%{?dist}
 
-License: GPL
+License: GPLv2+
 Url:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdetoys-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,8 +15,9 @@
 BuildRequires: kdelibs-devel >= 6:%{version}
 BuildRequires: gettext
 
-## for directory ownership, but otherwise not (absolutely) required -- Rex
+%if 0%{?fedora} < 7
 Requires: kdebase >= 6:%{version}
+%endif
 
 %description
 Includes: 
@@ -53,30 +54,30 @@
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf "%{buildroot}"
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 desktop-file-install \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applnk/System/ScreenSavers \
+  --dir=%{buildroot}%{_datadir}/applnk/System/ScreenSavers \
   --vendor="" \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/System/ScreenSavers/*.desktop ||:
+  %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ||:
 
 desktop-file-install \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --dir=%{buildroot}%{_datadir}/applications/kde \
   --vendor="" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop ||:
+  %{buildroot}%{_datadir}/applications/kde/*.desktop ||:
 
 # replace absolute symlink with relative
-ln -nfs tips-en $RPM_BUILD_ROOT%{_datadir}/apps/amor/tips
+ln -nfs tips-en %{buildroot}%{_datadir}/apps/amor/tips
 
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.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 %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
@@ -92,9 +93,7 @@
 
 ## Unpackaged files
 # not sure the point of just one header file 'AmorIface.h', omit (for now).
-rm -rf $RPM_BUILD_ROOT%{_includedir}
-# la files, keep, they're just loadable modules, not shared libs
-#rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -rf %{buildroot}%{_includedir}
 
 
 %post
@@ -120,10 +119,20 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.8-1
+- kde-3.5.8
+
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-2
+- License: GPLv2+
+- drop Requires: kdebase (kde-filesystem helps here) (f7+)
+
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-1
+- kde-3.5.7
+
 * Fri Apr 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.6-3
 - Requires: kdebase (for directory ownership)