Resolves:rh#1430124 - can't import fontforge and psMat python modules

2017-03-08 10:37:02 +05:30
22 changed files with 2364 additions and 799 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -13,15 +13,3 @@ fontforge_full-20100501.tar.bz2
 /20150612.tar.gz
 /fontforge-20150824.tar.gz
 /fontforge-20160404.tar.gz
-/fontforge-20161001.tar.gz
-/fontforge-20161004.tar.gz
-/fontforge-20161005.tar.gz
-/fontforge-20161012.tar.gz
-/fontforge-20170731.tar.gz
-/gnulib-b324052.tar.gz
-/fontforge-20190317.tar.gz
-/fontforge-20190413.tar.gz
-/fontforge-20200314.tar.gz
-/fontforge-20201107.tar.gz
-/fontforge-20230101.tar.gz
-/fontforge-20251009.tar.gz
--- a/0001-Fix-errors-in-French-and-Italian-translations.patch
+++ b/0001-Fix-errors-in-French-and-Italian-translations.patch
@ -1,181 +0,0 @@
-From 472e238cafcff113c7be9815a13ff864540d5ef9 Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Thu, 6 Jul 2023 19:15:53 -0400
-Subject: [PATCH] Fix errors in French and Italian translations
-
-With gettext-0.22, these mismatches trigger errors:
-
-'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the
-directive number 2, the argument size specifier is invalid.
---
- po/fr.po | 36 ++++++++++++++++++------------------
- po/it.po |  8 ++++----
- 2 files changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/po/fr.po b/po/fr.po
-index 26e446b38..cb492d7a0 100644
--- a/po/fr.po
-+++ b/po/fr.po
-@@ -291,7 +291,7 @@ msgstr "chaîne %1$.30s pour %2$.30s"
- #. GT: $4 is the changed flag ('*' for the changed items)
- #, c-format
- msgid "%1$.80s at %2$d from %3$.90s%4$s"
-msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
-+msgstr "%1$.80s à %2$d de %3$.90s%4$s"
- 
- #. GT: This is the title for a window showing a bitmap character
- #. GT: It will look something like:
-@@ -302,7 +302,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
- #. GT: $4 is the font name
- #, c-format
- msgid "%1$.80s at %2$d size %3$d from %4$.80s"
-msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs"
-+msgstr "%1$.80s (%2$d) taille %3$d de %4$.80s"
- 
- #, c-format
- msgid "%1$s from lookup subtable %2$.50s"
-@@ -7433,7 +7433,7 @@ msgid ""
- "Reverting the file will lose those changes.\n"
- "Is that what you want?"
- msgstr ""
-"La fonte %1$.40s dans le fichier %2$.40hs a été modifiée.\n"
-+"La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n"
- "Revenir vous fera perdre toutes les modifications.\n"
- "Voulez vous vraiment revenir ?"
- 
-@@ -19925,7 +19925,7 @@ msgid ""
- "The fonts %1$.30s and %2$.30s have a different number of glyphs or different "
- "encodings"
- msgstr ""
-"Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des "
-+"Les fontes %1$.30s et %2$.30s n'ont pas le même nombre de glyphes ou des "
- "codages différents"
- 
- #, c-format
-@@ -19933,7 +19933,7 @@ msgid ""
- "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, "
- "one cubic)"
- msgstr ""
-"Les fontes %1$.30s et %2$.30hs utilisent des courbes de Bézier d'ordres "
-+"Les fontes %1$.30s et %2$.30s utilisent des courbes de Bézier d'ordres "
- "différents (quadratique et cubique)"
- 
- msgid "The generated font won't work with ATM"
-@@ -19968,8 +19968,8 @@ msgid ""
- "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours "
- "than in %3$.30s"
- msgstr ""
-"Le glyphe %1$.30s dans la police %2$.30hs a un masque de hints différent que "
-"dans %3$.30hs"
-+"Le glyphe %1$.30s dans la police %2$.30s a un masque de hints différent que "
-+"dans %3$.30s"
- 
- #, c-format
- msgid ""
-@@ -19984,8 +19984,8 @@ msgid ""
- "The glyph %1$.30s in font %2$.30s has a different number of references than "
- "in %3$.30s"
- msgstr ""
-"Le glyphe %1$.30s de la fonte %2$.30hs a un nombre de références différent "
-"dans %3$.30hs"
-+"Le glyphe %1$.30s de la fonte %2$.30s a un nombre de références différent "
-+"dans %3$.30s"
- 
- #, c-format
- msgid ""
-@@ -20457,7 +20457,7 @@ msgstr ""
- #, c-format
- msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s"
- msgstr ""
-"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs"
-+"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60s"
- 
- msgid "The paths that make up this glyph intersect one another"
- msgstr "Les chemins qui composent ce glyphe se coupent les uns les autres"
-@@ -21042,7 +21042,7 @@ msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP"
- 
- #, c-format
- msgid "There is already an anchor point named %1$.40s in %2$.40s."
-msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs."
-+msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40s."
- 
- msgid "There is another glyph in the font with this name"
- msgstr "Il y a un autre glyphe dans la fonte avec ce nom"
-@@ -21441,8 +21441,8 @@ msgid ""
- "been able to find is %1$.20s-%2$.20s-%4$d.\n"
- "Shall I use that or let you search?"
- msgstr ""
-"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20hs-%3$d, mais "
-"ce que j'ai trouvé de mieux c'est %1$.20hs-%2$.20hs-%4$d.\n"
-+"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20s-%3$d, mais "
-+"ce que j'ai trouvé de mieux c'est %1$.20s-%2$.20s-%4$d.\n"
- "Devrais-je utiliser cette valeur ou préférez vous chercher ?"
- 
- msgid ""
-@@ -21770,7 +21770,7 @@ msgid ""
- "with a 0 offset for this combination. Would you like to alter this kerning "
- "class entry (or create a kerning pair for just these two glyphs)?"
- msgstr ""
-"Cette paire de crénage (%.20s et %.20hs) est dans une classe de crénage\n"
-+"Cette paire de crénage (%.20s et %.20s) est dans une classe de crénage\n"
- "avec un déplacement de 0 pour cette combinaison. Voulez-vous modifier cette "
- "partie\n"
- "de la classe de crénage (ou créer une nouvelle paire rien que pour ces 2 "
-@@ -24551,8 +24551,8 @@ msgid ""
- "referred to.\n"
- "It will not be copied."
- msgstr ""
-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n"
-"Mais %1$hs n'existe pas dans cette fonte, et FontForge ne trouve pas le "
-+"Vous essayer de coller une référence vers %1$s dans %2$s.\n"
-+"Mais %1$s n'existe pas dans cette fonte, et FontForge ne trouve pas le "
- "glyphe auquel il se référait.\n"
- "Le glyphe ne sera pas copié."
- 
-@@ -24562,8 +24562,8 @@ msgid ""
- "But %1$s does not exist in this font.\n"
- "Would you like to copy the original splines (or delete the reference)?"
- msgstr ""
-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n"
-"Mais %1$hs n'existe pas dans cette fonte.\n"
-+"Vous essayer de coller une référence vers %1$s dans %2$s.\n"
-+"Mais %1$s n'existe pas dans cette fonte.\n"
- "Voulez vous copier le contour d'origine (ou supprimer la référence)?"
- 
- msgid ""
-diff --git a/po/it.po b/po/it.po
-index e13711485..d0c3ea987 100644
--- a/po/it.po
-+++ b/po/it.po
-@@ -2303,7 +2303,7 @@ msgid ""
- "Reverting the file will lose those changes.\n"
- "Is that what you want?"
- msgstr ""
-"Il font %1$.40s nel file %2$.40hs è stato modificato.\n"
-+"Il font %1$.40s nel file %2$.40s è stato modificato.\n"
- "Ripristinando il file perderai tutte le modifiche.\n"
- "È quello che vuoi fare?"
- 
-@@ -5835,7 +5835,7 @@ msgid ""
- "The glyph %1$.30s has a different number of contours in font %2$.30s than in "
- "%3$.30s"
- msgstr ""
-"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30hs rispetto "
-+"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30s rispetto "
- "a %3$.30s"
- 
- #, c-format
-@@ -6235,8 +6235,8 @@ msgid ""
- "been able to find is %1$.20s-%2$.20s-%4$d.\n"
- "Shall I use that or let you search?"
- msgstr ""
-"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20hs-%3$d, ma "
-"il migliore che io abbia trovato è %1$.20hs-%2$.20hs-%4$d.\n"
-+"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20s-%3$d, ma "
-+"il migliore che io abbia trovato è %1$.20s-%2$.20s-%4$d.\n"
- "Devo usare questo valore o preferisci cercare tu stesso?"
- 
- msgid ""
-- 
-2.41.0
-
--- a/Add-python3-support.patch
+++ b/Add-python3-support.patch
@ -0,0 +1,473 @@
+From 75426cbbe57138849b96537ab1dee81e7861af11 Mon Sep 17 00:00:00 2001
+From: Parag Nemade <pnemade@redhat.com>
+Date: Fri, 8 Apr 2016 12:03:12 +0530
+Subject: [PATCH] Add python3 support
+
+---
+ pycontrib/FontCompare/fc/BitmapHandler.py    | 20 +++++++--------
+ pycontrib/FontCompare/fc/DocCompare.py       |  2 +-
+ pycontrib/FontCompare/fc/FontCompare.py      |  2 +-
+ pycontrib/FontCompare/fc/GlyphConsistency.py |  2 +-
+ pycontrib/FontCompare/fontcompare            |  2 +-
+ pycontrib/FontCompare/unittests/unittests.py | 18 ++++++-------
+ pycontrib/collab/web-test-collab.py          |  2 +-
+ pycontrib/even.py                            |  2 +-
+ pycontrib/gdraw/__init__.py                  |  2 +-
+ pycontrib/gdraw/gdraw.py                     | 18 ++++++-------
+ pycontrib/graphicore.py                      |  2 +-
+ pycontrib/graphicore/ipython_view.py         | 13 +++++-----
+ pycontrib/graphicore/shell.py                |  2 +-
+ pycontrib/svg2sfd.py                         | 38 ++++++++++++++--------------
+ pycontrib/webcollab.py                       |  2 +-
+ 15 files changed, 64 insertions(+), 63 deletions(-)
+
+diff --git a/pycontrib/FontCompare/fc/BitmapHandler.py b/pycontrib/FontCompare/fc/BitmapHandler.py
+index d4d00da..c159128 100644
+--- a/pycontrib/FontCompare/fc/BitmapHandler.py
+++ b/pycontrib/FontCompare/fc/BitmapHandler.py
+@@ -35,7 +35,7 @@ def white_bg_square(img):
+     "return a white-background-color image having the img in exact center"
+     size = (max(img.size),)*2
+     layer = Image.new('1', size, 1)
+-    layer.paste(img, tuple(map(lambda x:(x[0]-x[1])/2, zip(size, img.size))))
+    layer.paste(img, tuple([(x[0]-x[1])/2 for x in zip(size, img.size)]))
+     return layer
+ 
+ class BitmapCompare:
+@@ -73,13 +73,13 @@ class CreateSpriteSheet:
+         #seperate each image with lots of whitespace
+         master_height = pixelsize
+         oldfont = font
+-        print "the master image will by %d by %d" % (master_width, master_height)
+-        print "creating image..."
+        print("the master image will by %d by %d" % (master_width, master_height))
+        print("creating image...")
+         master = Image.new(
+         mode='1',
+         size=(master_width, master_height),
+         color=0) # fully transparent
+-        print "created."
+        print("created.")
+         if effects == "italic":
+             font.selection.all()
+             font = font.italicize(-13)
+@@ -92,16 +92,16 @@ class CreateSpriteSheet:
+                     font[i].changeWeight(50,"auto",0,0,"auto")
+                 font[i].export("temp.bmp",pixelsize,1)
+                 img = Image.open("temp.bmp")
+-                print "adding %s at %d..." % (str(i)+".bmp", location),
+                print("adding %s at %d..." % (str(i)+".bmp", location), end=' ')
+                 square_one = white_bg_square(img)
+                 square_one.resize((pixelsize, pixelsize))
+                 master.paste(square_one,(location,0))
+-                print "added."
+                print("added.")
+             except:
+-                print "ooopsy"
+                print("ooopsy")
+             count+=1
+-        print "done adding pics."
+-        print "saving mastersprite.bmp..."
+        print("done adding pics.")
+        print("saving mastersprite.bmp...")
+         master.save('data/mastersprite'+effects+'.bmp' )
+-        print "saved!"
+        print("saved!")
+         font.close()
+diff --git a/pycontrib/FontCompare/fc/DocCompare.py b/pycontrib/FontCompare/fc/DocCompare.py
+index 3a54bf9..df431e2 100644
+--- a/pycontrib/FontCompare/fc/DocCompare.py
+++ b/pycontrib/FontCompare/fc/DocCompare.py
+@@ -41,7 +41,7 @@ class DocCompare:
+         bashcommand = "hb-view --output-format=\"png\" --output-file=\"/var/tmp/test.png\" --font-size="+str(fontsize)+" --text-file=\""
+         bashcommand+=docpath+"\" "+"\""+testpath+"\""
+         os.system(str(bashcommand))
+-        print bashcommand
+        print(bashcommand)
+         thefile = pkg_resources.resource_filename("fc",mockfont.highresdocfile)
+         shutil.copy(thefile,"/var/tmp/standard.png")
+         cm = BitmapCompare()
+diff --git a/pycontrib/FontCompare/fc/FontCompare.py b/pycontrib/FontCompare/fc/FontCompare.py
+index f21718c..c82b788 100644
+--- a/pycontrib/FontCompare/fc/FontCompare.py
+++ b/pycontrib/FontCompare/fc/FontCompare.py
+@@ -111,7 +111,7 @@ class FontCompare(object):
+         scores = list()
+         comparator = BitmapCompare()
+         pixelsize = (resolution*ptsize)/72
+-        print spritepath
+        print(spritepath)
+         for i in range (glyphRange[0],glyphRange[1]):
+             if i in Testfont:
+                 Testfont[i].export("/var/tmp/tmp.bmp",pixelsize,1)
+diff --git a/pycontrib/FontCompare/fc/GlyphConsistency.py b/pycontrib/FontCompare/fc/GlyphConsistency.py
+index 38273c9..d5265fa 100644
+--- a/pycontrib/FontCompare/fc/GlyphConsistency.py
+++ b/pycontrib/FontCompare/fc/GlyphConsistency.py
+@@ -102,7 +102,7 @@ class GlyphConsistency:
+         for i in range (glyphrange[0],glyphrange[1]):
+             if i in font:
+                 score =  self.glyph_round_compare(font[i],pixelsize)
+-                print score
+                print(score)
+                 set_round_score+=score
+                 total+=1
+         font.close()
+diff --git a/pycontrib/FontCompare/fontcompare b/pycontrib/FontCompare/fontcompare
+index e7e68d8..fdf7336 100755
+--- a/pycontrib/FontCompare/fontcompare
+++ b/pycontrib/FontCompare/fontcompare
+@@ -15,7 +15,7 @@
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ """
+ 
+-#! /usr/bin/python
+#! /usr/bin/python3
+ from PyQt4.QtGui import QMessageBox
+ from PyQt4.QtGui import QMainWindow
+ from PyQt4.QtGui import QApplication
+diff --git a/pycontrib/FontCompare/unittests/unittests.py b/pycontrib/FontCompare/unittests/unittests.py
+index 18e1e95..d8a1190 100644
+--- a/pycontrib/FontCompare/unittests/unittests.py
+++ b/pycontrib/FontCompare/unittests/unittests.py
+@@ -55,7 +55,7 @@ class Basictests(unittest.TestCase):
+         for tup in basic:
+             if tup[1]!=10:
+                 bastest=0
+-        self.failUnless(bastest)
+        self.assertTrue(bastest)
+         testfont = fontforge.open("unittests/lohit.ttf")
+         bold = cm.font_facecompare(testfont,mockfont,(0x900,0x97f),\
+         600,12,1,"bold")
+@@ -66,28 +66,28 @@ class Basictests(unittest.TestCase):
+         normal = cm.font_facecompare(testfont,mockfont,(0x900,0x97f),\
+         600,12,1,"normal")
+         test = 1
+-        print len(normal)
+        print(len(normal))
+         for tup in bold:
+             if tup[1]==100 or tup[1]==0:
+                 test1=1
+                 break
+-        self.failUnless(test)
+        self.assertTrue(test)
+         test = 0
+         for tup in italic:
+             if tup[1]==100 or tup[1]==0:
+                 test=1
+                 break
+-        self.failUnless(test is 1)
+        self.assertTrue(test is 1)
+         test = 0
+         for tup in normal:
+             if tup[1]==100 or tup[1]==0:
+                 test=1
+                 break
+-        self.failUnless(test is 1)
+        self.assertTrue(test is 1)
+         test = 0
+         if len(normal) == len(bold) == len(italic):
+             test = 1
+-        self.failUnless(test is 1)
+        self.assertTrue(test is 1)
+ 
+     def testGlyphConsistency(self):
+         cm = GlyphConsistency()
+@@ -99,11 +99,11 @@ class Basictests(unittest.TestCase):
+         test3 = cm.glyph_round_consistency(testfont,(0x900,0x97f),50)
+ 
+         test = (0 <= test1[0][1] <= 10)
+-        self.failUnless(test)
+        self.assertTrue(test)
+         test2 = (0 <= test2 <= 10)
+-        self.failUnless(test2)
+        self.assertTrue(test2)
+         test3 = (0 <= test3 <= 10)
+-        self.failUnless(test3)
+        self.assertTrue(test3)
+ 
+ """
+ unittests for DocCompare not required.
+diff --git a/pycontrib/collab/web-test-collab.py b/pycontrib/collab/web-test-collab.py
+index 47b763f..b19f930 100755
+--- a/pycontrib/collab/web-test-collab.py
+++ b/pycontrib/collab/web-test-collab.py
+@@ -68,7 +68,7 @@ def OnCollabUpdate(f):
+             "end": "null" # this is simply so we dont have to manage keeping the last item with no terminating ,
+             }, 
+             sort_keys=True, indent=4, separators=(',', ': '))
+-    print js
+    print(js)
+     fi = open(fontJsonOnDisk, 'w')
+     fi.write(js)
+ 
+diff --git a/pycontrib/even.py b/pycontrib/even.py
+index 96f9128..4f30fcb 100755
+--- a/pycontrib/even.py
+++ b/pycontrib/even.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ """
+ running even from the fontforge menu
+diff --git a/pycontrib/gdraw/__init__.py b/pycontrib/gdraw/__init__.py
+index d47976c..25bf981 100644
+--- a/pycontrib/gdraw/__init__.py
+++ b/pycontrib/gdraw/__init__.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ # vim:ts=8:sw=4:expandtab:encoding=utf-8
+ '''
+ Copyright <hashao2@gmail.com> 2009
+diff --git a/pycontrib/gdraw/gdraw.py b/pycontrib/gdraw/gdraw.py
+index f2d5e50..3ed3abd 100755
+--- a/pycontrib/gdraw/gdraw.py
+++ b/pycontrib/gdraw/gdraw.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ '''ctypes wrapper to Attach the GDraw event handler to the gtk main loop.
+ 
+ Copyright <hashao2@gmail.com> 2009
+@@ -111,7 +111,7 @@ class Timer:
+ 
+         return
+         def dodo(*args):
+-            print 'aaa'
+            print('aaa')
+             return False
+         self.add(1000, dodo)
+ 
+@@ -122,7 +122,7 @@ class Timer:
+ 
+     def _event_handler(self, gw, event):
+         evt = event.contents
+-        print "_event_handler()"
+        print("_event_handler()")
+         if evt.type == et_timer:
+             timer = evt.u.timer.timer
+             tkey = addressof(timer.contents)
+@@ -147,7 +147,7 @@ class Timer:
+         ci.func = CallBackFunc(func)
+         ci.data = data
+ 
+-        print "timer.add timeout", timeout
+        print("timer.add timeout", timeout)
+         frequency = 1 # Use return value of func() to decide repeat like gtk.
+         timer = GDrawRequestTimer(self.win, timeout, timeout, byref(ci))
+ 
+@@ -190,7 +190,7 @@ class GtkRunner:
+ 
+     def _do_main(self, *args):
+         '''The function called by the gdraw timeout handler.'''
+-        print "do_main"
+        print("do_main")
+         while gtk.events_pending():
+             gtk.main_iteration(False)
+         return True
+@@ -207,15 +207,15 @@ class GtkRunner:
+             self.gtk_timer = None
+ 
+     def OnDestroyWindow(self, widget, fd ):
+-        print fd
+        print(fd)
+         fontforge.removeGtkWindowToMainEventLoopByFD( fd )
+         self.stop()
+         return True
+ 
+     def sniffwindow(self,w):
+         '''sniff key presses for a gtk window'''
+-        print "sniffwindow w", w
+-        print "sniff active font:", fontforge.activeFont()
+        print("sniffwindow w", w)
+        print("sniff active font:", fontforge.activeFont())
+         w.connect("key-release-event", self._do_main)
+         fontforge.addGtkWindowToMainEventLoop(w.window.xid)
+         fd = fontforge.getGtkWindowMainEventLoopFD(w.window.xid)
+@@ -223,7 +223,7 @@ class GtkRunner:
+ 
+     def sniffwindowid(self,xid):
+         '''sniff key presses for a gtk window'''
+-        print "sniffwindowid xid", xid
+        print("sniffwindowid xid", xid)
+         #w.connect("key-release-event", self._do_main)
+ 
+     def start(self, timeout=GTIMEOUT):
+diff --git a/pycontrib/graphicore.py b/pycontrib/graphicore.py
+index f95e488..a986327 100755
+--- a/pycontrib/graphicore.py
+++ b/pycontrib/graphicore.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ """
+ running the fontforge scripts in the graphicore folder on fontforge startup
+diff --git a/pycontrib/graphicore/ipython_view.py b/pycontrib/graphicore/ipython_view.py
+index f39eedb..2b77395 100644
+--- a/pycontrib/graphicore/ipython_view.py
+++ b/pycontrib/graphicore/ipython_view.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ '''
+ Provides IPython console widget.
+ 
+@@ -17,10 +17,11 @@ import re
+ import sys
+ import os
+ import pango
+-from StringIO import StringIO
+-import thread
+from io import StringIO
+import _thread
+ 
+ import IPython
+from functools import reduce
+ 
+ class IterableIPShell:
+   '''
+@@ -118,7 +119,7 @@ class IterableIPShell:
+     '''
+     This function updates namespace with sys.modules
+     '''
+-    for k,v in sys.modules.items():
+    for k,v in list(sys.modules.items()):
+       if not '.' in k:
+         self.IP.user_ns.update({k:v})
+ 
+@@ -271,11 +272,11 @@ class IterableIPShell:
+     @type header: string
+     '''
+     stat = 0
+-    if verbose or debug: print header+cmd
+    if verbose or debug: print(header+cmd)
+     # flush stdout so we don't mangle python's buffering
+     if not debug:
+       input, output = os.popen4(cmd)
+-      print output.read()
+      print(output.read())
+       output.close()
+       input.close()
+ 
+diff --git a/pycontrib/graphicore/shell.py b/pycontrib/graphicore/shell.py
+index 5d102f7..2728ae2 100755
+--- a/pycontrib/graphicore/shell.py
+++ b/pycontrib/graphicore/shell.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ """
+ FontForge Interactive Python Shell
+diff --git a/pycontrib/svg2sfd.py b/pycontrib/svg2sfd.py
+index e1fc0ac..e23cb15 100644
+--- a/pycontrib/svg2sfd.py
+++ b/pycontrib/svg2sfd.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ #
+ # Copyright 2013 Google Inc. All rights reserved.
+ # 
+@@ -49,7 +49,7 @@ def print_one_cmd(cmd, args):
+       result.append('%f' % (scale * args[i]))
+   result.append(cmd)
+   result.append('0')  # TODO: should mark corner points
+-  print ' '.join(result)
+  print(' '.join(result))
+ 
+ def apply_rel_xy(xy, args):
+   x0, y0 = xy
+@@ -75,7 +75,7 @@ def path_to_sfd(path):
+     for i in range(num_args_cmd(cmd)):
+       m = fre.match(path)
+       if m is None:
+-        print 'no float match:', path
+        print('no float match:', path)
+       args.append(float(m.group(1)))
+       path = path[m.end():]
+     #print cmd, args
+@@ -128,13 +128,13 @@ def conv_svg(fn, char, glyphnum = None):
+   if glyphnum == None:
+     glyphnum = lastglyphnum + 1
+   lastglyphnum = glyphnum
+-  print 'StartChar:', os.path.basename(fn)[:-4]
+-  print 'Encoding: %d %d %d' % (char, glyphnum, char)
+-  print 'Width: %d' % (21 * 40)
+-  print 'Flags: W'
+-  print 'LayerCount: 2'
+-  print 'Fore'
+-  print 'SplineSet'
+  print('StartChar:', os.path.basename(fn)[:-4])
+  print('Encoding: %d %d %d' % (char, glyphnum, char))
+  print('Width: %d' % (21 * 40))
+  print('Flags: W')
+  print('LayerCount: 2')
+  print('Fore')
+  print('SplineSet')
+   doc = xml.dom.minidom.parse(fn)
+   # TODO: reverse paths if fill color is white-ish (this is more code,
+   # and in the meantime, we'll rely on correct path direction in FF)
+@@ -147,16 +147,16 @@ def conv_svg(fn, char, glyphnum = None):
+     cy = float(circle.getAttribute('cy'))
+     r = float(circle.getAttribute('r'))
+     circle_to_sfd(cx, cy, r)
+-  print 'EndSplineSet'
+-  print 'EndChar'
+  print('EndSplineSet')
+  print('EndChar')
+ 
+ def print_header():
+   global header_printed
+-  print '''SplineFontDB: 3.0
+  print('''SplineFontDB: 3.0
+ FontName: %s
+ FullName: %s
+-FamilyName: %s''' % (font_name, font_name, font_name)
+-  print '''Weight: Medium
+FamilyName: %s''' % (font_name, font_name, font_name))
+  print('''Weight: Medium
+ Copyright: Copyright (C) 2011 Google Inc.
+ Version: 001.000
+ UnderlinePosition: -120
+@@ -180,12 +180,12 @@ HheadAOffset: 0
+ HheadDescent: 200
+ HheadDOffset: 0
+ BeginChars: 57600 57600
+-'''
+''')
+   header_printed = True
+ 
+ def print_footer():
+-  print '''EndChars
+-EndSplineFont'''
+  print('''EndChars
+EndSplineFont''')
+ 
+ def parse_int(x):
+   if x.startswith('0x'):
+@@ -197,7 +197,7 @@ def run_file(fn):
+   global char_num
+   global font_name
+   directory = ''
+-  for l in file(fn).xreadlines():
+  for l in file(fn):
+     if l.startswith('#'):
+       continue
+     s = l.strip().split()
+diff --git a/pycontrib/webcollab.py b/pycontrib/webcollab.py
+index 9ee0f17..f96828c 100755
+--- a/pycontrib/webcollab.py
+++ b/pycontrib/webcollab.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ """
+ running web collab server hooks
+-- 
+2.7.3
+
--- a/Fix_Splinefont_shell_invocation.patch
+++ b/Fix_Splinefont_shell_invocation.patch
@ -1,178 +0,0 @@
-From a64099931ea004a08e074b08ad0984d92c25daa2 Mon Sep 17 00:00:00 2001
-From: Peter Kydas <pk@canva.com>
-Date: Tue, 6 Feb 2024 10:23:36 +1100
-Subject: [PATCH] fix splinefont shell command injection
-
---
- fontforge/splinefont.c | 125 +++++++++++++++++++++++++++++------------
- 1 file changed, 90 insertions(+), 35 deletions(-)
-
-diff --git a/fontforge/splinefont.c b/fontforge/splinefont.c
-index 239fdc035b..647daee109 100644
--- a/fontforge/splinefont.c
-+++ b/fontforge/splinefont.c
-@@ -788,11 +788,14 @@ return( name );
- 
- char *Unarchive(char *name, char **_archivedir) {
-     char *dir = getenv("TMPDIR");
-    char *pt, *archivedir, *listfile, *listcommand, *unarchivecmd, *desiredfile;
-+    char *pt, *archivedir, *listfile, *desiredfile;
-     char *finalfile;
-     int i;
-     int doall=false;
-     static int cnt=0;
-+    gchar *command[5];
-+    gchar *stdoutresponse = NULL;
-+    gchar *stderrresponse = NULL;
- 
-     *_archivedir = NULL;
- 
-@@ -827,18 +830,30 @@ return( NULL );
-     listfile = malloc(strlen(archivedir)+strlen("/" TOC_NAME)+1);
-     sprintf( listfile, "%s/" TOC_NAME, archivedir );
- 
-    listcommand = malloc( strlen(archivers[i].unarchive) + 1 +
-			strlen( archivers[i].listargs) + 1 +
-			strlen( name ) + 3 +
-			strlen( listfile ) +4 );
-    sprintf( listcommand, "%s %s %s > %s", archivers[i].unarchive,
-	    archivers[i].listargs, name, listfile );
-    if ( system(listcommand)!=0 ) {
-	free(listcommand); free(listfile);
-	ArchiveCleanup(archivedir);
-return( NULL );
-    }
-    free(listcommand);
-+    command[0] = archivers[i].unarchive;
-+    command[1] = archivers[i].listargs;
-+    command[2] = name;
-+    command[3] = NULL; // command args need to be NULL-terminated
-+
-+    if ( g_spawn_sync(
-+                      NULL,
-+                      command,
-+                      NULL,
-+                      G_SPAWN_SEARCH_PATH, 
-+                      NULL, 
-+                      NULL, 
-+                      &stdoutresponse, 
-+                      &stderrresponse, 
-+                      NULL, 
-+                      NULL
-+                      ) == FALSE) { // did not successfully execute
-+      ArchiveCleanup(archivedir);
-+      return( NULL );
-+    }
-+    // Write out the listfile to be read in later
-+    FILE *fp = fopen(listfile, "wb");
-+    fwrite(stdoutresponse, strlen(stdoutresponse), 1, fp);
-+    fclose(fp);
- 
-     desiredfile = ArchiveParseTOC(listfile, archivers[i].ars, &doall);
-     free(listfile);
-@@ -847,22 +862,28 @@ return( NULL );
- return( NULL );
-     }
- 
-    /* I tried sending everything to stdout, but that doesn't work if the */
-    /*  output is a directory file (ufo, sfdir) */
-    unarchivecmd = malloc( strlen(archivers[i].unarchive) + 1 +
-			strlen( archivers[i].listargs) + 1 +
-			strlen( name ) + 1 +
-			strlen( desiredfile ) + 3 +
-			strlen( archivedir ) + 30 );
-    sprintf( unarchivecmd, "( cd %s ; %s %s %s %s ) > /dev/null", archivedir,
-	    archivers[i].unarchive,
-	    archivers[i].extractargs, name, doall ? "" : desiredfile );
-    if ( system(unarchivecmd)!=0 ) {
-	free(unarchivecmd); free(desiredfile);
-	ArchiveCleanup(archivedir);
-return( NULL );
-+    command[0] = archivers[i].unarchive;
-+    command[1] = archivers[i].extractargs;
-+    command[2] = name;
-+    command[3] = doall ? "" : desiredfile;
-+    command[4] = NULL;
-+
-+    if ( g_spawn_sync(
-+                      (gchar*)archivedir,
-+                      command,
-+                      NULL,
-+                      G_SPAWN_SEARCH_PATH, 
-+                      NULL, 
-+                      NULL, 
-+                      &stdoutresponse, 
-+                      &stderrresponse, 
-+                      NULL, 
-+                      NULL
-+                      ) == FALSE) { // did not successfully execute
-+      free(desiredfile);
-+      ArchiveCleanup(archivedir);
-+      return( NULL );
-     }
-    free(unarchivecmd);
- 
-     finalfile = malloc( strlen(archivedir) + 1 + strlen(desiredfile) + 1);
-     sprintf( finalfile, "%s/%s", archivedir, desiredfile );
-@@ -885,20 +906,54 @@ struct compressors compressors[] = {
- 
- char *Decompress(char *name, int compression) {
-     char *dir = getenv("TMPDIR");
-    char buf[1500];
-     char *tmpfn;
-
-+    gchar *command[4];
-+    gint stdout_pipe;
-+    gchar buffer[4096];
-+    gssize bytes_read;
-+    GByteArray *binary_data = g_byte_array_new();
-+    
-     if ( dir==NULL ) dir = P_tmpdir;
-     tmpfn = malloc(strlen(dir)+strlen(GFileNameTail(name))+2);
-     strcpy(tmpfn,dir);
-     strcat(tmpfn,"/");
-     strcat(tmpfn,GFileNameTail(name));
-     *strrchr(tmpfn,'.') = '\0';
-    snprintf( buf, sizeof(buf), "%s < %s > %s", compressors[compression].decomp, name, tmpfn );
-    if ( system(buf)==0 )
-return( tmpfn );
-    free(tmpfn);
-return( NULL );
-+
-+    command[0] = compressors[compression].decomp;
-+    command[1] = "-c";
-+    command[2] = name;
-+    command[3] = NULL;
-+
-+    // Have to use async because g_spawn_sync doesn't handle nul-bytes in the output (which happens with binary data)
-+    if (g_spawn_async_with_pipes(
-+      NULL, 
-+      command, 
-+      NULL, 
-+      G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
-+      NULL, 
-+      NULL,  
-+      NULL,
-+      NULL, 
-+      &stdout_pipe, 
-+      NULL, 
-+      NULL) == FALSE) {
-+      //command has failed
-+      return( NULL );
-+    }
-+
-+    // Read binary data from pipe and output to file
-+    while ((bytes_read = read(stdout_pipe, buffer, sizeof(buffer))) > 0) {
-+        g_byte_array_append(binary_data, (guint8 *)buffer, bytes_read);
-+    }
-+    close(stdout_pipe);
-+
-+    FILE *fp = fopen(tmpfn, "wb");
-+    fwrite(binary_data->data, sizeof(gchar), binary_data->len, fp);
-+    fclose(fp);
-+    g_byte_array_free(binary_data, TRUE);
-+
-+		return(tmpfn);
- }
- 
- static char *ForceFileToHaveName(FILE *file, char *exten) {
--- a/fontforge-20090224-pythondl.patch
+++ b/fontforge-20090224-pythondl.patch
@ -0,0 +1,41 @@
+diff -Nur fontforge-20090224.orig/configure fontforge-20090224/configure
+--- fontforge-20090224.orig/configure	2008-12-24 14:04:18.000000000 -0700
+++ fontforge-20090224/configure	2009-04-01 22:56:07.000000000 -0600
+@@ -26670,6 +26670,7 @@
+   else
+     PYLIBS=""
+   fi
+  PYDEFINES="$PYDEFINES, ('SOLIBDIR','\"$libdir/\"')"
+   PY=pyhook/setup.py
+ fi
+ 
+diff -Nur fontforge-20090224.orig/pyhook/loadfontforge.h fontforge-20090224/pyhook/loadfontforge.h
+--- fontforge-20090224.orig/pyhook/loadfontforge.h	2007-12-23 19:28:35.000000000 -0700
+++ fontforge-20090224/pyhook/loadfontforge.h	2009-04-01 22:49:08.000000000 -0600
+@@ -11,7 +11,7 @@
+ 
+     if ( (lib = dlopen("libgunicode" SO_EXT,RTLD_LAZY))==NULL ) {
+ #ifdef PREFIX
+-	lib = dlopen( PREFIX "/lib/" "libgunicode" SO_EXT,RTLD_LAZY);
+	lib = dlopen( SOLIBDIR "libgunicode.so.3" ,RTLD_LAZY);
+ #endif
+     }
+     if ( lib==NULL ) {
+@@ -21,7 +21,7 @@
+ 
+     if ( (lib = dlopen("libgutils" SO_EXT,RTLD_LAZY))==NULL ) {
+ #ifdef PREFIX
+-	lib = dlopen( PREFIX "/lib/" "libgutils" SO_EXT,RTLD_LAZY);
+	lib = dlopen( SOLIBDIR "libgutils.so.1" ,RTLD_LAZY);
+ #endif
+     }
+     if ( lib==NULL ) {
+@@ -31,7 +31,7 @@
+ 
+     if ( (lib = dlopen("libfontforge" SO_EXT,RTLD_LAZY))==NULL ) {
+ #ifdef PREFIX
+-	lib = dlopen( PREFIX "/lib/" "libfontforge" SO_EXT,RTLD_LAZY);
+	lib = dlopen( SOLIBDIR "libfontforge.so.1" ,RTLD_LAZY);
+ #endif
+     }
+     if ( lib==NULL ) {
--- a/fontforge-20120731-pdf-bounds.patch
+++ b/fontforge-20120731-pdf-bounds.patch
@ -0,0 +1,37 @@
+--- fontforge-20120731-b/fontforge/parsepdf.c	2012-08-02 16:09:09.000000000 +0100
+++ fontforge-20120731-b-new/fontforge/parsepdf.c	2013-02-07 17:44:05.371466086 +0000
+@@ -1691,9 +1691,9 @@
+     /* to "Unicode" values it specifies rather than to the real order in which the glyphs are */
+     /* stored in the file */
+     pos = cmap_from_cid || sf->map == NULL ? gid : sf->map->map[gid];
+-    sc = sf->glyphs[pos];
+     
+-    if (pos >= 0 && pos < sf->glyphcnt && (sc->unicodeenc != uvals[0] || nuni > 1)) {
+    if (pos >= 0 && pos < sf->glyphcnt && (sf->glyphs[pos]->unicodeenc != uvals[0] || nuni > 1)) {
+	sc = sf->glyphs[pos];
+ 	/* Sometimes FF instead of assigning proper Unicode values to TTF glyphs keeps */
+ 	/* them encoded to the same codepoint, but creates for each glyph an alternate */
+ 	/* encoding, corresponding to the position this glyph has in the font's encoding */
+@@ -1723,6 +1723,7 @@
+     FILE *file;
+     int i, j, gid, start, end, uni, cur=0, nuni, nhex, nchars, lo, *uvals;
+     long *mappings;
+    size_t num_mappings;
+     char tok[200], *ccval, prevtok[200];
+     SplineFont *sf = basesf->subfontcnt > 0 ? basesf->subfonts[0] : basesf;
+ 
+@@ -1733,9 +1734,14 @@
+ return;
+     rewind(file);
+     
+    num_mappings = sf->glyphcnt;
+     mappings = gcalloc(sf->glyphcnt,sizeof(long));
+     while ( pdf_getprotectedtok(file,tok) >= 0 ) {
+ 	if ( strcmp(tok,"beginbfchar") == 0 && sscanf(prevtok,"%d",&nchars)) {
+	    if (cur + nchars >= num_mappings) {
+		num_mappings = cur + nchars;
+		mappings = grealloc(mappings, num_mappings * sizeof(long));
+	    }
+ 	    for (i=0; i<nchars; i++) {
+ 		if (pdf_skip_brackets(file,tok) >= 0 && sscanf(tok,"%x",&gid) &&
+ 		    pdf_skip_brackets(file,tok) >= 0 && sscanf(tok,"%lx",&mappings[cur])) {
--- a/fontforge-20120731-pdf-filters.patch
+++ b/fontforge-20120731-pdf-filters.patch
@ -0,0 +1,11 @@
+--- fontforge-20120731-b/fontforge/parsepdf.c.orig	2013-04-15 17:47:51.113706334 +0100
+++ fontforge-20120731-b/fontforge/parsepdf.c	2013-04-15 17:55:55.531682304 +0100
+@@ -960,6 +960,8 @@
+ 	    start = 0;
+ 	    num = pdf_getinteger(pt,pc);
+ 	}
+	if ( (pt=PSDictHasEntry(&pc->pdfdict,"DecodeParms"))!=NULL && strstr(pt, "/Predictor")!=NULL)
+return( NULL );
+ 	if ( (pt=PSDictHasEntry(&pc->pdfdict,"Index"))!=NULL ) {
+ 	    if ( sscanf(pt,"[%d %d]", &start, &num )!=2 )
+ return( NULL );
--- a/fontforge-20140813-use-system-uthash.patch
+++ b/fontforge-20140813-use-system-uthash.patch
@ -0,0 +1,30 @@
+--- Makefile.am.old	2014-08-12 10:07:32.000000000 +0530
+++ Makefile.am	2014-09-08 16:23:56.046996941 +0530
+@@ -43,7 +43,6 @@
+ AM_CPPFLAGS =
+ AM_LDFLAGS =
+ 
+-BUILT_SOURCES = uthash/src
+ EXTRA_DIST =
+ CLEANFILES =
+ MOSTLYCLEANFILES =
+@@ -113,7 +112,6 @@
+ 	Packaging/FontForge-doc.spec \
+ 	Packaging/FontForge.spec \
+ 	Packaging/FontForge.static.spec \
+-	uthash/src \
+ 	$(NULL)
+ 
+ #--------------------------------------------------------------------------
+@@ -129,11 +127,6 @@
+ 
+ 
+ #--------------------------------------------------------------------------
+-uthash/src:
+-	if [ ! -e uthash/src ]; then \
+-	if [ -e uthash ] ; then rm -r uthash ; fi ; \
+-	git clone https://github.com/troydhanson/uthash ; \
+-	fi ;
+ 
+ # We import a selection of targets from Frank's standard packaging Makefile.
+ 
--- a/fontforge-20160404-python3-import-psMat-fix.patch
+++ b/fontforge-20160404-python3-import-psMat-fix.patch
@ -0,0 +1,47 @@
+From 3c57c9c2482c39c9f5f18f41bda93090d2fc9a17 Mon Sep 17 00:00:00 2001
+From: Jeremy Tan <jtanx@outlook.com>
+Date: Tue, 4 Oct 2016 20:42:15 +0800
+Subject: [PATCH] Python3 scripting: Don't call RegisterAllPyModules from
+ imported modules
+
+This calls PyImport_AppendInittab. The behaviour has changed between
+Python 2 and 3. In 3, you cannot call this function anymore after
+Py_Initialize has been called. Meaning since the module has already
+been imported, Py_Initialize must have already been called before.
+
+This change means that FFPY_PYTHON_ENTRY_FUNCTION will now be called
+more than once (once for each module imported) on Python 3, so ensure
+that the initialisation code only runs once.
+
+Fixes #2886. See also #1731.
+---
+ fontforge/python.c | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/fontforge/python.c b/fontforge/python.c
+index 538b907..238f0dd 100644
+--- a/fontforge/python.c
+++ b/fontforge/python.c
+@@ -18893,11 +18893,18 @@ return;
+ ** function.
+ */
+ PyMODINIT_FUNC FFPY_PYTHON_ENTRY_FUNCTION(const char* modulename) {
+-    doinitFontForgeMain();
+-    no_windowing_ui = running_script = true;
+    static int initted = false;
+ 
+-    RegisterAllPyModules();
+-    CreateAllPyModules();
+    if (!initted) {
+        doinitFontForgeMain();
+        no_windowing_ui = running_script = true;
+
+#if PY_MAJOR_VERSION <= 2
+        RegisterAllPyModules();
+#endif
+        CreateAllPyModules();
+        initted = true;
+    }
+ 
+ #if PY_MAJOR_VERSION >= 3
+     /* Python 3 expects the module object to be returned */
--- a/fontforge-aarch64.patch
+++ b/fontforge-aarch64.patch
--- a/fontforge.spec
+++ b/fontforge.spec
@ -1,27 +1,36 @@
 %global gettext_package FontForge
+%global gnulib_githead 2bf7326
+%global gittag0 20160404

 Name:           fontforge
-Version:        20251009
-Release:        1%{?dist}
+Version:        20160404
+Release:        5%{?dist}
 Summary:        Outline and bitmap font editor

-License:        GPL-3.0-or-later
+License:        GPLv3+
 URL:            http://fontforge.github.io/
-Source0:        https://github.com/fontforge/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        https://github.com/fontforge/%{name}/archive/%{gittag0}.tar.gz#/%{name}-%{version}.tar.gz
+# https://github.com/fontforge/fontforge/issues/1725
+Source1:        http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=%{gnulib_githead};sf=tgz;name=gnulib-%{gnulib_githead}.tar.gz
+# https://github.com/fontforge/fontforge/pull/1723
+Patch0:         fontforge-20140813-use-system-uthash.patch
+Patch1:         Add-python3-support.patch
+# https://github.com/jtanx/fontforge/commit/3c57c9c2482c39c9f5f18f41bda93090d2fc9a17.patch
+Patch2:         fontforge-20160404-python3-import-psMat-fix.patch

 Requires:       xdg-utils
-Requires:       (autotrace or potrace)
+Requires:       autotrace
 Requires:       hicolor-icon-theme

-BuildRequires:  gcc-c++
-BuildRequires:  cmake
+BuildRequires:  gcc
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libpng-devel
-BuildRequires:  giflib-devel
+BuildRequires:  libungif-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  freetype-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  libuninameslist-devel
 BuildRequires:  libXt-devel
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  gettext
@ -29,20 +38,16 @@ BuildRequires:  pango-devel
 BuildRequires:  cairo-devel
 BuildRequires:  libspiro-devel
 BuildRequires:  python3-devel
+BuildRequires:  gnulib-devel
+BuildRequires:  libtool-ltdl-devel
 BuildRequires:  readline-devel
-BuildRequires:  libappstream-glib
-BuildRequires:  woff2-devel
+# This is failing on aarch64 so drop it
+#BuildRequires:  python-ipython
+BuildRequires:  uthash-devel
 # F25 build is failing add following to fix
 BuildRequires:  shared-mime-info
-# F33 onward need now
-BuildRequires:  gtk3-devel
-BuildRequires:  python3-sphinx
-BuildRequires: make
-# 20151009 version requires below
-BuildRequires: gtkmm3.0-devel

-%py_provides python3-fontforge
-%py_provides python3-psMat
+Provides: bundled(gnulib)

 %description
 FontForge (former PfaEdit) is a font editor for outline and bitmap
@ -51,13 +56,14 @@ fonts. It supports a range of font formats, including PostScript
 (Type2) and CID-keyed fonts.

 %package devel
-Summary: Development files for fontforge
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Summary: Development tools for fontforge
+Requires: %{name} = %{version}-%{release}
 Requires: %{name}-doc = %{version}-%{release}
+Requires: pkgconfig

 %description devel
-This package includes the library files you will need to compile
-applications against fontforge.
+This package includes the libraries and header files you will need
+to compile applications against fontforge.

 %package doc
 Summary: Documentation files for %{name}
@ -68,278 +74,106 @@ This package contains documentation files for %{name}.


 %prep
-%autosetup
+%setup -q -n %{name}-%{version}
+tar xzf %{SOURCE1}
+
+%patch0 -p0
+%patch1 -p1
+%patch2 -p1
+sed -i -e '/^#!\//, 1d' pycontrib/webcollab.py
+
+mkdir htdocs
+cp -pr doc/html/* htdocs
+chmod 644 htdocs/nonBMP/index.html
+# Fix bad line terminators
+%{__sed} -i 's/\r//' htdocs/Big5.txt
+%{__sed} -i 's/\r//' htdocs/corpchar.txt

 %build
+./bootstrap --skip-git --gnulib-srcdir=gnulib-%{gnulib_githead}
 export CFLAGS="%{optflags} -fno-strict-aliasing"
-%cmake -DCMAKE_BUILD_TYPE=Release \
-          -DENABLE_WOFF2=ON \
-          -DPYHOOK_INSTALL_DIR=%{python3_sitearch}
-%cmake_build
+
+%configure PYTHON=python3
+make V=1 %{?_smp_mflags}

 %install
-%cmake_install
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+rm -f $RPM_BUILD_ROOT%{_libdir}/libg{draw,unicode}.{la,so}

 desktop-file-install \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
  --add-category X-Fedora                                  \
-  desktop/org.fontforge.FontForge.desktop
+  desktop/fontforge.desktop
+
+# The fontforge makefiles install htdocs as well, but we
+# prefer to have them under the standard RPM location, so
+# remove the extra copy
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/fontforge

 # remove unneeded .la and .a files
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'

-rm -f %{buildroot}%{_datadir}/doc/fontforge/{.buildinfo,.nojekyll}
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
-
 # Find translations
 %find_lang %{gettext_package}

-%check
-%ctest
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+install -m 644 -p desktop/fontforge.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
+install -m 644 -p desktop/fontforge.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/
+
+#Makefile install rules are playing evil here. Let's correct the permission.
+#chmod 644 $RPM_BUILD_ROOT%{_datadir}/fontforge/python/graphicore/__init__.py
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/fontforge/python/gdraw/_gdraw.py
+
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/fontforge/nodejs/collabwebview/css/*.css
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/fontforge/nodejs/collabwebview/js/*.js
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/fontforge/nodejs/collabwebview/js/contentEditable/*
+
+%post
+update-desktop-database &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+/sbin/ldconfig
+
+%postun
+update-desktop-database &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+fi
+/sbin/ldconfig
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

 %files -f %{gettext_package}.lang
 %doc AUTHORS
-%license LICENSE COPYING.gplv3
+%license LICENSE
 %{_bindir}/*
 %{_libdir}/lib*.so.*
-%{_datadir}/applications/*FontForge.desktop
+%{_datadir}/applications/*fontforge.desktop
 %{_datadir}/fontforge
-%{_datadir}/icons/hicolor/*/apps/org.fontforge.FontForge*
+%{_datadir}/icons/hicolor/*/apps/fontforge.*
 %{_mandir}/man1/*.1*
 %{_datadir}/mime/packages/fontforge.xml
-%{_metainfodir}/org.fontforge.FontForge.appdata.xml
+%{_datadir}/appdata/fontforge.appdata.xml
 %{python3_sitearch}/fontforge.so
 %{python3_sitearch}/psMat.so

 %files devel
+%{_includedir}/fontforge/
 %{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc

 %files doc
-%doc %{_pkgdocdir}
+%doc htdocs

 %changelog
-* Fri Oct 10 2025 Parag Nemade <pnemade AT redhat DOT com> - 20251009-1
- Update to 20251009 version (#2402960)
- Remove upstream released patches
- Add new BR: gtkmm3.0-devel
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jul 17 2025 Parag Nemade <pnemade AT redhat DOT com> - 20230101-17
- Update for https://fedoraproject.org/wiki/Changes/CMake_ninja_default (rh#2381004)
-
-* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 20230101-16
- Rebuilt for Python 3.14
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jun 14 2024 Gwyn Ciesla <gwync@protonmail.com> - 20230101-13
- Patch for Python 3.13
-
-* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 20230101-12
- Rebuilt for Python 3.13
-
-* Wed Feb 28 2024 Parag Nemade <pnemade AT redhat DOT com> - 20230101-11
- Resolves: CVE-2024-25081 and CVE-2024-25082
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Aug 10 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 20230101-8
- Drop unused libuninameslist dependency
-
-* Tue Aug 08 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 20230101-7
- Allow potrace as an alternative to autotrace
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jul 07 2023 Parag Nemade <pnemade AT redhat DOT com> - 20230101-5
- Fix fr.po and it.po translations issue
-
-* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 20230101-4
- Rebuilt for Python 3.12
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jan 02 2023 Parag Nemade <pnemade AT redhat DOT com> - 20230101-2
- Update license tag to SPDX format
- Fix test failure
-
-* Mon Jan 02 2023 Parag Nemade <pnemade AT redhat DOT com> - 20230101-1
- Update to 20230101 version (#2157290)
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20220308-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 20220308-2
- Rebuilt for Python 3.11
-
-* Thu Mar 10 2022 Parag Nemade <pnemade AT redhat DOT com> - 20220308-1
- Update to 20220308 version (#2062047)
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20201107-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20201107-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 20201107-4
- Rebuilt for Python 3.10
-
-* Mon Feb 01 2021 Parag Nemade <pnemade AT redhat DOT com> - 20201107-3
- The %%find_lang should run as part of %%install only
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20201107-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Nov 25 2020 Parag Nemade <pnemade AT redhat DOT com> - 20201107-1
- Update to 20201107 version (#1895648)
- removed %%gittag0 macro, as it cause problem to automated package update script
-
-* Sun Nov 22 2020 Benjamin A. Beasley <code@musicinmybrain.net> - 20200314-10
- Add py_provides macros to provide python3-fontforge, python3-psMat, etc.
-
-* Wed Aug 05 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-9
- Fix FTBFS bug by fixing glossary.rst and using new CMake macros
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200314-8
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200314-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 20200314-6
- Rebuilt for Python 3.9
-
-* Sat May 02 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-5
- Resolves:rhbz#1830502 - Add missing WOFF2 support
-
-* Wed Apr 15 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-4
- Resolves:rhbz#1823525 - fontforge fails to build with Sphinx 3.0.0
-
-* Thu Apr 02 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-3
- Fix the GDK backend UI issues
- Move back to using GDK backend
-
-* Fri Mar 27 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-2
- Enabled X11 and 2012 theme
-
-* Wed Mar 25 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-1
- Update to 20200314 version (#1813578)
-
-* Sun Feb 16 2020 Parag Nemade <pnemade AT redhat DOT com> - 20190801-6
- another fix for rh#1790042 - CVE-2020-5395:out-of-bounds write in sfd.c
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20190801-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jan 16 2020 Parag Nemade <pnemade AT redhat DOT com> - 20190801-4
- Resolves:rh#1790042 - CVE-2020-5395:out-of-bounds write in sfd.c
-
-* Tue Aug 27 2019 Kevin Fenzi <kevin@scrye.com> - 20190801-3
- Rebuild for new libspiro
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 20190801-2
- Rebuilt for Python 3.8
-
-* Thu Aug 15 2019 Parag Nemade <pnemade AT redhat DOT com> - 20190801-1
- Update to 20190801 version (#1739819)
- Upstream moved to use Glib's GHashTable over uthash
- Upstream dropped requiring bundling copy of gnulib
-
-* Fri Aug 02 2019 Parag Nemade <pnemade AT redhat DOT com> - 20190413-4
- Fix the conditional for rh#1728058
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190413-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 23 2019 Parag Nemade <pnemade AT redhat DOT com> - 20190413-2
- make the code compatible with python-3.8 (rh#1728058)
-
-* Sat Apr 13 2019 Parag Nemade <pnemade AT redhat DOT com> - 20190413-1
- Update to 20190413 version (#1689629)
-
-* Mon Mar 25 2019 Parag Nemade <pnemade AT redhat DOT com> - 20190317-1
- Update to 20190317 release (#1689629)
-
-* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 20170731-12
- Rebuild for readline 8.0
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20170731-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jul 23 2018 Miro Hrončok <mhroncok@redhat.com> - 20170731-10
- Rebuilt for #1595421
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170731-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jul 04 2018 Kevin Fenzi <kevin@scrye.com> - -8
- Update bundled gnulib. Fixes bug #1596037
-
-* Thu Jun 28 2018 Miro Hrončok <mhroncok@redhat.com> - 20170731-7
- Rebuilt for Python 3.7.0 final (#1595421)
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 20170731-6
- Rebuilt for Python 3.7
-
-* Sun Feb 11 2018 Sandro Mani <manisandro@gmail.com> - 20170731-5
- Rebuild (giflib)
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170731-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 20170731-3
- Remove obsolete scriptlets
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20170731-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Mon Jul 31 2017 Parag Nemade <pnemade AT redhat DOT com> - 20170731-1
- Update to 20170731
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20161012-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Mar 09 2017 Parag Nemade <pnemade AT redhat DOT com> - 20161012-6
- Resolves:rh#1429574 - [abrt] fontforge: PyFF_OpenFont(): fontforge killed by signal 6
- Added patch to fix python module for python3.6
-
-* Sat Feb 18 2017 Parag Nemade <pnemade AT redhat DOT com> - 20161012-5
- Add missing BR: git
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20161012-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 20161012-3
- Rebuild for readline 7.x
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 20161012-2
- Rebuild for Python 3.6
-
-* Thu Oct 13 2016 Parag Nemade <pnemade AT redhat DOT com> - 20161012-1
- Update to 20161012
-
-* Thu Oct 06 2016 Parag Nemade <pnemade AT redhat DOT com> - 20161005-1
- Update to 20161005
-
-* Wed Oct 05 2016 Parag Nemade <pnemade AT redhat DOT com> - 20161004-1
- Update to 20161004
-
-* Mon Oct 03 2016 Parag Nemade <pnemade AT redhat DOT com> - 20161001-1
- Update to 20161001
+* Wed Mar 08 2017 Parag Nemade <pnemade AT redhat DOT com> - 20160404-5
+- Resolves:rh#1430124 - can't import fontforge and psMat python modules

 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20160404-4
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
--- a/plans/fontforge.fmf
+++ b/plans/fontforge.fmf
@ -1,5 +0,0 @@
-summary: Basic smoke test
-discover:
-    how: fmf
-execute:
-    how: tmt
--- a/pyconfig.patch
+++ b/pyconfig.patch
@ -1,24 +0,0 @@
--- pycontrib/FontCompare/setup.py~	2022-12-31 23:25:21.000000000 -0600
-+++ pycontrib/FontCompare/setup.py	2024-06-14 15:14:14.119920623 -0500
-@@ -15,7 +15,6 @@
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- """
- #!/usr/bin/env python
-from distutils.core import setup
- from setuptools import setup 
- setup(name='Font Compare',
-       version='1.0',
--- fontforge/python.c~	2022-12-31 23:25:21.000000000 -0600
-+++ fontforge/python.c	2024-06-14 15:38:41.397897757 -0500
-@@ -19633,7 +19633,10 @@
-     if ( saved_progname )
- 	free(saved_progname);
-     saved_progname = copy_to_wide_string(progname);
-    Py_SetProgramName(saved_progname);
-+    PyStatus status;
-+    PyConfig config;
-+    PyConfig_InitPythonConfig(&config);
-+    status = PyConfig_SetString(&config, &config.program_name, saved_progname);
- }
- 
- static wchar_t ** copy_argv(char *arg0, int argc ,char **argv) {
--- a/3
+++ b/3
@ -1 +1,2 @@
-SHA512 (fontforge-20251009.tar.gz) = 2923c54e10585551c93102d8b7a389c9de3c629c1676fc8c576c9b9c3f1f6fe28f7a1e39fd5a57ab7eeadf0b17d722bf439ca94f0a788ceab6993e1a93ea7d5f
+1daba85b251e00c614e4e857c67cae4c  fontforge-20160404.tar.gz
+149162d1d21a0dfc705a31916f4b0cd0  gnulib-2bf7326.tar.gz
--- a/tests/generate-font.py
+++ b/tests/generate-font.py
@ -1,14 +0,0 @@
-import fontforge
-import os
-
-myFont = fontforge.open("Cantarell-Regular.ttf")
-myFont.generate("Cantarell-Regular.sfd")
-myFont.close()
-
-myFont = fontforge.open("Cantarell-Regular.sfd")
-myFont.generate("Cantarell-Regular.ttf")
-myFont.close()
-
-os.remove("Cantarell-Regular.ttf")
-os.remove("Cantarell-Regular.sfd")
-
--- a/tests/generate-sfd.pe
+++ b/tests/generate-sfd.pe
@ -1,7 +0,0 @@
-#!/usr/bin/fontforge
-i=1
-Open($argv[i], 1)
-#Use gen_flags=Defualt fmflags value as -1  
-gen_flags = -1
-Generate("" + $fontname + ".sfd", "", gen_flags)
-
--- a/tests/generate-ttf.pe
+++ b/tests/generate-ttf.pe
@ -1,10 +0,0 @@
-#!/usr/bin/fontforge
-i=1
-Open($argv[i], 1)
-#Use gen_flags=Defualt fmflags value as -1  
-gen_flags = -1
-Generate("" + $fontname + ".ttf", "", gen_flags)
-Generate("" + $fontname + ".otf", "", gen_flags)
-PrintSetup (5)
-PrintFont (0, 0, "", $fontname + "-sample.pdf")
-
--- a/tests/get-font-metadata.py
+++ b/tests/get-font-metadata.py
@ -1,31 +0,0 @@
-#!/usr/bin/python3
-
-import fontforge
-import sys
-
-if len(sys.argv) > 1:
-    f = fontforge.open(sys.argv[1])
-else:
-    print("provide fontfile path as an argument")
-    sys.exit(1)
-
-if f.fullname:
-    print("Fontname is {0}".format(f.fullname))
-else:
-    print("fontname not set")
-if f.weight:
-    print("Given font weight is {0}".format(f.weight))
-else:
-    print("Given font weight not set")
-if f.version:
-    print("Given font version is {0}".format(f.version))
-else:
-    print("Given font version not set")
-if f.copyright:
-    print("Given font Copyright text is => {0}".format(f.copyright))
-else:
-    print("Given font copyright information not set")
-
-ver = fontforge.UnicodeNamesListVersion()
-print("Libuninameslist version is : %s" % ver)
-
--- a/tests/main.fmf
+++ b/tests/main.fmf
@ -1,5 +0,0 @@
-require:
- fontforge
-test: bash ./run_tests.sh
-framework: shell
-
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@ -1,23 +0,0 @@
-#!/bin/bash
-
-cp /usr/share/fontforge/pixmaps/Cantarell-Regular.ttf .
-
-echo "----------------------------------------------------------"
-echo "Executing get-font-metadata.py on Cantarell-Regular.ttf =>"
-/usr/bin/python3 get-font-metadata.py ./Cantarell-Regular.ttf
-
-echo "----------------------------------------------------------"
-echo "Executing generate-font.py on Cantarell-Regular.ttf =>"
-/usr/bin/python3 generate-font.py ./Cantarell-Regular.ttf
-
-echo "----------------------------------------------------------"
-cp /usr/share/fontforge/pixmaps/Cantarell-Regular.ttf .
-echo "Executing generate-sfd.pe on Cantarell-Regular.ttf =>"
-/usr/bin/fontforge -script generate-sfd.pe ./Cantarell-Regular.ttf
-rm Cantarell-Regular.ttf
-
-echo "----------------------------------------------------------"
-echo "Executing generate-ttf.pe on Cantarell-Regular.sfd =>"
-/usr/bin/fontforge -script generate-ttf.pe ./Cantarell-Regular.sfd
-echo "----------------------------------------------------------"
-
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@ -1,47 +0,0 @@
-#!/bin/bash
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-NAME=fontforge
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${NAME}
-        rlAssertRpm ${NAME}-devel
-        rlShowPackageVersion ${NAME}
-        rlRun -t -l "VERSION=$(rpm -q ${NAME} --queryformat='%{version}')" 0 "Get VERSION"
-        FEDORA_VERSION=$(rlGetDistroRelease)
-        rlLog "FEDORA_VERSION=${DISTRO_RELEASE}"
-        rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
-        rlRun "pushd $tmp"
-        rlFetchSrcForInstalled "${NAME}"
-        rlRun "rpm --define '_topdir $tmp' -i *src.rpm"
-        rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory"
-        rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec"
-        if [ -d BUILD/${NAME}-${VERSION}-build ]; then
-            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}-build/${NAME}-${VERSION}"
-        else
-            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}"
-        fi
-        rlRun "set -o pipefail"
-        rlRun "NOCONFIGURE=1 ./autogen.sh"
-        rlRun "./configure --disable-static --with-graphite2 --with-gobject --enable-introspection"
-        rlRun "make check"
-        rlRun "retval=$?"
-        rlRun "echo $retval"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun -t -l "INSTALLED_VERSION=$(hb-info --version|awk 'NR==1 {print $3}')" \
-              0 "Get installed version"
-        rlAssertEquals "versions should be equal" "${VERSION}" "${INSTALLED_VERSION}"
-        rlGetTestState
-        rlLog "Number of failed asserts so far: ${ECODE}"
-        rlRun "popd" 0
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $tmp" 0 "Remove tmp directory"
-    rlPhaseEnd
-rlJournalEnd
-