$ git show --format=fuller --patch-with-stat --summary 10816a6902385bde2f9244fd0ddce20932266e93
commit 10816a6902385bde2f9244fd0ddce20932266e93
Author: Crispin Boylan <crispin.boylan@beintrepid.co.uk>
AuthorDate: Thu Feb 22 00:17:09 2024 +0000
Commit: Crispin Boylan <crispin.boylan@beintrepid.co.uk>
CommitDate: Thu Feb 22 00:17:09 2024 +0000
5.6.5
---
.abf.yml | 5 +-
liquidwar-5.6.5-python3.patch | 232 ++++++++++++++++++++++++++++++++++++++++++
liquidwar.spec | 39 ++++---
3 files changed, 255 insertions(+), 21 deletions(-)
create mode 100644 liquidwar-5.6.5-python3.patch
diff --git a/.abf.yml b/.abf.yml
index 28a2cfb..e6a98eb 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,5 @@
sources:
- "liquidwar-5.6.4.tar.gz": a3006c4da9517c3af3b7bf165b2c86fa369a71c6
+ liquidwar-16.png: 8653f6969822b004264e1f26e49293381fe83011
+ liquidwar-32.png: 82a32adbecfae2fc2c992c58ae1012843d6ad333
+ liquidwar-48.png: 84669b809769a3b327b13c1326ff4bd17e08bdf1
+ liquidwar-5.6.5.tar.gz: 42cc7d02a2f21ab826af1e064a79ede04f36b067
diff --git a/liquidwar-5.6.5-python3.patch b/liquidwar-5.6.5-python3.patch
new file mode 100644
index 0000000..e4324c6
--- /dev/null
+++ b/liquidwar-5.6.5-python3.patch
@@ -0,0 +1,232 @@
+--- doc/makedoc.py~ 2018-12-23 13:04:36.000000000 -0600
++++ doc/makedoc.py 2019-08-01 09:55:36.138861280 -0500
+@@ -366,7 +366,7 @@
+ self.write("\n\\end{verbatim}\n")
+ def translate(self,data,tag):
+ result=data
+- result=format_email_and_url(result)
++ result=format_email_and_url(result)
+ if (tag!="code"):
+ result=format_tex(result)
+ return result
+--- doc/makedoc.py~ 2019-08-01 09:57:30.000000000 -0500
++++ doc/makedoc.py 2019-08-01 10:01:16.624513293 -0500
+@@ -405,7 +405,7 @@
+ self.write("\n")
+ def translate(self,data,tag):
+ result=data
+- result=format_email_and_url(result)
++ result=format_email_and_url(result)
+ result=string.replace(result,"\\","\\\\")
+ result=string.replace(result,".","\.")
+ result=string.replace(result,"-","\-")
+--- doc/makedoc.py~ 2019-08-01 10:05:15.000000000 -0500
++++ doc/makedoc.py 2019-08-01 10:16:35.106574773 -0500
+@@ -460,7 +460,7 @@
+ self.write("\n")
+ def translate(self,data,tag):
+ result=data
+- result=format_email_and_url(result)
++ result=format_email_and_url(result)
+ if (tag=="code"):
+ result=" "*self.indent+\
+ string.replace(result,"\n","\n"+" "*self.indent)
+--- doc/makedoc.py~ 2019-08-01 10:16:46.000000000 -0500
++++ doc/makedoc.py 2019-08-01 10:21:42.795258329 -0500
+@@ -505,7 +505,7 @@
+ self.write("\n@end example\n")
+ def translate(self,data,tag):
+ result=data
+- result=format_email_and_url(result)
++ result=format_email_and_url(result)
+
+ if (tag!="code"):
+ result=remove_duplicate_blanks(result)
+--- doc/makedoc.py~ 2019-08-01 10:22:09.000000000 -0500
++++ doc/makedoc.py 2019-08-01 10:27:51.419879128 -0500
+@@ -548,7 +548,7 @@
+ self.write("\n")
+ def translate(self,data,tag):
+ result=data
+- result=format_email_and_url(result)
++ result=format_email_and_url(result)
+
+ if (tag=="code"):
+ result=format_uwc_code(result)
+--- doc/makedoc.py~ 2019-08-01 10:28:32.000000000 -0500
++++ doc/makedoc.py 2019-08-01 10:34:09.146489785 -0500
+@@ -208,7 +208,7 @@
+ if tag=="code":
+ self.start_code()
+ def endElement(self,tag):
+- data=string.strip(self.charbuf)
++ data=self.charbuf.strip
+ if (data!=""):
+ self.write(self.translate(data,self.stack[-1]))
+ self.charbuf=""
+--- doc/makedoc.py~ 2019-08-01 10:34:27.000000000 -0500
++++ doc/makedoc.py 2019-08-01 10:39:02.739184332 -0500
+@@ -61,7 +61,7 @@
+ return result
+
+ def format_email_and_url(text):
+- result=text
++ result=str(text)
+
+ email=re.compile('"([\w\-\.]+@[\w\-\.]+)"')
+ result=email.sub(r'\1',result);
+--- doc/makedoc.py~ 2019-08-01 10:54:49.000000000 -0500
++++ doc/makedoc.py 2019-08-01 11:05:05.757487736 -0500
+@@ -16,14 +16,14 @@
+ def remove_duplicate_blanks(text):
+ result=text
+
+- result=string.replace(result,"\t"," ")
+- result=string.replace(result,"\n"," ")
++ result=result.replace("\t"," ")
++ result=result.replace("\n"," ")
+
+ if (result!=""):
+ temp=""
+ while temp!=result:
+ temp=result
+- result=string.replace(result," "," ")
++ result=result.replace(" "," ")
+
+ return result
+
+@@ -74,11 +74,11 @@
+ def format_html(text):
+ result=text
+
+- result=string.replace(result,"<","ufoot_html_lt")
+- result=string.replace(result,">","ufoot_html_gt")
+- result=string.replace(result,"&","&")
+- result=string.replace(result,"ufoot_html_lt","<")
+- result=string.replace(result,"ufoot_html_gt",">")
++ result=result.replace("<","ufoot_html_lt")
++ result=result.replace(">","ufoot_html_gt")
++ result=result.replace("&","&")
++ result=result.replace("ufoot_html_lt","<")
++ result=result.replace("ufoot_html_gt",">")
+
+ # Uncomment this to make mailing list adresses look like "xxx at xxx"
+ # instead of "xxx@xxx". This can prevent spammers from harvesting
+@@ -97,31 +97,31 @@
+ def format_tex(text):
+ result=text
+
+- result=string.replace(result,"\\","$\\backslash$")
+- result=string.replace(result,"_","\\_")
+- result=string.replace(result,"#","\\#")
+- result=string.replace(result,"%","\\%")
+- result=string.replace(result,"}","\\}")
+- result=string.replace(result,"<","$<$")
+- result=string.replace(result,">","$>$")
+- result=string.replace(result,"~","$\\tilde{}$")
++ result=result.replace("\\","$\\backslash$")
++ result=result.replace("_","\\_")
++ result=result.replace("#","\\#")
++ result=result.replace("%","\\%")
++ result=result.replace("}","\\}")
++ result=result.replace("<","$<$")
++ result=result.replace(">","$>$")
++ result=result.replace("~","$\\tilde{}$")
+
+ return result
+
+ def format_texi(text):
+ result=text
+
+- result=string.replace(result,"@","@@")
+- result=string.replace(result,"}","@}")
+- result=string.replace(result,"{","@{")
++ result=result.replace("@","@@")
++ result=result.replace("}","@}")
++ result=result.replace("{","@{")
+
+ return result
+
+ def format_uwc(text):
+ result=text
+
+- result=string.replace(result,"]","]")
+- result=string.replace(result,"[","[[")
++ result=result.replace("]","]")
++ result=result.replace("[","[[")
+
+ return result
+
+@@ -139,8 +139,8 @@
+ result=text
+
+ result=format_uwc(result)
+- result=string.replace(result,"\n"," ")
+- result=string.replace(result,"\r"," ")
++ result=result.replace("\n"," ")
++ result=result.replace("\r"," ")
+ result=remove_duplicate_blanks(result)
+
+ return result
+--- doc/makedoc.py~ 2019-08-01 11:05:37.000000000 -0500
++++ doc/makedoc.py 2019-08-01 11:10:12.624131362 -0500
+@@ -567,7 +567,7 @@
+ parser.setContentHandler(handler)
+ parser.parse(src_file)
+ dst_code=handler.translated
+- dst_file.write(dst_code.encode("iso-8859-1"))
++ dst_file.write(str(dst_code.encode("iso-8859-1")))
+ src_file.close()
+ dst_file.close()
+
+--- doc/makedoc.py~ 2019-08-01 11:15:25.000000000 -0500
++++ doc/makedoc.py 2019-08-01 11:20:48.654373076 -0500
+@@ -463,7 +463,7 @@
+ result=format_email_and_url(result)
+ if (tag=="code"):
+ result=" "*self.indent+\
+- string.replace(result,"\n","\n"+" "*self.indent)
++ result.replace("\n","\n"+" "*self.indent)
+ else:
+ result=format_text(result,self.indent,80)
+ if (tag=="elem"):
+--- doc/makedoc.py~ 2019-08-01 11:21:07.000000000 -0500
++++ doc/makedoc.py 2019-08-01 11:25:15.772051577 -0500
+@@ -406,11 +406,11 @@
+ def translate(self,data,tag):
+ result=data
+ result=format_email_and_url(result)
+- result=string.replace(result,"\\","\\\\")
+- result=string.replace(result,".","\.")
+- result=string.replace(result,"-","\-")
++ result=result.replace("\\","\\\\")
++ result=result.replace(".","\.")
++ result=result.replace("-","\-")
+ if (tag=="code"):
+- result=string.replace(result,"\n","\n.br\n")
++ result=result.replace("\n","\n.br\n")
+ else:
+ result=remove_duplicate_blanks(result)
+ return result
+@@ -602,8 +602,8 @@
+ run_parser(handler,txt_file,xml_file)
+
+ def make_texi(texi_file,xml_file):
+- node=string.replace(xml_file,".xml","")
+- node=string.replace(node,"xml/","")
++ node=xml_file.replace(".xml","")
++ node=node.replace("xml/","")
+ parser=xml.sax.make_parser()
+ handler=XMLToTexi(node)
+ run_parser(handler,texi_file,xml_file)
+--- doc/makedoc.py~ 2019-08-01 11:25:43.000000000 -0500
++++ doc/makedoc.py 2019-08-01 11:28:49.603782321 -0500
+@@ -72,7 +72,7 @@
+ return result
+
+ def format_html(text):
+- result=text
++ result=str(text)
+
+ result=result.replace("<","ufoot_html_lt")
+ result=result.replace(">","ufoot_html_gt")
diff --git a/liquidwar.spec b/liquidwar.spec
index d2ef38d..5f060c4 100644
--- a/liquidwar.spec
+++ b/liquidwar.spec
@@ -2,21 +2,22 @@
%{?_with_allegro_unstable: %{expand: %%global build_allegro_unstable 1}}
Name: liquidwar
-Version: 5.6.4
-Release: 8
+Version: 5.6.5
+Release: 1
Summary: Unique multiplayer wargame
License: GPLv2+
Group: Games/Arcade
-Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz
-Patch0: liquidwar-5.6.4-desktop-file-fix.patch
-Patch1: liquidwar-5.6.4-fix-str-fmt.patch
-Patch2: liquidwar-5.6.4-fix-linking-issue.patch
-Patch3: liquidwar-5.6.4-ovflfix.patch
+Source0: http://www.ufoot.org/download/%{name}/v5/%{version}/%{name}-%{version}.tar.gz
+#Patch0: liquidwar-5.6.4-desktop-file-fix.patch
+#Patch1: liquidwar-5.6.4-fix-str-fmt.patch
+#Patch2: liquidwar-5.6.4-fix-linking-issue.patch
+#Patch3: liquidwar-5.6.4-ovflfix.patch
+Patch4: liquidwar-5.6.5-python3.patch
+
Source11: %{name}-16.png
Source12: %{name}-32.png
Source13: %{name}-48.png
URL: http://www.ufoot.org/liquidwar/v5
-BuildRequires: python2-devel
# (misc) data file need to compile
%if %build_allegro_unstable
BuildRequires: allegro-testing, allegro-testing-devel
@@ -43,26 +44,23 @@ other, it is as simple as that.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
+%autosetup -p0
%build
export CC=gcc
export CXX=g++
autoconf
-export PYTHON=%__python2
-%configure2_5x --disable-doc-pdf --disable-doc-ps \
+%configure --disable-doc-pdf --disable-doc-ps \
+ --disable-doc-info \
%ifnarch %ix86
--disable-asm \
%endif
+ CFLAGS="$RPM_OPT_FLAGS -fcommon"
-%make
+%make CFLAGS="$RPM_OPT_FLAGS -fcommon"
%install
-perl -pi -e 's#install_custom_texture install_icon install_gpl#install_custom_texture #' Makefile
+sed -i 's#install_custom_texture install_icon install_gpl#install_custom_texture #' Makefile
%makeinstall
# icons
@@ -77,15 +75,16 @@ rm -rf %{buildroot}%{_bindir}
%files
%defattr(-,root,root)
-%doc COPYING README doc/html/*.html
+%doc COPYING README.md doc/html/*.html
%{_gamesbindir}/*
%{_gamesdatadir}/%{name}
%{_iconsdir}/%{name}.png
%{_miconsdir}/%{name}.png
%{_liconsdir}/%{name}.png
%{_datadir}/applications/*
-
-
+%{_mandir}/man6/%{name}.6.*
+%{_mandir}/man6/%{name}-mapgen.6.*
+%{_mandir}/man6/%{name}-server.6.*
%changelog
* Mon Dec 06 2010 Oden Eriksson <oeriksson@mandriva.com> 5.6.4-5mdv2011.0