rpms/poker2d/F-8 .cvsignore, 1.6, 1.7 poker2d.spec, 1.8, 1.9 sources, 1.6, 1.7 poker2d-1.0.37-py25.patch, 1.1, NONE

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/poker2d/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20999/F-8

Modified Files:
	.cvsignore poker2d.spec sources 
Removed Files:
	poker2d-1.0.37-py25.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poker2d/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Oct 2007 22:18:28 -0000	1.6
+++ .cvsignore	24 Mar 2008 20:21:48 -0000	1.7
@@ -1 +1 @@
-poker-network-1.2.0.tar.gz
+poker-network-1.4.0.tar.gz


Index: poker2d.spec
===================================================================
RCS file: /cvs/extras/rpms/poker2d/F-8/poker2d.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- poker2d.spec	22 Oct 2007 21:02:37 -0000	1.8
+++ poker2d.spec	24 Mar 2008 20:21:48 -0000	1.9
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           poker2d
-Version:        1.2.0
-Release:        3%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        GTK poker client to play on a poker-network server
 
 Group:          Amusements/Games
@@ -14,11 +14,15 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils hicolor-icon-theme ImageMagick gettext
-BuildRequires:  python-devel poker-engine-devel >= 1.0.21
+BuildRequires:  apg python-devel poker-engine-devel >= 1.0.21
 BuildRequires:  glib2-devel libglade2-devel pygtk2-devel pygtk2-libglade
 BuildRequires:  MySQL-python python-twisted-web pyOpenSSL libtool gettext-devel
 Requires:       python-simplejson, pygame, %{name}-common = %{version}-%{release}
 
+# Obsolete kde subpackage (bz #434936)
+Provides: %{name}-kde = %{version}-%{release}
+Obsoletes: %{name}-kde < 1.4.0-1
+
 %description
 Play poker with other players connected on a poker-network server
 (holdem, omaha, omaha high/low, stud 7 ...) in ring games, sit and go
@@ -45,16 +49,6 @@
 %{name}.
 
 
-%package kde
-Summary:        KDE specific files for poker2d
-Group:          Amusements/Games
-Requires:       %{name} = %{version}-%{release}
-Requires:       kdebase
-
-%description kde
-%{summary}.
-
-
 %prep
 %setup -qn poker-network-%{version}
 %patch0 -p0 -b .configure~
@@ -102,6 +96,11 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
 install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 
+# We own a directory owned by kdebase because it's more user-friendly
+# this way as opposed to creating a new rpm for a single file.
+# See bz #434936
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/khotkeys
+
 # convert icons to png format
 convert $RPM_BUILD_ROOT%{_datadir}/pixmaps/poker2D.xpm \
     $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
@@ -197,6 +196,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 %{python_sitelib}/pokerclient2d
 %{python_sitearch}/_pokerinterface*
+# Share directory with kdebase (bz #434936)
+%dir %{_datadir}/apps/khotkeys
+%{_datadir}/apps/khotkeys/*.khotkeys
 
 %files common -f %{name}.lang
 %defattr(-,root,root,-)
@@ -208,13 +210,16 @@
 %doc COPYING
 %{_libdir}/pkgconfig/poker-network.pc
 
-%files kde
-%defattr(-,root,root,-)
-%doc COPYING
-%{_datadir}/apps/khotkeys/*.khotkeys
-
 
 %changelog
+* Mon Mar 24 2008 Christopher Stone <chris.stone at gmail.com> 1.4.0-1
+- Upstream sync
+- Add apg to BuildRequires
+- Remove kde subpackage (bz #434936)
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.0-4
+- Autorebuild for GCC 4.3
+
 * Mon Oct 22 2007 Christopher Stone <chris.stone at gmail.com> 1.2.0-3
 - Fix up BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poker2d/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Oct 2007 22:18:28 -0000	1.6
+++ sources	24 Mar 2008 20:21:48 -0000	1.7
@@ -1 +1 @@
-91a66e24cf5a804653d39bdcc48a3fd8  poker-network-1.2.0.tar.gz
+45b3bf50a6708d8ab826ca02c7b86e68  poker-network-1.4.0.tar.gz


--- poker2d-1.0.37-py25.patch DELETED ---