rpms/kdetoys/F-9 kdetoys-4.2.0-dt_fixes.patch, NONE, 1.1 kdetoys.spec, 1.30, 1.31 sources, 1.23, 1.24

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdetoys/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9023/F-9

Modified Files:
	kdetoys.spec sources 
Added Files:
	kdetoys-4.2.0-dt_fixes.patch 
Log Message:
KDE 4.2.1


kdetoys-4.2.0-dt_fixes.patch:

--- NEW FILE kdetoys-4.2.0-dt_fixes.patch ---
diff -up kdetoys-4.2.0/amor/amor.desktop.amor_categories kdetoys-4.2.0/amor/amor.desktop
--- kdetoys-4.2.0/amor/amor.desktop.amor_categories	2008-12-10 10:12:53.000000000 -0600
+++ kdetoys-4.2.0/amor/amor.desktop	2009-02-12 15:13:05.000000000 -0600
@@ -73,4 +73,4 @@ GenericName[zh_CN]=屏幕生物
 GenericName[zh_TW]=畫面擷取程式
 Terminal=false
 X-DBUS-StartupType=Unique
-Categories=Qt;KDE;Amusement;
+Categories=Qt;KDE;Game;Amusement;
diff -up kdetoys-4.2.0/kteatime/src/kteatime.desktop.amor_categories kdetoys-4.2.0/kteatime/src/kteatime.desktop
--- kdetoys-4.2.0/kteatime/src/kteatime.desktop.amor_categories	2008-12-10 10:12:53.000000000 -0600
+++ kdetoys-4.2.0/kteatime/src/kteatime.desktop	2009-02-12 15:13:43.000000000 -0600
@@ -74,5 +74,4 @@ Terminal=false
 X-DocPath=kteatime/index.html
 X-KDE-StartupNotify=true
 X-DBUS-StartupType=Multi
-Categories=Qt;KDE;Amusement;
-OnlyShowIn=KDE;
+Categories=Qt;KDE;Game;Amusement;


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-9/kdetoys.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kdetoys.spec	28 Jan 2009 16:08:52 -0000	1.30
+++ kdetoys.spec	27 Feb 2009 18:45:04 -0000	1.31
@@ -1,7 +1,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.2.0
+Version:        4.2.1
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -10,6 +10,9 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# upstreamable patches
+Patch50: kdetoys-4.2.0-dt_fixes.patch
+
 # need kdebase-workspace-devel for KTux
 BuildRequires: kdebase-workspace-devel >= %{version}
 
@@ -33,6 +36,8 @@
 %prep
 %setup -q
 
+%patch50 -p1 -b .dt_fixes
+
 
 %build
 
@@ -41,16 +46,18 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
 /sbin/ldconfig
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
@@ -76,6 +83,16 @@
 
 
 %changelog
+* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+- 4.2.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- amor.desktop,kteatime.desktop: Categories += Game
+- kteatime.desktop: drop OnlyShowIn=KDE
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-9/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	28 Jan 2009 16:08:52 -0000	1.23
+++ sources	27 Feb 2009 18:45:04 -0000	1.24
@@ -1 +1 @@
-3adf538297e5dca51f15186b4acd02ce  kdetoys-4.2.0.tar.bz2
+78cd751eb92ec2f068c8dc39794175e6  kdetoys-4.2.1.tar.bz2