Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55a22adf8176aecac5f7e9d6cc0d1584eb04c2fb
commit 55a22adf8176aecac5f7e9d6cc0d1584eb04c2fb Author: PacMiam <[email protected]> Date: Thu Sep 25 14:12:23 2014 +0200 childsplay-2.6.5-1-i686 * Version bump: 2.6.4 -> 2.6.5 * Remove old patch diff --git a/source/games-extra/childsplay/FrugalBuild b/source/games-extra/childsplay/FrugalBuild index f525731..b9a4f7b 100644 --- a/source/games-extra/childsplay/FrugalBuild +++ b/source/games-extra/childsplay/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Devil505 <[email protected]> pkgname=childsplay -pkgver=2.6.4 +pkgver=2.6.5 pkgrel=1 pkgdesc="A suite of educational games for young children" url="http://www.childsplay.mobi"; @@ -21,7 +21,7 @@ _F_desktop_categories="Game;KidsGame" up2date="Flasttar http://download.savannah.gnu.org/releases/childsplay/"; source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tgz) -sha1sums=('1bb8b9a71a3f56579298859652dfdfa663f232f9') +sha1sums=('2f848bd06ddc29da8ee6a438614d2a98e9856fd8') build() { Fcd diff --git a/source/games-extra/childsplay/fix-sqlalchemy-exceptions-import.diff b/source/games-extra/childsplay/fix-sqlalchemy-exceptions-import.diff deleted file mode 100644 index 757e60f..0000000 --- a/source/games-extra/childsplay/fix-sqlalchemy-exceptions-import.diff +++ /dev/null @@ -1,28 +0,0 @@ -Description: Fix sqlalchemy.exceptions import. - Use âexceptionsâ as a normal attribute of the âsqlalchemyâ module, don't - try to import it. (The âsqlalchemy.exceptionsâ alias in sys.modules was - removed in SQLAlchemy 0.7.) -Author: Jakub Wilk <[email protected]> -Bug-Debian: http://bugs.debian.org/638747 -Forwarded: no -Last-Update: 2011-09-16 - ---- a/SPDataManager.py -+++ b/SPDataManager.py -@@ -38,7 +38,6 @@ - - try: - import sqlalchemy as sqla -- import sqlalchemy.exceptions as sqlae - import SQLTables - except ImportError: - module_logger.exception("No sqlalchemy package found") -@@ -82,7 +81,7 @@ - sqltb = SQLTables.SqlTables(self.metadata) - # returns lookup table to get table objects by name and creates tables - self.tables = sqltb._create_tables(self.metadata, self.engine) -- except (AttributeError, sqlae.SQLAlchemyError), info: -+ except (AttributeError, sqla.exceptions.SQLAlchemyError), info: - self.logger.exception("Failed to start the DBase, %s" % info) - raise MyError, info - else: diff --git a/source/games-extra/childsplay/setup.py.diff b/source/games-extra/childsplay/setup.py.diff deleted file mode 100644 index 9b603c1..0000000 --- a/source/games-extra/childsplay/setup.py.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- setup.py 2010-04-12 09:26:52.000000000 -0400 -+++ setup.py 2010-04-13 09:11:53.813204216 -0400 -@@ -37,7 +37,7 @@ - ------------------------------------------------------------------------------- - - """ --import os.path -+import os - import sys - # we check for the special 'uninstall' option, other options are handled by - # the distutils stuff. -@@ -53,13 +53,12 @@ - else: - UNINSTALL = False - print __doc__ -- raw_input("Hit any key to continue\n") - - # Change this if you want to install all the non-python stuff in a different - # location. --PREFIX = '/usr/local' --#PREFIX = '/tmp' - -+#PREFIX = '/tmp' -+PREFIX = os.environ.get('PREFIX', '/usr/local') - # Don't change anything below this line unless you fully understand why you want - # to make changes. - -@@ -277,10 +276,6 @@ - pdest = os.path.join(get_python_lib(), 'childsplay_sp') - print "Looking for previous childsplay python install in %s" % pdest - modulepaths['PYTHONCPDIR'] = pdest --if os.path.exists(pdest): -- print "Found old childsplay_sp python package in %s, removing it..." % pdest, -- shutil.rmtree(pdest) -- print " done" - - #---------- copy starters - dest = os.path.join(PREFIX, 'bin') -@@ -328,13 +323,13 @@ - if ARE_WE_WINDOWS: - src = os.path.join(os.getcwd(), 'windows', 'SPBasePaths.py') - dest = os.getcwd() -- shutil.copy(src, dest) -+ shutil.copy(src, PREFIX[:-4] + pdest) - else: - print "Writing the SPBasePaths module...", - filelines = ["# AUTO-GENERATED MODULE, DON'T EDIT", \ - "# This module holds all the paths needed for childsplay_sp.\n"] - for k, v in modulepaths.items(): -- filelines.append("%s = '%s'" % (k, v)) -+ filelines.append("%s = '%s'" % (k, v.replace(PREFIX[:-4], ''))) - f = open(module, 'w') - f.write("\n".join(filelines)) - f.close()
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
