-diff -durN crossfire-0.98.0.orig/Makefile.in crossfire-0.98.0/Makefile.in
---- crossfire-0.98.0.orig/Makefile.in Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/Makefile.in Tue Apr 17 09:34:56 2001
-@@ -124,7 +124,7 @@
+--- crossfire-1.3.0/random_maps/Makefile.in.wiget Tue Jul 2 01:18:12 2002
++++ crossfire-1.3.0/random_maps/Makefile.in Mon Jul 8 21:19:04 2002
+@@ -125,10 +125,10 @@
+ @echo $(SRCS) > .patchlist
- install::
- @if [ ! -d ${prefix} ]; then \
-- $(MKDIR) -p ${prefix}; \
-+ $(MKDIR) -p $(DESTDIR)${prefix}; \
+ install:: random_map
+- @if [ ! -d ${bindir} ]; then \
+- $(MKDIR) -p ${bindir}; \
++ @if [ ! -d $(DESTDIR)${bindir} ]; then \
++ $(MKDIR) -p $(DESTDIR)${bindir}; \
fi
- @for dir in $(SUBDIRS); \
- do \
-diff -durN crossfire-0.98.0.orig/crossedit/Makefile.in crossfire-0.98.0/crossedit/Makefile.in
---- crossfire-0.98.0.orig/crossedit/Makefile.in Sun Apr 8 07:49:35 2001
-+++ crossfire-0.98.0/crossedit/Makefile.in Tue Apr 17 09:34:56 2001
-@@ -151,7 +151,7 @@
+- $(INSTALL) random_map ${bindir}/random_map
++ $(INSTALL) random_map $(DESTDIR)${bindir}/random_map
- install:: crossedit
+
+--- crossfire-1.3.0/server/Makefile.in.wiget Tue Jul 2 01:18:12 2002
++++ crossfire-1.3.0/server/Makefile.in Mon Jul 8 21:19:04 2002
+@@ -139,7 +139,7 @@
+ @echo $(SRCS) > .patchlist
+
+ install:: crossfire
- @if [ ! -d ${bindir} ]; then \
- $(MKDIR) -p ${bindir}; \
+ @if [ ! -d $(DESTDIR)${bindir} ]; then \
+ $(MKDIR) -p $(DESTDIR)${bindir}; \
fi
-- $(INSTALL) crossedit ${bindir}/crossedit
-+ $(INSTALL) crossedit $(DESTDIR)${bindir}/crossedit
-diff -durN crossfire-0.98.0.orig/doc/Makefile.in crossfire-0.98.0/doc/Makefile.in
---- crossfire-0.98.0.orig/doc/Makefile.in Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/doc/Makefile.in Tue Apr 17 09:34:56 2001
-@@ -76,8 +76,8 @@
- $(RM) -rf $(DTOP)
-
- install::
-- @if [ ! -d $(MAN1) ]; then \
-- $(MKDIR) -p $(MAN1); \
-+ @if [ ! -d $(DESTDIR)$(MAN1) ]; then \
-+ $(MKDIR) -p $(DESTDIR)$(MAN1); \
- fi
-- $(INSTALL) $(srcdir)/crossedit.man $(MAN1)/crossedit.$(MANSUFFIX)
-- $(INSTALL) $(srcdir)/crossfire.man $(MAN1)/crossfire.$(MANSUFFIX)
-+ $(INSTALL) $(srcdir)/crossedit.man $(DESTDIR)$(MAN1)/crossedit.$(MANSUFFIX)
-+ $(INSTALL) $(srcdir)/crossfire.man $(DESTDIR)$(MAN1)/crossfire.$(MANSUFFIX)
-diff -durN crossfire-0.98.0.orig/lib/Makefile.in crossfire-0.98.0/lib/Makefile.in
---- crossfire-0.98.0.orig/lib/Makefile.in Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/lib/Makefile.in Tue Apr 17 09:41:10 2001
-@@ -110,43 +110,43 @@
+- $(INSTALL) crossfire ${bindir}/crossfire
++ $(INSTALL) crossfire $(DESTDIR)${bindir}/crossfire
+--- crossfire-1.3.0/lib/Makefile.in.wiget Tue Jul 2 01:18:12 2002
++++ crossfire-1.3.0/lib/Makefile.in Mon Jul 8 21:25:19 2002
+@@ -131,58 +131,58 @@
make collect
- install:: archetypes bmaps.paths crossfire.xbm crossfire.xpm crossfire.png animations collect.pl xpmtopix.pl util.pl
+ install:: archetypes bmaps.paths crossfire.0 faces animations collect.pl util.pl
- @if [ ! -d $(datadir) ]; then \
- $(MKDIR) -p $(datadir); \
+ @if [ ! -d $(DESTDIR)$(datadir) ]; then \
+ $(MKDIR) -p $(DESTDIR)$(localdir); \
fi
-- if [ ! -d $(datadir)/help ]; then \
+- @if [ ! -d $(datadir)/help ]; then \
- echo "Creating directory $(datadir)/help"; \
- $(MKDIR) -p $(datadir)/help; \
-+ if [ ! -d $(DESTDIR)$(datadir)/help ]; then \
++ @if [ ! -d $(DESTDIR)$(datadir)/help ]; then \
+ echo "Creating directory $(DESTDIR)$(datadir)/help"; \
+ $(MKDIR) -p $(DESTDIR)$(datadir)/help; \
fi;
- $(INSTALL) $(INSTALLFLAGS) $$i $(datadir)/help; \
+ $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(datadir)/help; \
done
+- @if [ ! -d $(datadir)/wizhelp ]; then \
+- echo "Creating directory $(datadir)/wizhelp"; \
+- $(MKDIR) -p $(datadir)/wizhelp; \
++ @if [ ! -d $(DESTDIR)$(datadir)/wizhelp ]; then \
++ echo "Creating directory $(DESTDIR)$(datadir)/wizhelp"; \
++ $(MKDIR) -p $(DESTDIR)$(datadir)/wizhelp; \
+ fi;
+ @for i in $(FILES_WIZHELP); do \
+ echo "Installing $$i"; \
+- $(INSTALL) $(INSTALLFLAGS) $$i $(datadir)/wizhelp; \
++ $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(datadir)/wizhelp; \
+ done
@for i in $(INSTALLFILES); do \
echo "Installing $$i"; \
- $(INSTALL) $(INSTALLFLAGS) $$i $(datadir); \
+ $(INSTALL) $(INSTALLFLAGS) settings $(DESTDIR)$(datadir); \
fi
+ @for i in $(INSTALLNEWFILES); do \
+- if [ ! -f $(datadir)/$$i ]; then \
++ if [ ! -f $(DESTDIR)$(datadir)/$$i ]; then \
+ echo "Installing $$i"; \
+- $(INSTALL) $(INSTALLFLAGS) $$i $(datadir); \
++ $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(datadir); \
+ fi \
+ done
+
- touch $(localdir)/highscore
- touch $(localdir)/bookarch
- touch $(localdir)/temp.maps
fi; \
done
-diff -durN crossfire-0.98.0.orig/random_maps/Makefile.in crossfire-0.98.0/random_maps/Makefile.in
---- crossfire-0.98.0.orig/random_maps/Makefile.in Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/random_maps/Makefile.in Tue Apr 17 09:34:56 2001
-@@ -122,10 +122,10 @@
- @echo $(SRCS) > .patchlist
-
- install:: random_map
-- @if [ ! -d ${bindir} ]; then \
-- $(MKDIR) -p ${bindir}; \
-+ @if [ ! -d $(DESTDIR)${bindir} ]; then \
-+ $(MKDIR) -p $(DESTDIR)${bindir}; \
- fi
-- $(INSTALL) random_map ${bindir}/random_map
-+ $(INSTALL) random_map $(DESTDIR)${bindir}/random_map
-
-
-
-diff -durN crossfire-0.98.0.orig/server/Makefile.in crossfire-0.98.0/server/Makefile.in
---- crossfire-0.98.0.orig/server/Makefile.in Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/server/Makefile.in Tue Apr 17 09:34:56 2001
-@@ -139,7 +139,7 @@
- @echo $(SRCS) > .patchlist
-
- install:: crossfire
-- @if [ ! -d ${bindir} ]; then \
-- $(MKDIR) -p ${bindir}; \
-+ @if [ ! -d $(DESTDIR)${bindir} ]; then \
-+ $(MKDIR) -p $(DESTDIR)${bindir}; \
- fi
-- $(INSTALL) crossfire ${bindir}/crossfire
-+ $(INSTALL) crossfire $(DESTDIR)${bindir}/crossfire
-diff -durN crossfire-0.98.0.orig/utils/Makefile.in crossfire-0.98.0/utils/Makefile.in
---- crossfire-0.98.0.orig/utils/Makefile.in Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/utils/Makefile.in Tue Apr 17 09:34:56 2001
-@@ -20,20 +20,20 @@
+--- crossfire-1.3.0/utils/Makefile.in.wiget Tue Jul 2 01:18:21 2002
++++ crossfire-1.3.0/utils/Makefile.in Mon Jul 8 21:27:34 2002
+@@ -20,22 +20,22 @@
$(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
install:
- rm -f $(bindir)/crossloop.pl
- sed s%BINDIR%$(bindir)%g <crossloop.pl >$(bindir)/crossloop.pl
- chmod 755 $(bindir)/crossloop.pl
-- rm -f $(C_BINDIR)/crossloop
+- rm -f $(bindir)/crossloop
- sed s%BINDIR%$(bindir)%g <crossloop >$(bindir)/crossloop
- chmod 755 $(bindir)/crossloop
- $(INSTALL) $(INSTALLFLAGS) mktable.script $(bindir)/mktable
- $(INSTALL) $(INSTALLFLAGS) add_throw.perl $(bindir)/add_throw
+- @if [ ! -f $(bindir)/crossloop.web ]; then \
+- $(INSTALL) $(INSTALLFLAGS) crossloop.web $(bindir)/crossloop.web; \
+ rm -f $(DESTDIR)$(bindir)/flushlocks
+ sed s%xxxx%$(libdir)%g <flushlocks > $(DESTDIR)$(bindir)/flushlocks
+ chmod 755 $(DESTDIR)$(bindir)/flushlocks
+ rm -f $(DESTDIR)$(bindir)/crossloop.pl
+ sed s%BINDIR%$(bindir)%g <crossloop.pl >$(DESTDIR)$(bindir)/crossloop.pl
+ chmod 755 $(DESTDIR)$(bindir)/crossloop.pl
-+ rm -f $(DESTDIR)$(C_BINDIR)/crossloop
++ rm -f $(DESTDIR)$(bindir)/crossloop
+ sed s%BINDIR%$(bindir)%g <crossloop >$(DESTDIR)$(bindir)/crossloop
+ chmod 755 $(DESTDIR)$(bindir)/crossloop
+ $(INSTALL) $(INSTALLFLAGS) mktable.script $(DESTDIR)$(bindir)/mktable
+ $(INSTALL) $(INSTALLFLAGS) add_throw.perl $(DESTDIR)$(bindir)/add_throw
++ @if [ ! -f $(DESTDIR)$(bindir)/crossloop.web ]; then \
++ $(INSTALL) $(INSTALLFLAGS) crossloop.web $(DESTDIR)$(bindir)/crossloop.web; \
+ fi
depend::
+--- crossfire-1.3.0/doc/Makefile.in.wiget Tue Jul 2 01:18:21 2002
++++ crossfire-1.3.0/doc/Makefile.in Mon Jul 8 21:19:04 2002
+@@ -106,8 +106,8 @@
+ $(RM) -rf $(DTOP)
+
+ install::
+- @if [ ! -d $(MAN1) ]; then \
+- $(MKDIR) -p $(MAN1); \
++ @if [ ! -d $(DESTDIR)$(MAN1) ]; then \
++ $(MKDIR) -p $(DESTDIR)$(MAN1); \
+ fi
+- $(INSTALL) $(srcdir)/crossedit.man $(MAN1)/crossedit.$(MANSUFFIX)
+- $(INSTALL) $(srcdir)/crossfire.man $(MAN1)/crossfire.$(MANSUFFIX)
++ $(INSTALL) $(srcdir)/crossedit.man $(DESTDIR)$(MAN1)/crossedit.$(MANSUFFIX)
++ $(INSTALL) $(srcdir)/crossfire.man $(DESTDIR)$(MAN1)/crossfire.$(MANSUFFIX)
+--- crossfire-1.3.0/crossedit/Makefile.in.wiget Tue Jul 2 01:18:22 2002
++++ crossfire-1.3.0/crossedit/Makefile.in Mon Jul 8 21:19:04 2002
+@@ -150,7 +150,7 @@
+
+
+ install:: crossedit
+- @if [ ! -d ${bindir} ]; then \
+- $(MKDIR) -p ${bindir}; \
++ @if [ ! -d $(DESTDIR)${bindir} ]; then \
++ $(MKDIR) -p $(DESTDIR)${bindir}; \
+ fi
+- $(INSTALL) crossedit ${bindir}/crossedit
++ $(INSTALL) crossedit $(DESTDIR)${bindir}/crossedit
+--- crossfire-1.3.0/Makefile.in.wiget Tue Jul 2 01:18:12 2002
++++ crossfire-1.3.0/Makefile.in Mon Jul 8 21:19:04 2002
+@@ -124,7 +124,7 @@
+
+ install::
+ @if [ ! -d ${prefix} ]; then \
+- $(MKDIR) -p ${prefix}; \
++ $(MKDIR) -p $(DESTDIR)${prefix}; \
+ fi
+ @for dir in $(SUBDIRS); \
+ do \
+--- crossfire-1.3.0/plugin/Makefile.in.destdir Mon Jul 8 21:43:03 2002
++++ crossfire-1.3.0/plugin/Makefile.in Mon Jul 8 21:44:19 2002
+@@ -65,12 +65,12 @@
+ # as such, if plugin target is set, then we install, otherwise
+ # we don't do anything.
+ install:
+- @if [ ! -d $(CROSSFIRE_PATH)/plugins ]; then \
+- echo "Creating directory $(CROSSFIRE_PATH)/plugins"; \
+- $(MKDIR) -p $(CROSSFIRE_PATH)/plugins; \
++ @if [ ! -d $(DESTDIR)$(CROSSFIRE_PATH)/plugins ]; then \
++ echo "Creating directory $(DESTDIR)$(CROSSFIRE_PATH)/plugins"; \
++ $(MKDIR) -p $(DESTDIR)$(CROSSFIRE_PATH)/plugins; \
+ fi
+ @if [ "X$(PLUGIN_TARGET)" != "X" ]; then \
+- $(INSTALL) plugin_python.so.0.1 $(CROSSFIRE_PATH)/plugins; \
++ $(INSTALL) plugin_python.so.0.1 $(DESTDIR)$(CROSSFIRE_PATH)/plugins; \
+ fi
+ plugin_python.so.0.1: $(OBJS) ../common/libcross.a
-diff -durN crossfire-0.98.0.orig/include/config.h crossfire-0.98.0/include/config.h
---- crossfire-0.98.0.orig/include/config.h Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/include/config.h Tue Apr 17 17:10:55 2001
-@@ -680,7 +680,7 @@
+diff -durN crossfire-1.1.0.orig/include/config.h crossfire-1.1.0/include/config.h
+--- crossfire-1.1.0.orig/include/config.h Wed Mar 20 07:36:53 2002
++++ crossfire-1.1.0/include/config.h Fri Mar 22 13:23:04 2002
+@@ -654,7 +654,7 @@
#ifdef WIN32 /* change define path */
#define LOGFILE "tmp\\cross.log"
#else
#endif
#endif
-@@ -830,7 +830,7 @@
+@@ -821,7 +821,7 @@
#ifdef WIN32 /* change define path tmp */
#define TMPDIR "tmp"
#else
#endif
-diff -durN crossfire-0.98.0.orig/server/ban.c crossfire-0.98.0/server/ban.c
---- crossfire-0.98.0.orig/server/ban.c Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/server/ban.c Tue Apr 17 17:12:17 2001
-@@ -33,7 +33,7 @@
+diff -durN crossfire-1.1.0.orig/server/ban.c crossfire-1.1.0/server/ban.c
+--- crossfire-1.1.0.orig/server/ban.c Wed Mar 20 07:36:53 2002
++++ crossfire-1.1.0/server/ban.c Fri Mar 22 13:23:04 2002
+@@ -34,7 +34,7 @@
int num1;
int Hits=0; /* Hits==2 means we're banned */
if ((bannedfile = fopen(buf, "r")) == NULL) {
LOG (llevDebug, "Could not find file Banned file.\n");
return(0);
-diff -durN crossfire-0.98.0.orig/server/c_wiz.c crossfire-0.98.0/server/c_wiz.c
---- crossfire-0.98.0.orig/server/c_wiz.c Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/server/c_wiz.c Tue Apr 17 17:12:50 2001
-@@ -712,7 +712,7 @@
+diff -durN crossfire-1.1.0.orig/server/c_wiz.c crossfire-1.1.0/server/c_wiz.c
+--- crossfire-1.1.0.orig/server/c_wiz.c Wed Mar 20 07:36:53 2002
++++ crossfire-1.1.0/server/c_wiz.c Fri Mar 22 13:23:04 2002
+@@ -889,7 +889,7 @@
*pl_name=op->name?op->name:"*";
#endif
if ((dmfile = fopen(buf, "r")) == NULL) {
LOG (llevDebug, "Could not find DM file.\n");
return(0);
-diff -durN crossfire-0.98.0.orig/server/init.c crossfire-0.98.0/server/init.c
---- crossfire-0.98.0.orig/server/init.c Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/server/init.c Tue Apr 17 17:15:20 2001
-@@ -222,7 +222,7 @@
+diff -durN crossfire-1.1.0.orig/server/init.c crossfire-1.1.0/server/init.c
+--- crossfire-1.1.0.orig/server/init.c Wed Mar 20 07:36:53 2002
++++ crossfire-1.1.0/server/init.c Fri Mar 22 13:23:04 2002
+@@ -225,7 +225,7 @@
int has_val,comp;
FILE *fp;
/* We don't require a settings file at current time, but down the road,
* there will probably be so many values that not having a settings file
* will not be a good thing.
-@@ -445,7 +445,7 @@
+@@ -504,7 +504,7 @@
int comp;
#ifdef SHUTDOWN_FILE
if ((fp = open_and_uncompress(buf, 0, &comp)) != NULL) {
while (fgets(buf, MAX_BUF-1, fp) != NULL)
printf("%s", buf);
-@@ -499,10 +499,10 @@
+@@ -558,10 +558,10 @@
printf("Datadir:\t\t%s\n",settings.datadir);
printf("Localdir:\t\t%s\n",settings.localdir);
#ifdef PERM_FILE
#endif
printf("Save player:\t<true>\n");
printf("Save mode:\t%4.4o\n",SAVE_MODE);
-diff -durN crossfire-0.98.0.orig/server/main.c crossfire-0.98.0/server/main.c
---- crossfire-0.98.0.orig/server/main.c Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/server/main.c Tue Apr 17 17:14:36 2001
-@@ -29,6 +29,7 @@
- #include <version.h>
+diff -durN crossfire-1.1.0.orig/server/main.c crossfire-1.1.0/server/main.c
+--- crossfire-1.1.0.orig/server/main.c Wed Mar 20 07:36:53 2002
++++ crossfire-1.1.0/server/main.c Fri Mar 22 13:23:43 2002
+@@ -30,6 +30,7 @@
#include <global.h>
#include <object.h>
+ #include <tod.h>
+#include <config.h>
#ifdef HAVE_DES_H
#include <des.h>
-@@ -961,7 +962,7 @@
+@@ -1043,7 +1044,7 @@
clock = time (NULL);
tm = (struct tm *) localtime (&clock);
if ((fp = open_and_uncompress(buf, 0, &comp)) == NULL)
return 0;
-diff -durN crossfire-0.98.0.orig/server/player.c crossfire-0.98.0/server/player.c
---- crossfire-0.98.0.orig/server/player.c Sun Apr 8 07:49:34 2001
-+++ crossfire-0.98.0/server/player.c Tue Apr 17 17:13:33 2001
-@@ -46,7 +46,7 @@
+diff -durN crossfire-1.1.0.orig/server/player.c crossfire-1.1.0/server/player.c
+--- crossfire-1.1.0.orig/server/player.c Wed Mar 20 07:36:53 2002
++++ crossfire-1.1.0/server/player.c Fri Mar 22 13:23:04 2002
+@@ -57,7 +57,7 @@
FILE *fp;
int comp;
Summary: Multiplayer roguelike game server
Summary(pl): Serwer gry roguelike dla wielu graczy
Name: crossfire
-Version: 1.0.0
+Version: 1.3.0
Release: 1
License: GPL
Group: Applications/Games
-Source0: ftp://ftp.scruz.net/users/mwedel/public/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.sourceforge.net/pub/sourceforge/crossfire/%{name}-%{version}.tar.bz2
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.logrotate
Patch0: %{name}-DESTDIR.patch
Patch1: %{name}-directories.patch
Patch2: %{name}-tmp_maps.patch
+Patch3: %{name}-python.patch
URL: http://crossfire.real-time.com/
BuildRequires: XFree86-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description editor -l pl
Edytor map crossfire.
+%package doc
+Summary: Crossfire game documentation
+Summary(pl): Dokumentacja gry crossfire
+Group: Applications/Games
+
+%description doc
+Crossfire documentation for players. Includes handbook and spoiler.
+
+%description doc -l pl
+Dokumentacja dla graczy Crossfire. Zawiera podrêczniek oraz spoiler.
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
+# don't apply, its unfinished
+#%patch3 -p1
+cd lib
+bunzip2 -c %{SOURCE1} | tar xf -
%build
+autoconf
%configure
%{__make}
install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
touch $RPM_BUILD_ROOT/var/log/crossfire
-
+rm doc/Developers/Makefile*
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CHANGES CREDITS DEVELOPERS DONE README TODO
-%doc doc/{PlayerStats,RunTimeCommands,SurvivalGuide,alchemy.doc,experience,multigod}
-%doc doc/{skills.doc,spell-paths,spellcasters_guide_to_runes,spells}
+%doc CHANGES CREDITS DEVELOPERS README TODO
+%doc doc/{alchemy.doc,experience,multigod,spell_params.doc}
+%doc doc/{spell-paths,spellcasters_guide_to_runes,metaserver}
+%doc doc/Developers
%attr(750,root,games) %{_bindir}/crossfire
%attr(750,root,games) %{_bindir}/random_map
%dir %attr(750,root,games) %{_datadir}/crossfire
%files editor
%defattr(644,root,root,755)
-%doc doc/{Crossedit.doc,RandomMaps.doc,Styles.doc,mapguide,mapmakers_guide_to_runes,teleporter.doc}
+%doc doc/{Crossedit.doc} crossedit/doc/*.doc
%attr(755,root,root) %{_bindir}/crossedit
%{_mandir}/man?/crossedit*
+
+%files doc
+%doc doc/{handbook.ps,spoiler.ps}
+%doc doc/{PlayerStats,RunTimeCommands,SurvivalGuide}
+%doc doc/{skills.doc,spellcasters_guide_to_runes,spells*}