rpms/magicor/devel .cvsignore, 1.6, 1.7 magicor.spec, 1.5, 1.6 sources, 1.7, 1.8

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7948

Modified Files:
	.cvsignore magicor.spec sources 
Log Message:
* Wed Jul  9 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-1
- New upstream release 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Dec 2007 19:37:50 -0000	1.6
+++ .cvsignore	9 Jul 2008 07:30:35 -0000	1.7
@@ -1,2 +1,2 @@
-magicor-source-1.1-rc1.tar.gz
-magicor-data-1.1-rc1.tar.gz
+magicor-source-1.1.tar.gz
+magicor-data-1.1.tar.gz


Index: magicor.spec
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/magicor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- magicor.spec	12 Dec 2007 19:37:50 -0000	1.5
+++ magicor.spec	9 Jul 2008 07:30:35 -0000	1.6
@@ -1,16 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define pre_version rc1
-
 Name:           magicor
 Version:        1.1
-Release:        0.1.%{pre_version}%{?dist}
+Release:        1%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://magicor.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-source-%{version}-%{pre_version}.tar.gz
-Source1:        http://downloads.sourceforge.net/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-source-%{version}.tar.gz
+Source1:        http://downloads.sourceforge.net/%{name}/%{name}-data-%{version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,7 +24,7 @@
 
 
 %prep
-%setup -q -b 1 -n %{name}-%{version}-%{pre_version}
+%setup -q -b 1
 sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' *.py
 sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/*.conf
 
@@ -87,6 +85,9 @@
 
 
 %changelog
+* Wed Jul  9 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-1
+- New upstream release 1.1
+
 * Wed Dec 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-0.1.rc1
 - New upstream release 1.1-rc1
 - Add python as BuildRequires so that %%python_sitelib gets expanded properly,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Dec 2007 19:37:50 -0000	1.7
+++ sources	9 Jul 2008 07:30:35 -0000	1.8
@@ -1,2 +1,2 @@
-10f005bf8bb70bade2d8280451a75dca  magicor-source-1.1-rc1.tar.gz
-4a6fbd10ae7b08adcdbcc4d5f8d10207  magicor-data-1.1-rc1.tar.gz
+0ba83ba61ec7db1a0d4fed6b937ae527  magicor-source-1.1.tar.gz
+b681fc820d0f900120a87ae6163ee777  magicor-data-1.1.tar.gz