rpms/magicor/devel magicor.desktop, 1.1, 1.2 magicor.spec, 1.2, 1.3 sources, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	magicor.desktop magicor.spec sources 
Log Message:
* Fri Nov 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-0.2.rc2
- New upstream release 1.0-rc2



Index: magicor.desktop
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/magicor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magicor.desktop	21 Oct 2006 20:11:54 -0000	1.1
+++ magicor.desktop	24 Nov 2006 16:00:28 -0000	1.2
@@ -7,4 +7,4 @@
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;LogicGame;
+Categories=Game;LogicGame;


Index: magicor.spec
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/magicor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- magicor.spec	2 Nov 2006 19:50:36 -0000	1.2
+++ magicor.spec	24 Nov 2006 16:00:28 -0000	1.3
@@ -1,15 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define pre_version rc1
+%define pre_version rc2
 
 Name:           magicor
 Version:        1.0
-Release:        0.1.%{pre_version}%{?dist}
+Release:        0.2.%{pre_version}%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://magicor.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz
+Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-source-%{version}-%{pre_version}.tar.gz
 Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
@@ -27,13 +27,11 @@
 
 %prep
 %setup -q -b 1 -n %{name}-%{version}-%{pre_version}
-sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
-sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
-  scripts/Magicor-LevelEditor.py
-sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/default.conf
+sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' *.py
+sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/*.conf
 
 
-# %build
+%build
 # nothing to build, python code + data only
 
 
@@ -44,10 +42,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 644 etc/default.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-install -m 644 etc/editor.glade $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 755 scripts/Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
-install -m 755 scripts/Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
+install -m 644 etc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 755 Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
+install -m 755 Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
 cp -fr magicor/* $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 cp -fr data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -55,7 +52,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   %{SOURCE2}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 %{SOURCE3} \
@@ -81,8 +77,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE README
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%doc LICENSE README
+%config(noreplace) %{_sysconfdir}/%{name}*.conf
 %{_bindir}/%{name}*
 %{python_sitelib}/%{name}
 %{_datadir}/%{name}
@@ -91,6 +87,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-0.2.rc2
+- New upstream release 1.0-rc2
+
 * Thu Nov  2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-0.1.rc1
 - New upstream release 1.0-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2006 19:50:36 -0000	1.3
+++ sources	24 Nov 2006 16:00:28 -0000	1.4
@@ -1,2 +1,2 @@
-ad3e7562cd7e0d6a443951a08c4ab94b  magicor-1.0-rc1.tar.gz
-9c58c3ec1d0638f6f40db5e723bedbc2  magicor-data-1.0-rc1.tar.gz
+bc2004e9d28268d00f286b5172781827  magicor-data-1.0-rc2.tar.gz
+8914ec1bcc05f05cc7c9a3d47993a2c8  magicor-source-1.0-rc2.tar.gz