Hello community, here is the log from the commit of package ski for openSUSE:Factory checked in at 2016-02-01 19:56:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ski (Old) and /work/SRC/openSUSE:Factory/.ski.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ski" Changes: -------- --- /work/SRC/openSUSE:Factory/ski/ski.changes 2015-03-18 13:04:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ski.new/ski.changes 2016-02-01 19:56:50.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Jan 28 19:00:40 UTC 2016 - nemysis@openSUSE.org + +- Update to 6.10, announce message: + + Ported to Python 3. + +- Remove patch ski-6.9-ski.desktop.patch, use instead + ski-ski.desktop.patch + +------------------------------------------------------------------- Old: ---- ski-6.9-ski.desktop.patch ski-6.9.tar.gz New: ---- ski-6.10.tar.gz ski-ski.desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ski.spec ++++++ --- /var/tmp/diff_new_pack.2SZs4R/_old 2016-02-01 19:56:51.000000000 +0100 +++ /var/tmp/diff_new_pack.2SZs4R/_new 2016-02-01 19:56:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ski # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,21 @@ Name: ski -Version: 6.9 +Version: 6.10 Release: 0 Summary: Skiing simulation with curses interface in python License: BSD-3-Clause Group: Amusements/Games/Action/Race Url: http://catb.org/~esr/ski/ Source0: http://www.catb.org/~esr/%{name}/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM - ski-6.8-ski.desktop.patch -- Adjust to Desktop Menu Specification -Patch0: %{name}-6.9-%{name}.desktop.patch +# PATCH-FIX-UPSTREAM - ski-ski.desktop.patch -- Adjust to Desktop Menu Specification +Patch0: %{name}-%{name}.desktop.patch %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -Requires: python -Requires: python-curses -Requires: python-pygame +Requires: python3 +Requires: python3-curses +Requires: python3-pygame BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ ski-6.9.tar.gz -> ski-6.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ski-6.9/COPYING new/ski-6.10/COPYING --- old/ski-6.9/COPYING 2010-10-20 05:56:00.000000000 +0200 +++ new/ski-6.10/COPYING 2015-10-17 20:53:15.000000000 +0200 @@ -1,28 +1,27 @@ BSD LICENSE +Copyright (c) 2015, Eric S. Raymond +All rights reserved. + Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: +modification, are permitted provided that the following conditions are +met: -Redistributions of source code must retain the above copyright +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither name of the this project nor the names of its contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ski-6.9/Makefile new/ski-6.10/Makefile --- old/ski-6.9/Makefile 2014-12-16 04:39:12.000000000 +0100 +++ new/ski-6.10/Makefile 2015-04-03 12:24:23.000000000 +0200 @@ -61,3 +61,6 @@ release: ski-$(VERS).tar.gz ski.html shipper version=$(VERS) | sh -e -x + +refresh: ski.html + shipper -N -w version=$(VERS) | sh -e -x diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ski-6.9/NEWS new/ski-6.10/NEWS --- old/ski-6.9/NEWS 2015-01-09 06:27:19.000000000 +0100 +++ new/ski-6.10/NEWS 2016-01-27 17:10:06.000000000 +0100 @@ -1,5 +1,8 @@ ski project history +6.10: 2016-1-27 + Ported to Python 3. + 6.9: 2015-01-09 BSD port patch. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ski-6.9/control new/ski-6.10/control --- old/ski-6.9/control 2015-01-09 06:25:11.000000000 +0100 +++ new/ski-6.10/control 2015-04-03 10:36:14.000000000 +0200 @@ -3,7 +3,7 @@ Package: ski -Description: A hotdogging game, evade the deadly Yeti on your jet-powered skis +Description: A hotdogging game, evade the deadly Yeti on your jet-powered skis. Imagine you are skiing down an infinite slope, facing such hazards as trees, ice, bare ground, and the man-eating Yeti! Unfortunately, you have put your jet-powered skis on backwards, so you can't see @@ -14,16 +14,20 @@ skillfully outmaneuver them. A fun and very silly game that proves you don't need fancy graphical user interfaces to have a good time. -#XBS-Destinations: freecode +XBS-Destinations: nemysis@gmx.ch Homepage: http://www.catb.org/~esr/ski -#XBS-Gitorious-URL: https://gitorious.org/ski - XBS-HTML-Target: index.html +XBS-Repository-URL: http://thyrsus.com/gitweb/?p=ski.git + +XBS-Developer-Clone: git@thyrsus.com:ski + +XBS-Anonymous-Clone: git://thyrsus.com/repositories/ski.git + XBS-Logo: ski.png -XBS-Freecode-Tags: games +XBS-Project-Tags: games XBS-VC-Tag-Template: %(version)s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ski-6.9/ski new/ski-6.10/ski --- old/ski-6.9/ski 2015-01-09 06:27:34.000000000 +0100 +++ new/ski-6.10/ski 2016-01-27 17:09:40.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """\ This is ski %s, designed by Mark Stevans, Python port by Eric S. Raymond. You are hurtling down a ski slope in reverse, trying to evade the Yeti. @@ -13,9 +13,12 @@ ? = print this help message. """ -version = "6.9" +# SPDX-License-Identifier: BSD-2-Clause + import time, random, curses, copy, sys, os +version = "6.10" + REP_SNOW = '.' REP_TREE = 'Y' REP_GROUND = ':' @@ -150,7 +153,7 @@ def teleport(self): "Return a random location" - return random.choice(range(len(self.slope))) + return random.choice(list(range(len(self.slope)))) def gen_next_slope(self): # Generates the slope of the next level, dependent upon @@ -337,14 +340,14 @@ degree = severity + random.randint(0, INJURY_RANDOMNESS - 1) # Print a message indicating the termination of the game. - print "!\n\n%s %s\n" % (msg, SkiPlayer.injuries[degree]) + print("!\n\n%s %s\n" % (msg, SkiPlayer.injuries[degree])) # Print the statistics of the game. - print "You skiied %d meters with %d jumps and melted %d %s."%(\ + print("You skiied %d meters with %d jumps and melted %d %s."%(\ self.meters_travelled, self.num_jumps_attempted, self.num_snomen_melted, - ("Yeti", "Yetis")[self.num_snomen_melted != 1]) + ("Yeti", "Yetis")[self.num_snomen_melted != 1])) # Initially calculate the player's score based upon the number of # meters travelled. @@ -366,7 +369,7 @@ score = 0 # Print the player's score. - print "Your score for this run is %ld." % score + print("Your score for this run is %ld." % score) # Exit the game with a code indicating successful completion. sys.exit(0) @@ -404,7 +407,7 @@ # Print a prompt, and read a command. Return True to advance game. cmd = cmdline[0].upper() if cmd == '?': - print __doc__ % version, terrain_key + print((__doc__ % version) + terrain_key) return False elif cmd == '!': os.system(cmdline[1:]) @@ -452,7 +455,7 @@ for i in range(len(picture)): if (i == 0 or (picture[i] != picture[i-1][-1])): if picture[i] in colordict: - picture[i] = colordict[picture[i]] + picture[i] + picture[i] = colordict[picture[i]].decode("ascii") + picture[i] else: picture[i] = reset + picture[i] picture += reset @@ -466,15 +469,15 @@ # Arrange for color to be available curses.setupterm() color = curses.tigetstr("setaf") - for (ch, idx) in colordict.items(): + for (ch, idx) in list(colordict.items()): if color: colordict[ch] = curses.tparm(color, idx) else: colordict[ch] = "" - reset = curses.tigetstr("sgr0") or "" + reset = curses.tigetstr("sgr0").decode("ascii") or "" terrain_key = colorize(terrain_key) - print "SKI! Version %s. Type ? for help." % version + print("SKI! Version %s. Type ? for help." % version) world = SkiWorld() player = SkiPlayer() @@ -494,7 +497,7 @@ if repeat: sys.stdout.write('\n') else: - cmd = raw_input("? ") + cmd = input("? ") if cmd == '': cmd = '\n' elif cmd[0] in "0123456789": @@ -511,6 +514,6 @@ player.update_player() except (KeyboardInterrupt, EOFError): sys.stdout.write(reset) - print "\nBye!" + print("\nBye!") # end ++++++ ski-ski.desktop.patch ++++++ --- ski.desktop.orig 2014-12-16 04:38:40.000000000 +0100 +++ ski.desktop 2016-01-28 19:49:30.735594660 +0100 @@ -1,10 +1,9 @@ [Desktop Entry] -Type=Application -Version=1.0 Name=Ski GenericName=Ski game Comment=Skiing simulation with curses interface in python Icon=ski Exec=ski Categories=Game;SportsGame; +Type=Application Terminal=true