rpms/PySolFC/F-11 .cvsignore, 1.2, 1.3 PySolFC.spec, 1.8, 1.9 sources, 1.2, 1.3 PySol.desktop, 1.2, NONE pysolfc-setup.py-noglade.patch, 1.1, NONE

[Stewart Adam]

Author: firewing

Update of /cvs/pkgs/rpms/PySolFC/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26529/F-11

Modified Files:
	.cvsignore PySolFC.spec sources 
Removed Files:
	PySol.desktop pysolfc-setup.py-noglade.patch 
Log Message:
* Sat Jan 30 2010 Stewart Adam <s.adam at diffingo.com> - 2.0-1
- Update to 2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PySolFC/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Oct 2007 02:17:52 -0000	1.2
+++ .cvsignore	31 Jan 2010 01:18:21 -0000	1.3
@@ -1 +1 @@
-PySolFC-1.1.tar.bz2
+PySolFC-2.0.tar.bz2


Index: PySolFC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PySolFC/F-11/PySolFC.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- PySolFC.spec	23 Feb 2009 22:35:35 -0000	1.8
+++ PySolFC.spec	31 Jan 2010 01:18:22 -0000	1.9
@@ -1,19 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define debug_package %{nil}
 
-%define cardsetversion 1.1
-
 Name:           PySolFC
-Version:        1.1
-Release:        8%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        A collection of solitare card games
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://pysolfc.sourceforge.net
 Source0:        http://downloads.sourceforge.net/pysolfc/%{name}-%{version}.tar.bz2
-Source1:        PySol.desktop
-Source2:        pysol-start-script
-Patch0:         pysolfc-setup.py-noglade.patch
+Source1:        pysol-start-script
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -36,7 +32,6 @@ written plug-ins, an integrated HTML hel
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -45,13 +40,13 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setu
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 # install desktop file
-desktop-file-install --vendor="fedora" \
+desktop-file-install --vendor="fedora" --delete-original \
     --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
-    %{SOURCE1}
+    $RPM_BUILD_ROOT/%{_datadir}/applications/pysol.desktop
 
 # install the startup wrapper
 mv $RPM_BUILD_ROOT%{_bindir}/pysol.py $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/pysol
+install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/pysol
 
 %find_lang pysol
 
@@ -68,10 +63,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pysol
 %{_datadir}/%{name}/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/*.png
 %{_datadir}/applications/fedora-*.desktop
 
 
 %changelog
+* Sat Jan 30 2010 Stewart Adam <s.adam at diffingo.com> - 2.0-1
+- Update to 2.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PySolFC/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Oct 2007 02:17:52 -0000	1.2
+++ sources	31 Jan 2010 01:18:22 -0000	1.3
@@ -1 +1 @@
-56aca8101b3534aaf3564c40ed6824f1  PySolFC-1.1.tar.bz2
+f9ee647947924efdf1d24af179d3cc0a  PySolFC-2.0.tar.bz2


--- PySol.desktop DELETED ---


--- pysolfc-setup.py-noglade.patch DELETED ---