rpms/crossfire-maps/devel .cvsignore, 1.2, 1.3 crossfire-maps.spec, 1.1, 1.2 sources, 1.2, 1.3

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/crossfire-maps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3597

Modified Files:
	.cvsignore crossfire-maps.spec sources 
Log Message:
Update to 1.9.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crossfire-maps/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 May 2006 16:53:47 -0000	1.2
+++ .cvsignore	10 Jul 2006 02:06:31 -0000	1.3
@@ -1 +1 @@
-crossfire-1.9.0-1.maps.tar.gz
+crossfire-1.9.1.maps.tar.gz


Index: crossfire-maps.spec
===================================================================
RCS file: /cvs/extras/rpms/crossfire-maps/devel/crossfire-maps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crossfire-maps.spec	16 May 2006 16:53:47 -0000	1.1
+++ crossfire-maps.spec	10 Jul 2006 02:06:31 -0000	1.2
@@ -1,26 +1,20 @@
 Name:           crossfire-maps
-Version:        1.9.0        
+Version:        1.9.1
 Release:        1%{?dist}
 Summary:        Map files for the crossfire server
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://crossfire.real-time.com
-Source0:        http://dl.sourceforge.net/crossfire/crossfire-%{version}-1.maps.tar.gz
+Source0:        http://dl.sourceforge.net/crossfire/crossfire-%{version}.maps.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+Obsoletes:      crossfire-maps-devel = 1.9.0
+Provides:       crossfire-maps-devel
 
 %description
 Map files for the crossfire server.
 
-%package devel
-Summary: Development tools for writing crossfire maps
-Group: Development/Libraries
-Requires: %{name} = %{version}
-%description devel
-Development tools for writing crossfire maps.
-
-
 %prep
 %setup -q -c -n %{name}-%{version}
 chmod -x maps/python/IPO/README
@@ -28,7 +22,6 @@
 chmod -x maps/scorn/misc/beginners2
 chmod -x maps/styles/monsterstyles/sylvan/*
 chmod -x maps/planes/*
-chmod -x maps/unlinked/casino/*
 chmod -x maps/pup_land/s_f/*
 chmod -x maps/pup_land/ancient/castle/*
 chmod -x maps/pup_land/ancient/volcano/*
@@ -43,8 +36,6 @@
 %{__sed} -i 's/\r//' maps/templates/keep/keep_b.tpl
 %{__sed} -i 's/\r//' maps/templates/keep/keep_roof.tpl
 
-rm -f maps/:!
-
 %build
 # Nothing to build!
 
@@ -53,6 +44,7 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/crossfire
 cp -a maps $RPM_BUILD_ROOT%{_datadir}/crossfire/
+rm -f $RPM_BUILD_ROOT%{_datadir}/crossfire/maps/COPYING
 
 
 %clean
@@ -61,16 +53,14 @@
 
 %files
 %defattr(-,root,root,-)
+%doc maps/COPYING
 %{_datadir}/crossfire/maps
-%exclude %{_datadir}/crossfire/maps/Info
-%exclude %{_datadir}/crossfire/maps/templates
-
-%files devel
-%defattr(-,root,root,-)
-%{_datadir}/crossfire/maps/Info
-%{_datadir}/crossfire/maps/templates
-
 
 %changelog
+* Thu Jul 6 2006 Wart <wart at kobold.org> 1.9.1-1
+- Update to 1.9.1, which now includes a license file.
+- Obsolete the -devel subpackage since upstream now requires some of the
+  map devel files for non-devel purposes.
+
 * Thu Mar 9 2006 Wart <wart at kobold.org> 1.9.0-1
 - Initial spec file following Fedora Extras conventions


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossfire-maps/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 May 2006 16:53:47 -0000	1.2
+++ sources	10 Jul 2006 02:06:31 -0000	1.3
@@ -1 +1 @@
-265c4dfdbdedaa2c565ea831f5f74a0c  crossfire-1.9.0-1.maps.tar.gz
+9e3b54a64d74c60acd3b7a1c4532ccd1  crossfire-1.9.1.maps.tar.gz