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

[Michael Thomas (wart)]

Author: wart

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

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




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crossfire/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 May 2006 03:30:31 -0000	1.2
+++ .cvsignore	9 Jul 2006 21:14:18 -0000	1.3
@@ -1,2 +1,2 @@
-crossfire-1.9.0.arch.tar.gz
-crossfire-1.9.0.tar.gz
+crossfire-1.9.1.tar.gz
+crossfire-1.9.1.arch.tar.gz


Index: crossfire.spec
===================================================================
RCS file: /cvs/extras/rpms/crossfire/devel/crossfire.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crossfire.spec	17 May 2006 03:30:31 -0000	1.1
+++ crossfire.spec	9 Jul 2006 21:14:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name: crossfire
-Version: 1.9.0
-Release: 4%{?dist}
+Version: 1.9.1
+Release: 1%{?dist}
 Summary: Server for hosting crossfire games
 Group: Amusements/Games
 License: GPL
@@ -10,7 +10,6 @@
 Source2: crossfire.init
 Source3: crossfire.sysconfig
 Source4: crossfire.logrotate
-Patch0:  crossfire-1.9.0-plugin-io.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       crossfire-maps
 # BuildRequires necessary for the map editor
@@ -51,14 +50,14 @@
 %package devel
 Summary: Development files for writing crossfire plugins
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 %description devel
 Development files for writing crossfire plugins.
 
 %package plugins
 Summary: Plugin modules for the crossfire game server
 Group: Amusements/Games
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 %description plugins
 Plugin modules for the crossfire game server.
 
@@ -76,13 +75,13 @@
 %prep
 %setup -q
 %setup -q -a 1
-%patch0
 mv arch/ lib/
 
 %{__sed} -i 's#\r##' utils/player_dl.pl.in
 # Don't use a hardcoded /tmp directory for building the image archive
 %{__sed} -i "s#^\$TMPDIR=.*#\$TMPDIR=\"`pwd`\";#" lib/adm/collect_images.pl
 # Don't map stdio streams to /
+# This is fixed in CVS, but didn't make it into the 1.9.1 release.
 %{__sed} -i 's#    (void) open ("/", O_RDONLY);#    (void) open ("/var/log/crossfire/crossfire.log", O_RDONLY);#' server/daemon.c
 
 %build
@@ -90,6 +89,11 @@
 # put in /var/games/crossfire instead of /var/crossfire.  This is
 # in agreement with the FHS.
 %configure --localstatedir=%{_var}/games --disable-static
+
+# Yes, we do really need to run configure a second time.  The first time
+# won't enable crossedit due to a bootstrap bug:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1518321&group_id=13833&atid=113833
+%configure --localstatedir=%{_var}/games --disable-static
 make %{?_smp_mflags}
 
 # This will create a tarball of the images for the client.
@@ -221,6 +225,9 @@
 
 
 %changelog
+* Thu Jul 6 2006 Wart <wart at kobold.org> 1.9.1-1
+- Update to 1.9.1
+
 * Tue May 16 2006 Wart <wart at kobold.org> 1.9.0-4
 - Added -doc subpackage
 - Own /etc/crossfire


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossfire/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 May 2006 03:30:31 -0000	1.2
+++ sources	9 Jul 2006 21:14:18 -0000	1.3
@@ -1,2 +1,2 @@
-7685cc806a02a3f14336095de6066128  crossfire-1.9.0.arch.tar.gz
-43240af83a4414d2dcc19fff3af31a63  crossfire-1.9.0.tar.gz
+9444daefe1a457b4a18101c255be6cdc  crossfire-1.9.1.tar.gz
+83dfd11c565a76ea05e6be999862796d  crossfire-1.9.1.arch.tar.gz