Hello community, here is the log from the commit of package mftrace for openSUSE:Factory checked in at 2011-12-15 16:06:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mftrace (Old) and /work/SRC/openSUSE:Factory/.mftrace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mftrace", Maintainer is "sbra...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mftrace/mftrace.changes 2011-09-23 02:12:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mftrace.new/mftrace.changes 2011-12-15 16:06:49.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Dec 5 18:50:22 CET 2011 - sbra...@suse.cz + +- Upgrade to version 1.2.17: + * minor fixes + * potrace support improved + +------------------------------------------------------------------- +Mon Dec 5 16:30:10 UTC 2011 - cfarr...@suse.com + +- license update: GPL-2.0 + Various files are GPL-2.0 (i.e. only). Use SPDX format + +------------------------------------------------------------------- +Fri Dec 2 16:25:46 UTC 2011 - co...@suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- Old: ---- mftrace-1.2.15-rpm-opt-flags.patch mftrace-1.2.15.tar.bz2 New: ---- mftrace-1.2.17.tar.bz2 mftrace-python-compile.patch mftrace-rpm-opt-flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mftrace.spec ++++++ --- /var/tmp/diff_new_pack.HWK9KR/_old 2011-12-15 16:06:53.000000000 +0100 +++ /var/tmp/diff_new_pack.HWK9KR/_new 2011-12-15 16:06:53.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package mftrace (Version 1.2.15) +# spec file for package mftrace # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,37 +15,36 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: mftrace -BuildRequires: autotrace potrace python-devel -License: GPL v2 or later +BuildRequires: automake +BuildRequires: autotrace +BuildRequires: potrace +BuildRequires: python-devel +License: GPL-2.0 Group: Productivity/Publishing/TeX/Utilities -AutoReqProv: on Requires: python texlive bitmap_tracing t1utils fontforge -Version: 1.2.15 -Release: 1 +Version: 1.2.17 +Release: 0 Source: %{name}-%{version}.tar.bz2 Url: http://lilypond.org/mftrace/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Scalable PostScript Fonts for MetaFont -Patch: %{name}-%{version}-rpm-opt-flags.patch +# PATCH-FEATURE-OPENSUSE mftrace-rpm-opt-flags.patch sbra...@suse.cz -- Include RPM_OPT_FLAGS to CFLAGS (simple work-around). +Patch: %{name}-rpm-opt-flags.patch +# PATCH-FIX-UPSTREAM mftrace-python-compile.patch sbra...@suse.cz -- Compile python files after installation to ensure consistent time stamps. +Patch1: %{name}-python-compile.patch %description Mftrace is a small Python program that lets you trace a TeX bitmap font into a PFA or PFB font (A PostScript Type1 Scalable Font) or TTF (TrueType) font. - - -Authors: --------- - Han-Wen Nienhuys <han...@xs4all.nl> - %prep %setup -q %patch +%patch1 -p1 %build autoreconf -f -i ++++++ mftrace-1.2.15.tar.bz2 -> mftrace-1.2.17.tar.bz2 ++++++ ++++ 5830 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mftrace-1.2.15/GNUmakefile.in new/mftrace-1.2.17/GNUmakefile.in --- old/mftrace-1.2.15/GNUmakefile.in 2007-02-03 01:34:52.000000000 +0100 +++ new/mftrace-1.2.17/GNUmakefile.in 2008-08-16 04:17:43.000000000 +0200 @@ -111,7 +111,7 @@ @$(if $(shell git diff), echo "commit before disting" && false,true) if test -d .git ; then \ git tag -m '' release/$(VERSION) ; \ - git push $(GIT_MASTER_SITE) push tag release/$(VERSION) ; \ + git push $(GIT_MASTER_SITE) tag release/$(VERSION) ; \ fi scp $(distdir).tar.gz $(FTP_DIR) scp $< $(WWW_DIR)/index.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mftrace-1.2.15/README.txt new/mftrace-1.2.17/README.txt --- old/mftrace-1.2.15/README.txt 2008-08-16 04:16:20.000000000 +0200 +++ new/mftrace-1.2.17/README.txt 2011-03-12 16:03:38.000000000 +0100 @@ -22,7 +22,7 @@ ============ * - `http://lilypond.org/download/sources/mftrace/mftrace-1.2.15.tar.gz' + `http://lilypond.org/download/sources/mftrace/mftrace-1.2.17.tar.gz' * GIT at `http://repo.or.cz/w/mftrace.git' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mftrace-1.2.15/configure.in new/mftrace-1.2.17/configure.in --- old/mftrace-1.2.15/configure.in 2008-08-16 04:15:21.000000000 +0200 +++ new/mftrace-1.2.17/configure.in 2011-03-12 16:01:46.000000000 +0100 @@ -6,7 +6,7 @@ AC_PATH_PROG(POTRACE, potrace, none) AC_SUBST(PYTHON) -export VERSION="1.2.15" +export VERSION="1.2.17" AC_SUBST(VERSION) AC_SUBST(EXEEXT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mftrace-1.2.15/mftrace.py new/mftrace-1.2.17/mftrace.py --- old/mftrace-1.2.15/mftrace.py 2008-08-16 04:14:35.000000000 +0200 +++ new/mftrace-1.2.17/mftrace.py 2011-03-12 16:00:52.000000000 +0100 @@ -100,9 +100,7 @@ errorport.write (_ ("warning: ") + s) def error (s): - '''Report the error S. Exit by raising an exception. Please - do not abuse by trying to catch this error. If you do not want - a stack trace, write to the output directly. + '''Report the error S and exit with an error status of 1. RETURN VALUE @@ -111,7 +109,8 @@ ''' errorport.write (_ ("error: ") + s + '\n') - raise _ ("Exiting ... ") + errorport.write (_ ("Exiting ...") + '\n') + sys.exit(1) temp_dir = None class TempDirectory: @@ -491,10 +490,16 @@ if zs: z = zs[-1] - c = { 'rcurveto': 'rrcurveto', - 'moveto': 'rmoveto', - 'closepath': 'closepath', - 'rlineto': 'rlineto'}[c] + + c = { + 'closepath': 'closepath', + 'moveto': 'rmoveto', + 'rcurveto': 'rrcurveto', + # Potrace 1.9 + 'restore': '', + 'rlineto': 'rlineto', + '%%EOF': '', + }[c] if c == 'rmoveto': t1_outline += ' closepath ' @@ -721,6 +726,7 @@ if stat != 0: warning ("Command `%s -usage' failed. Cannot simplify or convert to TTF.\n" % fontforge_cmd) + return '' if fontforge_cmd == 'pfaedit' \ and re.search ("-script", open ('pfv').read ()) == None: @@ -825,7 +831,7 @@ ff_needed = 0 ff_command = "" - if (options.simplify or options.round_to_int or 'ttf' in formats or 'svg' in formats): + if (options.simplify or options.round_to_int or 'ttf' in formats or 'svg' in formats or 'afm' in formats): ff_needed = 1 if ff_needed: ff_command = get_fontforge_command () @@ -861,6 +867,8 @@ print 'Fontforge script', pe_script system ("%s -script to-ttf.pe %s %s" % (ff_command, shell_escape_filename (raw_name), shell_escape_filename (options.tfm_file))) + elif ff_needed and (options.simplify or options.round_to_int or 'ttf' in formats or 'svg' in formats): + error(_ ("fontforge is not installed; could not perform requested command")) else: t1_path = '' @@ -871,7 +879,10 @@ t1_path = assemble_font (fontname, 'pfb', 0) if (t1_path != '' and 'afm' in formats): - get_afm (t1_path, options.tfm_file, encoding, fontname + '.afm') + if get_binary("printafm"): + get_afm (t1_path, options.tfm_file, encoding, fontname + '.afm') + else: + error(_ ("Neither fontforge nor ghostscript is not installed; could not perform requested command")) def getenv (var, default): @@ -1109,12 +1120,16 @@ trace_command = potrace_command path_to_type1_ops = potrace_path_to_type1_ops + elif options.trace_binary == 'potrace' and stat != 0: + error (_ ("Could not run potrace; have you installed it?")) stat = os.system ('autotrace --version > /dev/null 2>&1 ') if options.trace_binary != 'potrace' and stat == 0: options.trace_binary = 'autotrace' trace_command = autotrace_command path_to_type1_ops = autotrace_path_to_type1_ops + elif options.trace_binary == 'autotrace' and stat != 0: + error (_ ("Could not run autotrace; have you installed it?")) if not options.trace_binary: error (_ ("No tracing program found.\nInstall potrace or autotrace.")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mftrace-1.2.15/mftrace.spec new/mftrace-1.2.17/mftrace.spec --- old/mftrace-1.2.15/mftrace.spec 2008-08-16 04:16:20.000000000 +0200 +++ new/mftrace-1.2.17/mftrace.spec 2011-03-12 16:03:38.000000000 +0100 @@ -1,7 +1,7 @@ #-*-RPM-SPEC-*- Summary: Generate scalable fonts for TeX Name: mftrace -Version: 1.2.15 +Version: 1.2.17 Release: 1 URL: http://www.cs.uu.nl/~hanwen/mftrace Source0: %{name}-%{version}.tar.gz ++++++ mftrace-python-compile.patch ++++++ The timestamp embedded in the python bytecode file (mtime of original source in 2006) isn't equal to the mtime of the installed source file (now), which will force the interpreter to recompile the .py source every time, ignoring the saved bytecode. This patch should fix it by moving compilation to the install phase. Index: mftrace-1.2.17/GNUmakefile.in =================================================================== --- mftrace-1.2.17.orig/GNUmakefile.in +++ mftrace-1.2.17/GNUmakefile.in @@ -1,7 +1,6 @@ # -*-makefile-*- PY_MODULES= afm.py tfm.py -PYC_MODULES = $(PY_MODULES:%=%c) FILES= mftrace.py GNUmakefile.in \ gf2pbm.c mftrace.1 \ COPYING \ @@ -65,18 +64,16 @@ GNUmakefile: GNUmakefile.in configure ./config.status chmod a-w GNUmakefile -%.pyc: %.py - $(PYTHON) -c 'import py_compile; py_compile.compile ("$<", cfile="$@")' - -install: mftrace gf2pbm $(PYC_MODULES) install-man install-py +install: mftrace gf2pbm install-man install-py install -d $(DESTDIR)$(bindir) install mftrace $(DESTDIR)$(bindir) install gf2pbm$(EXEEXT) $(DESTDIR)$(bindir)/gf2pbm$(EXEEXT) -install-py: $(PY_MODULES) $(PYC_MODULES) +install-py: $(PY_MODULES) install -d $(DESTDIR)$(datadir) install -m644 $^ $(DESTDIR)$(datadir) + $(PYTHON) -m compileall -d $(datadir) $(DESTDIR)$(datadir) install-man: $(MANPAGES) install -d $(DESTDIR)$(mandir)/man1 @@ -95,7 +92,7 @@ uninstall: clean: rm -f config.cache config.h config.log config.status GNUmakefile - rm -f mftrace gf2pbm $(PYC_MODULES) + rm -f mftrace gf2pbm rm -f *'~' '#'* ++++++ mftrace-rpm-opt-flags.patch ++++++ Index: GNUmakefile.in =================================================================== --- GNUmakefile.in.orig 2007-02-03 01:31:21.000000000 +0100 +++ GNUmakefile.in 2008-05-23 07:15:55.000000000 +0200 @@ -8,7 +8,7 @@ FILES= mftrace.py GNUmakefile.in \ README.texi README.txt ChangeLog \ mftrace.spec.in mftrace.spec \ $(PY_MODULES) configure configure.in config.h.in -CFLAGS = -Wall -O2 +CFLAGS += -Wall -O2 ## retain during override. CFLAGS += -I. -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
