rpms/kdegames/devel kdegames.spec,1.141,1.142

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29292

Modified Files:
	kdegames.spec 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- Conflicts: kdegames3 < 3.5.10-6
- %check: desktop-file-validate
- use %?_isa in -libs deps



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- kdegames.spec	31 Jul 2009 21:17:21 -0000	1.141
+++ kdegames.spec	5 Aug 2009 15:53:26 -0000	1.142
@@ -2,7 +2,7 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -12,6 +12,9 @@ Patch0:  kdegames-4.3.0-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# KSnakeDuel moved here from kdegames3
+Conflicts: kdegames3 < 3.5.10-6
+
 Obsoletes: kdegames4 < %{version}-%{release}
 Provides:  kdegames4 = %{version}-%{release}
 
@@ -21,12 +24,13 @@ Provides:  ksudoku = 1:0.5-1
 Obsoletes: ksirk < %{version}-%{release}
 Provides:  ksirk = %{version}-%{release}
 
+BuildRequires: desktop-file-utils
 BuildRequires: ggz-client-libs-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: qca2-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if "%{?_ggz_version}" < "0.99.5"
 %define _skip_ggzconfig -DSKIP_GGZCONFIG=1
@@ -80,7 +84,7 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Header files for compiling KDE 4 game applications
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: kdegames4-devel < %{version}-%{release}
 Provides:  kdegames4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -115,6 +119,12 @@ install -m644 -p -D ./ksquares/src/modul
 %endif
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 %if 0%{?_skip_ggzconfig:1}
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
@@ -197,6 +207,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- Conflicts: kdegames3 < 3.5.10-6
+- %%check: desktop-file-validate
+- use %%?_isa in -libs deps
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0