rpms/kdetoys/devel .cvsignore, 1.9, 1.10 kdetoys.spec, 1.10, 1.11 sources, 1.7, 1.8

[Rex Dieter (rdieter)]

Author: rdieter

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Jun 2007 21:49:09 -0000	1.9
+++ .cvsignore	13 Oct 2007 21:31:43 -0000	1.10
@@ -1,2 +1,3 @@
 clog
 kdetoys-3.5.7.tar.bz2
+kdetoys-3.5.8.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kdetoys.spec	20 Aug 2007 18:33:29 -0000	1.10
+++ kdetoys.spec	13 Oct 2007 21:31:43 -0000	1.11
@@ -3,8 +3,8 @@
 Name: 	 kdetoys
 Group:	 Amusements/Graphics
 Epoch:	 7
-Version: 3.5.7
-Release: 2%{?dist}
+Version: 3.5.8
+Release: 1%{?dist}
 
 License: GPLv2+
 Url:     http://www.kde.org/
@@ -12,7 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs-devel >= 6:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: gettext
 
 #Requires(hint): kdebase3 >= %{version}
@@ -52,30 +52,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
@@ -91,9 +91,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
@@ -119,10 +117,13 @@
 
 
 %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)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Jun 2007 21:49:09 -0000	1.7
+++ sources	13 Oct 2007 21:31:43 -0000	1.8
@@ -1 +1 @@
-946e58b53ac4e6374051736a0eb4cf92  kdetoys-3.5.7.tar.bz2
+b42c1f08e5c4ac93a04aadb75679139f  kdetoys-3.5.8.tar.bz2