Hello community, here is the log from the commit of package kajongg for openSUSE:Factory checked in at 2014-07-16 16:16:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kajongg (Old) and /work/SRC/openSUSE:Factory/.kajongg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kajongg" Changes: -------- --- /work/SRC/openSUSE:Factory/kajongg/kajongg.changes 2014-06-18 07:53:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kajongg.new/kajongg.changes 2014-07-16 16:16:50.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 10 22:16:23 UTC 2014 - cgiboude...@gmx.com + +- Update to 4.13.80 + * KDE 4.14 Beta 1 release + * See http://www.kde.org/announcements/announce-4.14-beta1.php + +------------------------------------------------------------------- Old: ---- kajongg-4.13.2.tar.xz New: ---- kajongg-4.13.80.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kajongg.spec ++++++ --- /var/tmp/diff_new_pack.OvmyYC/_old 2014-07-16 16:16:51.000000000 +0200 +++ /var/tmp/diff_new_pack.OvmyYC/_new 2014-07-16 16:16:51.000000000 +0200 @@ -25,7 +25,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 4.13.2 +Version: 4.13.80 Release: 0 Source0: kajongg-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kajongg-4.13.2.tar.xz -> kajongg-4.13.80.tar.xz ++++++ Files old/kajongg-4.13.2/hi128-apps-kajongg.png and new/kajongg-4.13.80/hi128-apps-kajongg.png differ Files old/kajongg-4.13.2/hi16-apps-kajongg.png and new/kajongg-4.13.80/hi16-apps-kajongg.png differ Files old/kajongg-4.13.2/hi22-apps-kajongg.png and new/kajongg-4.13.80/hi22-apps-kajongg.png differ Files old/kajongg-4.13.2/hi32-apps-kajongg.png and new/kajongg-4.13.80/hi32-apps-kajongg.png differ Files old/kajongg-4.13.2/hi48-apps-kajongg.png and new/kajongg-4.13.80/hi48-apps-kajongg.png differ Files old/kajongg-4.13.2/hi64-apps-kajongg.png and new/kajongg-4.13.80/hi64-apps-kajongg.png differ Files old/kajongg-4.13.2/hisc-apps-kajongg.svgz and new/kajongg-4.13.80/hisc-apps-kajongg.svgz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kajongg-4.13.2/src/setup.py new/kajongg-4.13.80/src/setup.py --- old/kajongg-4.13.2/src/setup.py 2014-05-21 08:26:51.000000000 +0200 +++ new/kajongg-4.13.80/src/setup.py 2014-05-21 08:29:43.000000000 +0200 @@ -33,7 +33,7 @@ VERSION = "4.13.0" # ========================== -import os, re +import os, re, msilib from shutil import rmtree from cx_Freeze import setup, Executable @@ -62,7 +62,33 @@ kajServer = Executable('kajonggserver.py', icon='kajongg.ico') executables = [kajExe, kajServer] + +from cx_Freeze import windist + +class bdist_msi(windist.bdist_msi): + """we add an icon for the uninstaller""" + def productcode(self): + """get our productcode""" + view = self.db.OpenView("SELECT Value FROM Property WHERE Property = 'ProductCode'") + view.Execute(None) + record = view.Fetch() + result = record.GetString(1) + view.Close() + return result + + def add_config(self, fullname): + """add the uninstaller icon""" + windist.bdist_msi.add_config(self, fullname) + msilib.add_data(self.db, "Registry", [("DisplayIcon", # Registry + -1, # Root + r"Software\Microsoft\Windows\CurrentVersion\Uninstall\%s" % + self.productcode(), # Key + "DisplayIcon", # Name + r"[icons]kajongg.ico", # Value + "TARGETDIR")]) # default Component + setup( + cmdclass={'bdist_msi': bdist_msi}, # define custom build class name='Kajongg', version=VERSION, description='The classical game of Mah Jongg', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kajongg-4.13.2/src/winprep.py new/kajongg-4.13.80/src/winprep.py --- old/kajongg-4.13.2/src/winprep.py 2014-05-21 08:26:51.000000000 +0200 +++ new/kajongg-4.13.80/src/winprep.py 2014-05-21 08:29:43.000000000 +0200 @@ -26,10 +26,30 @@ from subprocess import check_output, call from shutil import copy, move, copytree, rmtree -import os, zipfile +import os, zipfile, tempfile # pylint:disable=invalid-name +def makeIcon(svgName, icoName): + """generates icoName.ico""" + tmpDir = tempfile.mkdtemp(prefix='kaj') + def pngName(resolution): + """name for this resolution""" + return '{}/kajongg{}.png'.format( + tmpDir, resolution) + resolutions = (16, 24, 32, 40, 48, 64, 96, 128) + try: + for resolution in resolutions: + pngFile = '{}{}.png'.format(icoName, resolution) + call('inkscape -z -e {outfile} -w {resolution} -h {resolution} {infile}'.format( + outfile=pngName(resolution), resolution=resolution, infile=svgName).split()) + call('convert {pngFiles} {icoName}.ico'.format(pngFiles = ' '.join(pngName(x) for x in resolutions), icoName=icoName).split()) + finally: + for resolution in resolutions: + if os.path.exists(pngName(resolution)): + os.remove(pngName(resolution)) + os.rmdir(tmpDir) + dataDir = check_output("kde4-config --expandvars --install data".format(type).split()).strip() iconDir = check_output("kde4-config --expandvars --install icon".format(type).split()).strip() oxy48 = iconDir + '/oxygen/48x48' @@ -65,28 +85,30 @@ 'go-up', 'go-down', 'go-next', 'go-previous'): copy('{}/{}.png'.format(oxy48Act, png), DEST + '/icons') -copy(iconDir + '/hicolor/scalable/actions/games-kajongg-law.svgz', DEST + '/icons') - oggdec = 'oggdecV1.9.9.zip' -call('wget http://www.rarewares.org/files/ogg/{}'.format(oggdec).split()) -with zipfile.ZipFile(oggdec) as ziparch: - ziparch.extract('oggdec.exe') -os.remove(oggdec) +try: + call('wget http://www.rarewares.org/files/ogg/{}'.format(oggdec).split()) + with zipfile.ZipFile(oggdec) as ziparch: + ziparch.extract('oggdec.exe') +finally: + os.remove(oggdec) move('oggdec.exe', DEST + '/kde4/apps/kajongg/voices') copy('backgroundselector.ui', DEST + '/kde4/apps/kajongg') copy('tilesetselector.ui', DEST + '/kde4/apps/kajongg') copy('../hisc-apps-kajongg.svgz', DEST + '/icons/kajongg.svgz') -call(('convert.im6 ../hisc-apps-kajongg.svgz kajongg.ico').split()) -call(('convert.im6 {}/icons/games-kajongg-law.svgz {}/icons/games-kajongg-law.ico'.format(DEST, DEST)).split()) + +makeIcon('../hisc-apps-kajongg.svgz', 'kajongg') +makeIcon(iconDir + '/hicolor/scalable/actions/games-kajongg-law.svgz', 'games-kajongg-law') copy('kajongg.ico', DEST + '/icons') +copy('games-kajongg-law.ico', DEST + '/icons') # select sufficiently complete languages from http://l10n.kde.org/stats/gui/trunk-kde4/po/kajongg.po/ languages = ('bs', 'ca', 'da', 'de', 'en_GB', 'es', 'et', 'fr', 'gl', 'it', 'kk', 'km', 'nl', 'nb', 'nds', 'pl', 'pt', 'pt_BR', 'ru', 'sl', 'sv', 'uk', 'zh_TW') -languages = ('de', 'zh_TW') +#languages = ('de', 'zh_TW') for lang in languages: print 'getting language', lang -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
