rpms/kdetoys/FC-4 .cvsignore, 1.2, 1.3 kdetoys.spec, 1.1, 1.2 sources, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kdetoys/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9850

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
* Wed May 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 7:3.5.3-1
- kde-3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Mar 2006 01:57:53 -0000	1.2
+++ .cvsignore	21 Jul 2006 13:07:15 -0000	1.3
@@ -1 +1 @@
-kdetoys-3.5.1.tar.bz2
+kdetoys-3.5.3.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/FC-4/kdetoys.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdetoys.spec	9 Mar 2006 01:57:53 -0000	1.1
+++ kdetoys.spec	21 Jul 2006 13:07:15 -0000	1.2
@@ -1,30 +1,23 @@
 
-%define is_release 1 
-
 Summary: K Desktop Environment - Toys and Amusements
 Name: 	 kdetoys
 Group:	 Amusements/Graphics
 Epoch:	 7
-Version: 3.5.1
-Release: 3%{?dist}
+Version: 3.5.3
+Release: 1%{?dist}
 
 License: GPL
 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)
 
+BuildRequires: desktop-file-utils
 BuildRequires: kdelibs-devel >= 6:%{version}
 BuildRequires: gettext
-BuildRequires: desktop-file-utils
 
 ## Recommended, not (absolutely) required -- Rex
 #Requires(hint): kdebase >= 6:%{version}
 
-%if "%{is_release}" != "1"
-BuildRequires: automake
-%endif
-
-
 %description
 Includes: 
 * amor: Amusing Misuse Of Resources put's comic figures above your windows
@@ -45,20 +38,11 @@
 
 
 %prep
-%if "%{?is_release}" != "0"
 %setup -q -n %{name}-%{version}%{?beta}
-%else    
-%setup -q -n %{name}
-%endif
-
-%if "%{is_release}" != "1"
-  make -f admin/Makefile.common cvs
-%endif
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --includedir=%{_includedir}/kde \
@@ -66,8 +50,7 @@
   --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependancy-tracking --enable-final \
-  %{?debug:  --enable-debug --enable-warnings --disable-final } 
+  --disable-dependancy-tracking --enable-final 
 
 make %{?_smp_mflags}
 
@@ -79,17 +62,14 @@
 
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applnk/System/ScreenSavers \
-  --delete-original \
-  --vendor="kde" \
-  --add-category="X-Fedora" \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/System/ScreenSavers/*.desktop 
+  --add-category="X-Fedora" --vendor="" \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/System/ScreenSavers/*.desktop  ||:
 
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --vendor="" \
-  --add-category="X-Fedora" \
+  --add-category="X-Fedora" --vendor="" \
   --add-category="Application" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop ||:
 
 # replace absolute symlink with relative
 ln -nfs tips-en $RPM_BUILD_ROOT%{_datadir}/apps/amor/tips
@@ -120,7 +100,6 @@
 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 -f  $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
 
 
 %post
@@ -150,7 +129,13 @@
 
 
 %changelog
-* Mon Mar 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 7:3.3.5-3
+* Wed May 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 7:3.5.3-1
+- kde-3.5.3
+
+* Mon Mar 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 7:3.5.2-1
+- kde-3.5.2
+
+* Mon Mar 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 7:3.5.1-3
 - %%doc AUTHORS COPYING README
 - BR: gettext
 - drop %%{?debug_package} reference


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Mar 2006 01:57:53 -0000	1.2
+++ sources	21 Jul 2006 13:07:15 -0000	1.3
@@ -1 +1 @@
-d98d4f30a8aa6d43b0af06421d4d6586  kdetoys-3.5.1.tar.bz2
+dbce8029253a6151546e3016f299f4ef  kdetoys-3.5.3.tar.bz2