diff --git a/wumpus-1.6.tar.gz b/wumpus-1.6.tar.gz deleted file mode 100644 index a01c489..0000000 --- a/wumpus-1.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:965e49b3e53f44023994b42b3aa568ad79d3a2287bb0a07460b601500c9ae16d -size 11694 diff --git a/wumpus-1.7.tar.gz b/wumpus-1.7.tar.gz new file mode 100644 index 0000000..7349330 --- /dev/null +++ b/wumpus-1.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:892678a66d6d1fe2a7ede517df2694682b882797a546ac5c0568cc60b659f702 +size 27177 diff --git a/wumpus-Makefile.patch b/wumpus-Makefile.patch index b5e949f..2d4c974 100644 --- a/wumpus-Makefile.patch +++ b/wumpus-Makefile.patch @@ -1,11 +1,15 @@ ---- Makefile.orig 2015-04-04 12:38:03.000000000 +0200 -+++ Makefile 2015-06-08 20:36:13.445880866 +0200 -@@ -27,12 +27,25 @@ - SOURCES = README COPYING NEWS Makefile wumpus.c superhack.c wumpus.xml +diff --git a/Makefile b/Makefile +index ef8bddd..39b0a4d 100644 +--- a/Makefile ++++ b/Makefile +@@ -31,14 +31,25 @@ wumpus.html: wumpus.xml + SOURCES = README COPYING NEWS control Makefile wumpus.c superhack.c wumpus.xml wumpus.png wumpus.desktop superhack.desktop - install: wumpus.6 -- cp wumpus superhack /usr/bin/ -- cp wumpus.6 /usr/share/man/man6/ + install: wumpus superhack wumpus.6 +- mkdir -p $(prefix)/bin +- mkdir -p $(prefix)/share/man/man6 +- cp wumpus superhack $(prefix)/bin/ +- cp wumpus.6 $(prefix)/share/man/man6/ + install -m 0755 -d $(DESTDIR)/usr/bin/ + install -m 0755 -d $(DESTDIR)/usr/share/man/man6/ + install -m 0755 -d $(DESTDIR)//usr/share/applications/ @@ -19,8 +23,8 @@ + install -m 0644 wumpus.xml $(DESTDIR)/usr/share/appdata/ uninstall: -- rm /usr/bin/wumpus /usr/bin/superhack -- rm /usr/share/man/man6/wumpus.6 +- rm $(prefix)/bin/wumpus $(prefix)/bin/superhack +- rm $(prefix)/share/man/man6/wumpus.6 + rm -f /usr/bin/superhack /usr/bin/wumpus + rm -f /usr/share/man/man6/wumpus.6 + rm -f /usr/share/applications/wumpus.desktop diff --git a/wumpus-superhack.c.patch b/wumpus-superhack.c.patch deleted file mode 100644 index 810d1fe..0000000 --- a/wumpus-superhack.c.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- superhack.c.orig 2015-04-04 12:36:55.000000000 +0200 -+++ superhack.c 2015-06-08 18:29:28.574280952 +0200 -@@ -13,6 +13,9 @@ - #include - #include - #include -+#include -+#include -+#include - - static int path[5]; - static int j, k, scratchloc, pies; -@@ -423,6 +426,7 @@ - break; - } - } -+ return 0; - } - - /* superhack.c ends here */ diff --git a/wumpus-wumpus.c.patch b/wumpus-wumpus.c.patch deleted file mode 100644 index 4e3c879..0000000 --- a/wumpus-wumpus.c.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- wumpus.c.orig 2015-04-04 12:31:47.000000000 +0200 -+++ wumpus.c 2015-06-08 18:43:34.738979482 +0200 -@@ -30,6 +30,9 @@ - #include - #include - #include -+#include -+#include -+#include - - /* 5 REM *** HUNT THE WUMPUS *** */ - diff --git a/wumpus.changes b/wumpus.changes index a2efda8..a18f21b 100644 --- a/wumpus.changes +++ b/wumpus.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Mar 27 21:55:04 UTC 2020 - Christophe Giboudeaux + +- Update to 1.7: + * license change from BSD-3-Clause to BSD-2-Clause + * Minor bug fix for suprhack + * Added a logo and a historical note about it +- Run spec-cleaner +- Update wumpus-Makefile.patch +- Drop wumpus-superhack.c.patch, merged upstream. +- Drop wumpus-wumpus.c.patch, merged upstream. + ------------------------------------------------------------------- Mon Jun 8 18:26:47 UTC 2015 - nemysis@gmx.ch diff --git a/wumpus.spec b/wumpus.spec index 64dece0..181735f 100644 --- a/wumpus.spec +++ b/wumpus.spec @@ -1,7 +1,7 @@ # # spec file for package wumpus # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,19 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define oname superhack - Name: wumpus -Version: 1.6 +Version: 1.7 Release: 0 Summary: Faithful transcription of the 1974 Atari Wumpus game -License: BSD-3-Clause +License: BSD-2-Clause Group: Amusements/Games/Action/Race -Url: http://www.catb.org/~esr/wumpus/ +URL: http://www.catb.org/~esr/wumpus/ Source0: http://www.catb.org/~esr/%{name}/%{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc Source2: %{name}.desktop @@ -32,14 +31,9 @@ Source3: %{oname}.desktop Source4: %{name}.png # PATCH-FIX-UPSTREAM - wumpus-Makefile.patch -- Fix paths and installation Patch0: %{name}-Makefile.patch -# PATCH-FIX-UPSTREAM - wumpus-superhack.c.patch -- Fix bad C++ code -Patch1: %{name}-superhack.c.patch -# PATCH-FIX-UPSTREAM - wumpus-wumpus.c.patch -- Fix bad C++ code -Patch2: %{name}-wumpus.c.patch BuildRequires: hicolor-icon-theme -BuildRequires: update-desktop-files BuildRequires: ncurses-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: update-desktop-files %description WUMPUS is a bit of retrocomputing nostalgia. It is an *exact* clone, @@ -50,16 +44,14 @@ different premise. %prep %setup -q -%patch0 -%patch1 -%patch2 +%patch0 -p1 -cp -af %{S:2} . -cp -af %{S:3} . -cp -af %{S:4} . +cp -af %{SOURCE2} . +cp -af %{SOURCE3} . +cp -af %{SOURCE4} . %build -make %{?_smp_mflags} CFLAGS="%{optflags}" +%make_build CFLAGS="%{optflags}" %install %make_install @@ -71,12 +63,12 @@ ln -sf %{_mandir}/man6/%{name}.6%{ext_man} %{buildroot}%{_mandir}/man6/%{oname}. %suse_update_desktop_file %{oname} %files -%defattr(-,root,root,-) -%doc COPYING README +%license COPYING +%doc README %{_bindir}/%{name} %{_bindir}/%{oname} -%{_mandir}/man6/%{name}.6%{ext_man} -%{_mandir}/man6/%{oname}.6%{ext_man} +%{_mandir}/man6/%{name}.6%{?ext_man} +%{_mandir}/man6/%{oname}.6%{?ext_man} %dir %{_datadir}/appdata %{_datadir}/appdata/%{name}.xml %{_datadir}/applications/%{name}.desktop