From 73808ae685072f623b30da604205898be7f81755 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 02:44:13 +0000 Subject: [PATCH 01/45] Initialize branch F-9 for xgridfit --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 45c2822f4b314e55bcd829a1b6c9c4709592f973 Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 18 May 2008 13:58:05 +0000 Subject: [PATCH 02/45] =?UTF-8?q?=E2=8A=B8=201.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xgridfit.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xgridfit.spec b/xgridfit.spec index ee24650..0dcd8ef 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -1,8 +1,9 @@ -%define archivever 1-5 +# Hate… +%define archivever 1-6 Name: xgridfit -Version: 1.5 -Release: 2%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -84,6 +85,10 @@ rm -fr %{buildroot} %changelog +* Sun May 18 2008 +- 1.6-1 +⊸ Lots of new makefile goodness + * Thu Mar 13 2008 - 1.5-2 ✓ Fix path munging From 660140930c925d9ee135e8dd89b3a34aad542f01 Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 18 May 2008 14:04:48 +0000 Subject: [PATCH 03/45] =?UTF-8?q?=E2=8A=B8=201.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- sources | 2 +- xgridfit.spec | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index dc10be5..bb9870a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xgridfit-1-5.tar.gz +xgridfit-1-6.tar.gz diff --git a/sources b/sources index 8b51940..a48eeb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78a322021939e81cb3e2a04a306ed60b xgridfit-1-5.tar.gz +7937d9b05af6192c660757613a89045f xgridfit-1-6.tar.gz diff --git a/xgridfit.spec b/xgridfit.spec index 0dcd8ef..d7096b9 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -3,7 +3,7 @@ Name: xgridfit Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -86,7 +86,7 @@ rm -fr %{buildroot} %changelog * Sun May 18 2008 -- 1.6-1 +- 1.6-2 ⊸ Lots of new makefile goodness * Thu Mar 13 2008 From 47466257f2c609b376874b7df528395c24422d34 Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 18 May 2008 15:17:11 +0000 Subject: [PATCH 04/45] workaround rpm brokenness on koji --- xgridfit.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xgridfit.spec b/xgridfit.spec index d7096b9..2a5e40a 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -1,9 +1,8 @@ -# Hate… %define archivever 1-6 Name: xgridfit Version: 1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -86,7 +85,7 @@ rm -fr %{buildroot} %changelog * Sun May 18 2008 -- 1.6-2 +- 1.6-3 ⊸ Lots of new makefile goodness * Thu Mar 13 2008 From 6685330cf4c27b504e9421dce84fcb6d95eab968 Mon Sep 17 00:00:00 2001 From: nim Date: Mon, 1 Sep 2008 15:18:06 +0000 Subject: [PATCH 05/45] 1.9 --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- xgridfit.spec | 11 ++++++++--- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index bb9870a..2ce989f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xgridfit-1-6.tar.gz +xgridfit-1-9.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..3316855 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +xgridfit-1_9-1_fc10:HEAD:xgridfit-1.9-1.fc10.src.rpm:1220282275 diff --git a/sources b/sources index a48eeb7..121d846 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7937d9b05af6192c660757613a89045f xgridfit-1-6.tar.gz +bb2bb3caee51758852902525b068b56a xgridfit-1-9.tar.gz diff --git a/xgridfit.spec b/xgridfit.spec index 2a5e40a..6de0d3f 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -1,8 +1,8 @@ -%define archivever 1-6 +%define archivever 1-9 Name: xgridfit -Version: 1.6 -Release: 3%{?dist} +Version: 1.9 +Release: 1%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -84,6 +84,11 @@ rm -fr %{buildroot} %changelog +* Mon Sep 1 2008 +- 1.9-1 +ᕏ Major update, many changes +ᕚ Only package xsltproc support for now + * Sun May 18 2008 - 1.6-3 ⊸ Lots of new makefile goodness From 7df855987deeb39df6a72f3dc991ef2d79ac0435 Mon Sep 17 00:00:00 2001 From: nim Date: Fri, 14 Nov 2008 10:43:39 +0000 Subject: [PATCH 06/45] 1.11a --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- xgridfit.spec | 12 ++++++++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2ce989f..62c6a90 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xgridfit-1-9.tar.gz +xgridfit-1-11a.tar.gz diff --git a/import.log b/import.log index 3316855..c8e56ec 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ xgridfit-1_9-1_fc10:HEAD:xgridfit-1.9-1.fc10.src.rpm:1220282275 +xgridfit-1_11-1_a_fc11:HEAD:xgridfit-1.11-1.a.fc11.src.rpm:1226659397 diff --git a/sources b/sources index 121d846..020272a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb2bb3caee51758852902525b068b56a xgridfit-1-9.tar.gz +df07408852d577b1df37d4e4c1361735 xgridfit-1-11a.tar.gz diff --git a/xgridfit.spec b/xgridfit.spec index 6de0d3f..ee3c939 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -1,8 +1,8 @@ -%define archivever 1-9 +%define archivever 1-11a Name: xgridfit -Version: 1.9 -Release: 1%{?dist} +Version: 1.11 +Release: 1.a%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -80,10 +80,14 @@ rm -fr %{buildroot} %files doc %defattr(0644,root,root,0755) -%doc docs/* +%doc docs/* ChangeLog %changelog +* Fri Nov 14 2008 +- 1.11-1.a +◮ update for F11 cycle + * Mon Sep 1 2008 - 1.9-1 ᕏ Major update, many changes From 00c734c44c8121384ad2bbc62746b3614b34d7ad Mon Sep 17 00:00:00 2001 From: nim Date: Fri, 30 Jan 2009 20:14:09 +0000 Subject: [PATCH 07/45] 1.17 --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- xgridfit.spec | 11 +++++++---- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 62c6a90..154f360 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xgridfit-1-11a.tar.gz +xgridfit-1-17.tar.gz diff --git a/import.log b/import.log index c8e56ec..71b9d72 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ xgridfit-1_9-1_fc10:HEAD:xgridfit-1.9-1.fc10.src.rpm:1220282275 xgridfit-1_11-1_a_fc11:HEAD:xgridfit-1.11-1.a.fc11.src.rpm:1226659397 +xgridfit-1_17-1_fc11:HEAD:xgridfit-1.17-1.fc11.src.rpm:1233346359 diff --git a/sources b/sources index 020272a..8637b60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df07408852d577b1df37d4e4c1361735 xgridfit-1-11a.tar.gz +82b4f14d1bb1fb89a38da0cff19cb05e xgridfit-1-17.tar.gz diff --git a/xgridfit.spec b/xgridfit.spec index ee3c939..6842912 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -1,8 +1,8 @@ -%define archivever 1-11a +%define archivever 1-17 Name: xgridfit -Version: 1.11 -Release: 1.a%{?dist} +Version: 1.17 +Release: 1%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -17,7 +17,7 @@ BuildArch: noarch Requires: %{_bindir}/xsltproc %description -Xgridfit is a high-level, XML-based language for gridfitting, or "hinting", +Xgridfit is a high-level, XML-based language for gridfitting, or ‘hinting’, fonts. The Xgridfit program compiles an XML source file into tables and instructions that relate to the gridfitting of glyphs. Xgridfit does not insert these elements into a font itself, but rather relies on FontForge, the @@ -84,6 +84,9 @@ rm -fr %{buildroot} %changelog +* Fri Jan 30 2009 +- 1.17-1 + * Fri Nov 14 2008 - 1.11-1.a ◮ update for F11 cycle From 51e72044688f97ddd5ce0555ea938192e0955ba1 Mon Sep 17 00:00:00 2001 From: nim Date: Mon, 16 Feb 2009 23:26:32 +0000 Subject: [PATCH 08/45] 1.17a --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- xgridfit.spec | 20 +++++++++++--------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 154f360..58eeb80 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xgridfit-1-17.tar.gz +xgridfit-1-17a.tar.gz diff --git a/import.log b/import.log index 71b9d72..a3c22a7 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ xgridfit-1_9-1_fc10:HEAD:xgridfit-1.9-1.fc10.src.rpm:1220282275 xgridfit-1_11-1_a_fc11:HEAD:xgridfit-1.11-1.a.fc11.src.rpm:1226659397 xgridfit-1_17-1_fc11:HEAD:xgridfit-1.17-1.fc11.src.rpm:1233346359 +xgridfit-1_17-2_a_fc11:HEAD:xgridfit-1.17-2.a.fc11.src.rpm:1234826759 diff --git a/sources b/sources index 8637b60..7a543de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82b4f14d1bb1fb89a38da0cff19cb05e xgridfit-1-17.tar.gz +943b0540441d7184977f60b1b0dc4a59 xgridfit-1-17a.tar.gz diff --git a/xgridfit.spec b/xgridfit.spec index 6842912..f6a61db 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -1,8 +1,8 @@ -%define archivever 1-17 +%define archivever 1-17a Name: xgridfit Version: 1.17 -Release: 1%{?dist} +Release: 2.a%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -39,7 +39,6 @@ Xgridfit font hinting tool user documentation. %build -# Nothing to do %install @@ -84,26 +83,29 @@ rm -fr %{buildroot} %changelog -* Fri Jan 30 2009 +* Mon Feb 16 2009 Nicolas Mailhot +- 1.17-2.a + +* Fri Jan 30 2009 Nicolas Mailhot - 1.17-1 -* Fri Nov 14 2008 +* Fri Nov 14 2008 Nicolas Mailhot - 1.11-1.a ◮ update for F11 cycle -* Mon Sep 1 2008 +* Mon Sep 1 2008 Nicolas Mailhot - 1.9-1 ᕏ Major update, many changes ᕚ Only package xsltproc support for now -* Sun May 18 2008 +* Sun May 18 2008 Nicolas Mailhot - 1.6-3 ⊸ Lots of new makefile goodness -* Thu Mar 13 2008 +* Thu Mar 13 2008 Nicolas Mailhot - 1.5-2 ✓ Fix path munging -* Tue Mar 11 2008 +* Tue Mar 11 2008 Nicolas Mailhot - 1.5-1 ✓ Initial Fedora packaging From 5ad5c3e51c71125faff8d5d7662b4dac11638c8d Mon Sep 17 00:00:00 2001 From: nim Date: Tue, 17 Feb 2009 19:09:25 +0000 Subject: [PATCH 09/45] switch to global --- xgridfit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index f6a61db..6892504 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -1,4 +1,4 @@ -%define archivever 1-17a +%global archivever 1-17a Name: xgridfit Version: 1.17 From 0d1e6771bd7f43e3295fb8fbcd07c7c70caee13a Mon Sep 17 00:00:00 2001 From: nim Date: Mon, 23 Feb 2009 09:03:39 +0000 Subject: [PATCH 10/45] F11 mass rebuild --- import.log | 1 + xgridfit.spec | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/import.log b/import.log index a3c22a7..a3df3cf 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ xgridfit-1_9-1_fc10:HEAD:xgridfit-1.9-1.fc10.src.rpm:1220282275 xgridfit-1_11-1_a_fc11:HEAD:xgridfit-1.11-1.a.fc11.src.rpm:1226659397 xgridfit-1_17-1_fc11:HEAD:xgridfit-1.17-1.fc11.src.rpm:1233346359 xgridfit-1_17-2_a_fc11:HEAD:xgridfit-1.17-2.a.fc11.src.rpm:1234826759 +xgridfit-1_17-3_a_fc11:HEAD:xgridfit-1.17-3.a.fc11.src.rpm:1235379796 diff --git a/xgridfit.spec b/xgridfit.spec index 6892504..b572d46 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -2,7 +2,7 @@ Name: xgridfit Version: 1.17 -Release: 2.a%{?dist} +Release: 3.a%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -83,6 +83,10 @@ rm -fr %{buildroot} %changelog +* Mon Feb 23 2009 Nicolas Mailhot +- 1.17-3.a +— global-ization + * Mon Feb 16 2009 Nicolas Mailhot - 1.17-2.a From d37075b56e2ab0f57534ba18dd0620826e671208 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 09:34:37 +0000 Subject: [PATCH 11/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index b572d46..f5921f6 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -2,7 +2,7 @@ Name: xgridfit Version: 1.17 -Release: 3.a%{?dist} +Release: 4.a%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -83,6 +83,9 @@ rm -fr %{buildroot} %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 1.17-4.a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 23 2009 Nicolas Mailhot - 1.17-3.a — global-ization From cae3d09c3c6cf430ef9ad9fda315aa0d146d5c76 Mon Sep 17 00:00:00 2001 From: nim Date: Tue, 14 Jul 2009 12:01:29 +0000 Subject: [PATCH 12/45] 1.19.b --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- xgridfit-1.19-1.b.patch | 132 ++++++++++++++++++++++++++++++++++++++++ xgridfit.spec | 44 ++++++-------- 5 files changed, 154 insertions(+), 27 deletions(-) create mode 100644 xgridfit-1.19-1.b.patch diff --git a/.cvsignore b/.cvsignore index 58eeb80..a7835f3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xgridfit-1-17a.tar.gz +xgridfit-1-19b.tar.gz diff --git a/import.log b/import.log index a3df3cf..36be5ad 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ xgridfit-1_11-1_a_fc11:HEAD:xgridfit-1.11-1.a.fc11.src.rpm:1226659397 xgridfit-1_17-1_fc11:HEAD:xgridfit-1.17-1.fc11.src.rpm:1233346359 xgridfit-1_17-2_a_fc11:HEAD:xgridfit-1.17-2.a.fc11.src.rpm:1234826759 xgridfit-1_17-3_a_fc11:HEAD:xgridfit-1.17-3.a.fc11.src.rpm:1235379796 +xgridfit-1_19-1_b_fc12:HEAD:xgridfit-1.19-1.b.fc12.src.rpm:1247572850 diff --git a/sources b/sources index 7a543de..58349e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -943b0540441d7184977f60b1b0dc4a59 xgridfit-1-17a.tar.gz +1cbaa3148950356777b470eca29a9cac xgridfit-1-19b.tar.gz diff --git a/xgridfit-1.19-1.b.patch b/xgridfit-1.19-1.b.patch new file mode 100644 index 0000000..b9854b5 --- /dev/null +++ b/xgridfit-1.19-1.b.patch @@ -0,0 +1,132 @@ +diff -uNr xgridfit.orig/Makefile xgridfit/Makefile +--- xgridfit.orig/Makefile 2008-12-20 02:52:29.000000000 +0100 ++++ xgridfit/Makefile 2009-07-14 13:48:18.291212236 +0200 +@@ -8,45 +8,44 @@ + DESTDIR = + PREFIX = /usr/local + ++# %{_bindir} in rpm speak ++BINDIR = $(PREFIX)/bin ++ ++# Should be /usr/share/xml as per ++# http://www.pathname.com/fhs/pub/fhs-2.3.html#AEN2007 ++# %{_datadir}/xml in rpm speak ++XMLDIR = $(PREFIX)/share ++ ++#%{_mandir} in rpm speak ++MANDIR = $(PREFIX)/share/man ++ ++# Could be changed to $(XMLDIR)/$(PACKAGE)-$(VERSION) ++MAINDIR = $(XMLDIR)/$(PACKAGE) + + install: +- mkdir -p $(DESTDIR)$(PREFIX)/bin ++ install -d -m 0755 $(DESTDIR)$(BINDIR) ++ install -p -m 0755 bin/* $(DESTDIR)$(BINDIR) + +- sed "s|@xslt_prefix@|${PREFIX}|g" \ +- bin/xgridfit > $(DESTDIR)$(PREFIX)/bin/xgridfit; \ +- sed "s|@xslt_prefix@|${PREFIX}|g" \ +- bin/xgfupdate > $(DESTDIR)$(PREFIX)/bin/xgfupdate; \ +- sed "s|@xslt_prefix@|${PREFIX}|g" \ +- bin/ttx2xgf > $(DESTDIR)$(PREFIX)/bin/ttx2xgf; \ +- sed "s|@xslt_prefix@|${PREFIX}|g" \ +- bin/xgfconfig > $(DESTDIR)$(PREFIX)/bin/xgfconfig; \ +- sed "s|@xslt_prefix@|${PREFIX}|g" \ +- bin/xgfmerge > $(DESTDIR)$(PREFIX)/bin/xgfmerge; \ +- +- chmod 0755 $(DESTDIR)$(PREFIX)/bin/xgridfit +- chmod 0755 $(DESTDIR)$(PREFIX)/bin/xgfupdate +- chmod 0755 $(DESTDIR)$(PREFIX)/bin/ttx2xgf +- chmod 0755 $(DESTDIR)$(PREFIX)/bin/xgfconfig +- chmod 0755 $(DESTDIR)$(PREFIX)/bin/xgfmerge +- +- mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/lib +- cp lib/* $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/lib +- +- mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas +- cp schemas/* $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas +- +- mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/utils +- cp utils/* $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/utils +- +- mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 +- cp man/*.1 $(DESTDIR)$(PREFIX)/share/man/man1 +- +-# If replacing an older version of Xgridfit, these are obsolete. +- rm -f $(DESTDIR)$(PREFIX)/share/man/man1/xgridfit-ttx.1 +- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/lib/xgridfit-ttx.xsl +- rm -f $(DESTDIR)$(PREFIX)/bin/xgridfit-ttx +- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas/xgridfit-strict.* +- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas/xgridfit-transitional.* ++ for file in $(DESTDIR)$(BINDIR)/* ; do \ ++ sed -i "s|@xslt_prefix@/share/${PACKAGE}|${MAINDIR}|g" $$file ;\ ++ done ++ ++ install -d -m 0755 $(DESTDIR)$(MAINDIR)/{lib,schemas,utils} ++ for dir in lib schemas utils ; do \ ++ install -p -m 0644 $$dir/* $(DESTDIR)$(MAINDIR)/$$dir ;\ ++ done ++ # If xgridfit had a namespace the schemas could also be registered in ++ # system xml catalogs ++ ++ install -d -m 0755 $(DESTDIR)$(MANDIR)/man1 ++ install -p -m 0644 man/*.1 $(DESTDIR)$(MANDIR)/man1 ++ ++ # If replacing an older version of Xgridfit, these are obsolete. ++ rm -f $(DESTDIR)$(MANDIR)/man1/$(PACKAGE)-ttx.1 ++ rm -f $(DESTDIR)$(BINDIR)/$(PACKAGE)-ttx ++ rm -f $(DESTDIR)$(MAINDIR)/lib/$(PACKAGE)-ttx.xsl ++ rm -f $(DESTDIR)$(MAINDIR)/schemas/$(PACKAGE)-strict.* ++ rm -f $(DESTDIR)$(MAINDIR)/schemas/$(PACKAGE)-transitional.* + + + install-docs: +@@ -60,22 +59,22 @@ + + + uninstall: +- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/lib/* +- rmdir $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/lib +- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas/* +- rmdir $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas +- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/utils/* +- rmdir $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/utils +- rmdir $(DESTDIR)$(PREFIX)/share/$(PACKAGE) +- rm -f $(DESTDIR)$(PREFIX)/share/man/man1/xgridfit.1* +- rm -f $(DESTDIR)$(PREFIX)/share/man/man1/xgfupdate.1* +- rm -f $(DESTDIR)$(PREFIX)/share/man/man1/ttx2xgf.1* +- rm -f $(DESTDIR)$(PREFIX)/share/man/man1/xgfconfig.1* +- rm -f $(DESTDIR)$(PREFIX)/bin/xgridfit +- rm -f $(DESTDIR)$(PREFIX)/bin/xgfupdate +- rm -f $(DESTDIR)$(PREFIX)/bin/ttx2xgf +- rm -f $(DESTDIR)$(PREFIX)/bin/xgfconfig +- rm -f $(DESTDIR)$(PREFIX)/bin/xgfmerge ++ rm -f $(DESTDIR)$(MAINDIR)/lib/* ++ rmdir $(DESTDIR)$(MAINDIR)/lib ++ rm -f $(DESTDIR)$(MAINDIR)/schemas/* ++ rmdir $(DESTDIR)$(MAINDIR)/schemas ++ rm -f $(DESTDIR)$(MAINDIR)/utils/* ++ rmdir $(DESTDIR)$(MAINDIR)/utils ++ rmdir $(DESTDIR)$(MAINDIR) ++ rm -f $(DESTDIR)$(MANDIR)/man1/$(PACKAGE).1* ++ rm -f $(DESTDIR)$(MANDIR)/man1/xgfupdate.1* ++ rm -f $(DESTDIR)$(MANDIR)/man1/ttx2xgf.1* ++ rm -f $(DESTDIR)$(MANDIR)/man1/xgfconfig.1* ++ rm -f $(DESTDIR)$(BINDIR)/$(PACKAGE) ++ rm -f $(DESTDIR)$(BINDIR)/xgfupdate ++ rm -f $(DESTDIR)$(BINDIR)/ttx2xgf ++ rm -f $(DESTDIR)$(BINDIR)/xgfconfig ++ rm -f $(DESTDIR)$(BINDIR)/xgfmerge + + + uninstall-docs: +@@ -93,7 +92,7 @@ + $(MAKE) -f Makefile clean + tar -C .. -zcvf $(PACKAGE)-$(VERSION).tar.gz \ + --exclude=CVS --exclude=*.tar.bz2 --exclude=.* --exclude=*.*~ \ +- --exclude=*~ --exclude=*.tar.gz xgridfit ++ --exclude=*~ --exclude=*.tar.gz $(PACKAGE) + + clean: + rm -f *.tar.gz *.*~ *~ diff --git a/xgridfit.spec b/xgridfit.spec index f5921f6..4253805 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -1,8 +1,8 @@ -%global archivever 1-17a +%global archivever 1-19b Name: xgridfit -Version: 1.17 -Release: 4.a%{?dist} +Version: 1.19 +Release: 1.b%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -10,11 +10,12 @@ Group: Applications/Publishing License: LGPLv2 URL: http://%{name}.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{archivever}.tar.gz +Patch0: xgridfit-1.19-1.b.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch -Requires: %{_bindir}/xsltproc +Requires: %{_bindir}/xsltproc %description Xgridfit is a high-level, XML-based language for gridfitting, or ‘hinting’, @@ -37,6 +38,7 @@ Xgridfit font hinting tool user documentation. %prep %setup -q -n %{name} +%patch0 -p1 %build @@ -44,23 +46,10 @@ Xgridfit font hinting tool user documentation. %install rm -fr %{buildroot} -install -d -m 0755 %{buildroot}/%{_bindir} -sed 's+^XSLT_DIR=\(.*\)$+XSLT_DIR=%{_datadir}/xml/%{name}/lib/+g' \ - bin/xgridfit > %{buildroot}/%{_bindir}/xgridfit -sed 's+^XSLT_DIR=\(.*\)$+XSLT_DIR=%{_datadir}/xml/%{name}/utils/+g' \ - bin/xgfupdate > %{buildroot}/%{_bindir}/xgfupdate -sed 's+^XSLT_DIR=\(.*\)$+XSLT_DIR=%{_datadir}/xml/%{name}/utils/+g' \ - bin/ttx2xgf > %{buildroot}/%{_bindir}/ttx2xgf - - -install -d -m 0755 %{buildroot}/%{_datadir}/xml/%{name}/{lib,utils,schemas} -for dir in lib schemas utils ; do - install -p -m 0644 $dir/* %{buildroot}/%{_datadir}/xml/%{name}/$dir -done - -install -d -m 0755 %{buildroot}/%{_mandir}/man1 -install -p -m 0644 man/*.1 %{buildroot}/%{_mandir}/man1 - +make install DESTDIR=%{buildroot} \ + BINDIR=%{_bindir} \ + MANDIR=%{_mandir} \ + MAINDIR=%{_datadir}/xml/%{name}-%{version} %clean rm -fr %{buildroot} @@ -70,7 +59,7 @@ rm -fr %{buildroot} %defattr(0644,root,root,0755) %doc COPYING ChangeLog -%{_datadir}/xml/%{name} +%{_datadir}/xml/%{name}-%{version} %{_mandir}/man1/* %defattr(0755,root,root,0755) @@ -79,12 +68,17 @@ rm -fr %{buildroot} %files doc %defattr(0644,root,root,0755) -%doc docs/* ChangeLog +%doc docs/* %changelog -* Thu Feb 26 2009 Fedora Release Engineering - 1.17-4.a -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Tue Jul 14 2009 Nicolas Mailhot +- 1.19-1.b +— Rework to use upstream makefile now there is one + +* Thu Feb 26 2009 Fedora Release Engineering +- 1.17-4.a +— Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Mon Feb 23 2009 Nicolas Mailhot - 1.17-3.a From 220f277468bbf54c6a9de45e3cd856cd9c5d274a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:03:46 +0000 Subject: [PATCH 13/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 4253805..a96198b 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -2,7 +2,7 @@ Name: xgridfit Version: 1.19 -Release: 1.b%{?dist} +Release: 2.b%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -72,6 +72,9 @@ rm -fr %{buildroot} %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 1.19-2.b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jul 14 2009 Nicolas Mailhot - 1.19-1.b — Rework to use upstream makefile now there is one From c62476ddc45d2bb59d538e214e334eadd2927f42 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:59 +0000 Subject: [PATCH 14/45] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5d7ef45..d4d5261 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xgridfit -# $Id$ +# $Id: Makefile,v 1.1 2008/03/12 23:57:47 kevin Exp $ NAME := xgridfit SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 3848b948e5b35aad9694ce978cc4ac4183e9a85b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:18 +0000 Subject: [PATCH 15/45] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5d7ef45..81dd75a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xgridfit SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 71f05fd2e88874167c2cb0ad9d67bff248bc1e86 Mon Sep 17 00:00:00 2001 From: nim Date: Sat, 5 Jun 2010 19:02:53 +0000 Subject: [PATCH 16/45] =?UTF-8?q?2.2a=20:=20python,=20xml=20catalogs?= =?UTF-8?q?=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- xgridfit-1.19-1.b.patch | 132 ---------------------------------------- xgridfit.spec | 49 ++++++++++++--- 5 files changed, 42 insertions(+), 144 deletions(-) delete mode 100644 xgridfit-1.19-1.b.patch diff --git a/.cvsignore b/.cvsignore index a7835f3..ec8ee6d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xgridfit-1-19b.tar.gz +xgridfit-2.2a.tar.gz diff --git a/import.log b/import.log index 36be5ad..29fc462 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ xgridfit-1_17-1_fc11:HEAD:xgridfit-1.17-1.fc11.src.rpm:1233346359 xgridfit-1_17-2_a_fc11:HEAD:xgridfit-1.17-2.a.fc11.src.rpm:1234826759 xgridfit-1_17-3_a_fc11:HEAD:xgridfit-1.17-3.a.fc11.src.rpm:1235379796 xgridfit-1_19-1_b_fc12:HEAD:xgridfit-1.19-1.b.fc12.src.rpm:1247572850 +xgridfit-2_2-1_a_fc14:HEAD:xgridfit-2.2-1.a.fc14.src.rpm:1275764541 diff --git a/sources b/sources index 58349e7..952114b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1cbaa3148950356777b470eca29a9cac xgridfit-1-19b.tar.gz +b6959a505d8276fc0dab133fa39d5c2d xgridfit-2.2a.tar.gz diff --git a/xgridfit-1.19-1.b.patch b/xgridfit-1.19-1.b.patch deleted file mode 100644 index b9854b5..0000000 --- a/xgridfit-1.19-1.b.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff -uNr xgridfit.orig/Makefile xgridfit/Makefile ---- xgridfit.orig/Makefile 2008-12-20 02:52:29.000000000 +0100 -+++ xgridfit/Makefile 2009-07-14 13:48:18.291212236 +0200 -@@ -8,45 +8,44 @@ - DESTDIR = - PREFIX = /usr/local - -+# %{_bindir} in rpm speak -+BINDIR = $(PREFIX)/bin -+ -+# Should be /usr/share/xml as per -+# http://www.pathname.com/fhs/pub/fhs-2.3.html#AEN2007 -+# %{_datadir}/xml in rpm speak -+XMLDIR = $(PREFIX)/share -+ -+#%{_mandir} in rpm speak -+MANDIR = $(PREFIX)/share/man -+ -+# Could be changed to $(XMLDIR)/$(PACKAGE)-$(VERSION) -+MAINDIR = $(XMLDIR)/$(PACKAGE) - - install: -- mkdir -p $(DESTDIR)$(PREFIX)/bin -+ install -d -m 0755 $(DESTDIR)$(BINDIR) -+ install -p -m 0755 bin/* $(DESTDIR)$(BINDIR) - -- sed "s|@xslt_prefix@|${PREFIX}|g" \ -- bin/xgridfit > $(DESTDIR)$(PREFIX)/bin/xgridfit; \ -- sed "s|@xslt_prefix@|${PREFIX}|g" \ -- bin/xgfupdate > $(DESTDIR)$(PREFIX)/bin/xgfupdate; \ -- sed "s|@xslt_prefix@|${PREFIX}|g" \ -- bin/ttx2xgf > $(DESTDIR)$(PREFIX)/bin/ttx2xgf; \ -- sed "s|@xslt_prefix@|${PREFIX}|g" \ -- bin/xgfconfig > $(DESTDIR)$(PREFIX)/bin/xgfconfig; \ -- sed "s|@xslt_prefix@|${PREFIX}|g" \ -- bin/xgfmerge > $(DESTDIR)$(PREFIX)/bin/xgfmerge; \ -- -- chmod 0755 $(DESTDIR)$(PREFIX)/bin/xgridfit -- chmod 0755 $(DESTDIR)$(PREFIX)/bin/xgfupdate -- chmod 0755 $(DESTDIR)$(PREFIX)/bin/ttx2xgf -- chmod 0755 $(DESTDIR)$(PREFIX)/bin/xgfconfig -- chmod 0755 $(DESTDIR)$(PREFIX)/bin/xgfmerge -- -- mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/lib -- cp lib/* $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/lib -- -- mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas -- cp schemas/* $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas -- -- mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/utils -- cp utils/* $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/utils -- -- mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 -- cp man/*.1 $(DESTDIR)$(PREFIX)/share/man/man1 -- --# If replacing an older version of Xgridfit, these are obsolete. -- rm -f $(DESTDIR)$(PREFIX)/share/man/man1/xgridfit-ttx.1 -- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/lib/xgridfit-ttx.xsl -- rm -f $(DESTDIR)$(PREFIX)/bin/xgridfit-ttx -- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas/xgridfit-strict.* -- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas/xgridfit-transitional.* -+ for file in $(DESTDIR)$(BINDIR)/* ; do \ -+ sed -i "s|@xslt_prefix@/share/${PACKAGE}|${MAINDIR}|g" $$file ;\ -+ done -+ -+ install -d -m 0755 $(DESTDIR)$(MAINDIR)/{lib,schemas,utils} -+ for dir in lib schemas utils ; do \ -+ install -p -m 0644 $$dir/* $(DESTDIR)$(MAINDIR)/$$dir ;\ -+ done -+ # If xgridfit had a namespace the schemas could also be registered in -+ # system xml catalogs -+ -+ install -d -m 0755 $(DESTDIR)$(MANDIR)/man1 -+ install -p -m 0644 man/*.1 $(DESTDIR)$(MANDIR)/man1 -+ -+ # If replacing an older version of Xgridfit, these are obsolete. -+ rm -f $(DESTDIR)$(MANDIR)/man1/$(PACKAGE)-ttx.1 -+ rm -f $(DESTDIR)$(BINDIR)/$(PACKAGE)-ttx -+ rm -f $(DESTDIR)$(MAINDIR)/lib/$(PACKAGE)-ttx.xsl -+ rm -f $(DESTDIR)$(MAINDIR)/schemas/$(PACKAGE)-strict.* -+ rm -f $(DESTDIR)$(MAINDIR)/schemas/$(PACKAGE)-transitional.* - - - install-docs: -@@ -60,22 +59,22 @@ - - - uninstall: -- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/lib/* -- rmdir $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/lib -- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas/* -- rmdir $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/schemas -- rm -f $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/utils/* -- rmdir $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/utils -- rmdir $(DESTDIR)$(PREFIX)/share/$(PACKAGE) -- rm -f $(DESTDIR)$(PREFIX)/share/man/man1/xgridfit.1* -- rm -f $(DESTDIR)$(PREFIX)/share/man/man1/xgfupdate.1* -- rm -f $(DESTDIR)$(PREFIX)/share/man/man1/ttx2xgf.1* -- rm -f $(DESTDIR)$(PREFIX)/share/man/man1/xgfconfig.1* -- rm -f $(DESTDIR)$(PREFIX)/bin/xgridfit -- rm -f $(DESTDIR)$(PREFIX)/bin/xgfupdate -- rm -f $(DESTDIR)$(PREFIX)/bin/ttx2xgf -- rm -f $(DESTDIR)$(PREFIX)/bin/xgfconfig -- rm -f $(DESTDIR)$(PREFIX)/bin/xgfmerge -+ rm -f $(DESTDIR)$(MAINDIR)/lib/* -+ rmdir $(DESTDIR)$(MAINDIR)/lib -+ rm -f $(DESTDIR)$(MAINDIR)/schemas/* -+ rmdir $(DESTDIR)$(MAINDIR)/schemas -+ rm -f $(DESTDIR)$(MAINDIR)/utils/* -+ rmdir $(DESTDIR)$(MAINDIR)/utils -+ rmdir $(DESTDIR)$(MAINDIR) -+ rm -f $(DESTDIR)$(MANDIR)/man1/$(PACKAGE).1* -+ rm -f $(DESTDIR)$(MANDIR)/man1/xgfupdate.1* -+ rm -f $(DESTDIR)$(MANDIR)/man1/ttx2xgf.1* -+ rm -f $(DESTDIR)$(MANDIR)/man1/xgfconfig.1* -+ rm -f $(DESTDIR)$(BINDIR)/$(PACKAGE) -+ rm -f $(DESTDIR)$(BINDIR)/xgfupdate -+ rm -f $(DESTDIR)$(BINDIR)/ttx2xgf -+ rm -f $(DESTDIR)$(BINDIR)/xgfconfig -+ rm -f $(DESTDIR)$(BINDIR)/xgfmerge - - - uninstall-docs: -@@ -93,7 +92,7 @@ - $(MAKE) -f Makefile clean - tar -C .. -zcvf $(PACKAGE)-$(VERSION).tar.gz \ - --exclude=CVS --exclude=*.tar.bz2 --exclude=.* --exclude=*.*~ \ -- --exclude=*~ --exclude=*.tar.gz xgridfit -+ --exclude=*~ --exclude=*.tar.gz $(PACKAGE) - - clean: - rm -f *.tar.gz *.*~ *~ diff --git a/xgridfit.spec b/xgridfit.spec index a96198b..4894694 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -1,8 +1,10 @@ -%global archivever 1-19b +%global archivever %{version}%{?patchlevel} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} Name: xgridfit -Version: 1.19 -Release: 2.b%{?dist} +Version: 2.2 +%global patchlevel a +Release: 1%{?patchlevel:.%{patchlevel}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -10,12 +12,15 @@ Group: Applications/Publishing License: LGPLv2 URL: http://%{name}.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{archivever}.tar.gz -Patch0: xgridfit-1.19-1.b.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch -Requires: %{_bindir}/xsltproc +BuildRequires: python2-devel + +Requires: %{_bindir}/xsltproc, fontforge +Requires(post): %{_bindir}/xmlcatalog +Requires(preun): %{_bindir}/xmlcatalog %description Xgridfit is a high-level, XML-based language for gridfitting, or ‘hinting’, @@ -38,8 +43,6 @@ Xgridfit font hinting tool user documentation. %prep %setup -q -n %{name} -%patch0 -p1 - %build @@ -51,10 +54,30 @@ make install DESTDIR=%{buildroot} \ MANDIR=%{_mandir} \ MAINDIR=%{_datadir}/xml/%{name}-%{version} +# Simplify preun/post catalog logic +ln -s catalog.xml \ + %{buildroot}%{_datadir}/xml/%{name}-%{version}/schemas/catalog-%{version}.%{release}.xml + %clean rm -fr %{buildroot} +%post +cd %{_sysconfdir}/xml +[ -e catalog ] || xmlcatalog --noout --create catalog +xmlcatalog --noout --add \ + nextCatalog %{_datadir}/xml/%{name}-%{version}/schemas/catalog-%{version}.%{release}.xml "" catalog >/dev/null +: + + +%preun +xmlcatalog --noout --del \ + %{_datadir}/xml/%{name}-%{version}/schemas/catalog-%{version}.%{release}.xml \ + %{_sysconfdir}/xml/catalog >/dev/null >/dev/null +: + + + %files %defattr(0644,root,root,0755) %doc COPYING ChangeLog @@ -62,6 +85,8 @@ rm -fr %{buildroot} %{_datadir}/xml/%{name}-%{version} %{_mandir}/man1/* +%{python_sitelib}/* + %defattr(0755,root,root,0755) %{_bindir}/* @@ -70,10 +95,14 @@ rm -fr %{buildroot} %defattr(0644,root,root,0755) %doc docs/* - %changelog -* Mon Jul 27 2009 Fedora Release Engineering - 1.19-2.b -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Sat Jun 5 2010 Nicolas Mailhot +- 2.2-1.a +— Major upstream changes (python utilities, namespace, etc) + +* Mon Jul 27 2009 Fedora Release Engineering +- 1.19-2.b +— Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Tue Jul 14 2009 Nicolas Mailhot - 1.19-1.b From d9dc9f82e48681d4fe946d3d7e6de4ec0c6d7c30 Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 6 Jun 2010 16:32:08 +0000 Subject: [PATCH 17/45] add missing requires --- import.log | 1 + xgridfit.spec | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/import.log b/import.log index 29fc462..50b003c 100644 --- a/import.log +++ b/import.log @@ -5,3 +5,4 @@ xgridfit-1_17-2_a_fc11:HEAD:xgridfit-1.17-2.a.fc11.src.rpm:1234826759 xgridfit-1_17-3_a_fc11:HEAD:xgridfit-1.17-3.a.fc11.src.rpm:1235379796 xgridfit-1_19-1_b_fc12:HEAD:xgridfit-1.19-1.b.fc12.src.rpm:1247572850 xgridfit-2_2-1_a_fc14:HEAD:xgridfit-2.2-1.a.fc14.src.rpm:1275764541 +xgridfit-2_2-2_a_fc14:HEAD:xgridfit-2.2-2.a.fc14.src.rpm:1275841818 diff --git a/xgridfit.spec b/xgridfit.spec index 4894694..f80dfde 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -4,7 +4,7 @@ Name: xgridfit Version: 2.2 %global patchlevel a -Release: 1%{?patchlevel:.%{patchlevel}}%{?dist} +Release: 2%{?patchlevel:.%{patchlevel}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -18,7 +18,7 @@ BuildArch: noarch BuildRequires: python2-devel -Requires: %{_bindir}/xsltproc, fontforge +Requires: %{_bindir}/xsltproc, fontforge, libxml2-python Requires(post): %{_bindir}/xmlcatalog Requires(preun): %{_bindir}/xmlcatalog @@ -95,7 +95,12 @@ xmlcatalog --noout --del \ %defattr(0644,root,root,0755) %doc docs/* + %changelog +* Sun Jun 6 2010 Nicolas Mailhot +- 2.2-2.a +— Add missing requires + * Sat Jun 5 2010 Nicolas Mailhot - 2.2-1.a — Major upstream changes (python utilities, namespace, etc) From 5abe5bc324025dfb4e788daaf5bb28a7454ed0ef Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 6 Jun 2010 17:29:28 +0000 Subject: [PATCH 18/45] Fix stray hardcoded path in python module --- import.log | 1 + xgridfit-2.2a-maindir-in-python.patch | 26 ++++++++++++++++++++++++++ xgridfit.spec | 6 +++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 xgridfit-2.2a-maindir-in-python.patch diff --git a/import.log b/import.log index 50b003c..4eef6ac 100644 --- a/import.log +++ b/import.log @@ -6,3 +6,4 @@ xgridfit-1_17-3_a_fc11:HEAD:xgridfit-1.17-3.a.fc11.src.rpm:1235379796 xgridfit-1_19-1_b_fc12:HEAD:xgridfit-1.19-1.b.fc12.src.rpm:1247572850 xgridfit-2_2-1_a_fc14:HEAD:xgridfit-2.2-1.a.fc14.src.rpm:1275764541 xgridfit-2_2-2_a_fc14:HEAD:xgridfit-2.2-2.a.fc14.src.rpm:1275841818 +xgridfit-2_2-3_a_fc14:HEAD:xgridfit-2.2-3.a.fc14.src.rpm:1275845326 diff --git a/xgridfit-2.2a-maindir-in-python.patch b/xgridfit-2.2a-maindir-in-python.patch new file mode 100644 index 0000000..dde987a --- /dev/null +++ b/xgridfit-2.2a-maindir-in-python.patch @@ -0,0 +1,26 @@ +diff -uNr xgridfit-2.2a.orig/Makefile xgridfit-2.2a/Makefile +--- xgridfit-2.2a.orig/Makefile 2010-03-30 17:58:56.000000000 +0200 ++++ xgridfit-2.2a/Makefile 2010-06-06 19:04:26.302726506 +0200 +@@ -46,7 +46,9 @@ + done + @install -d -m 0755 $(DESTDIR)$(MANDIR)/man1 + @install -p -m 0644 man/*.1 $(DESTDIR)$(MANDIR)/man1 +- @cd python ; python setup.py install --root=$(DESTDIR)/ ++ @rm -fr python.tmp ; cp -pr python python.tmp ; sed -i -e "s|@xgridfit_dir@|${MAINDIR}|g" python.tmp/xgflib.py ++ @cd python.tmp ; python setup.py install --root=$(DESTDIR)/ ++ @cd - ; rm -fr python.tmp + @echo "Xgridfit installed successfully." + + +diff -uNr xgridfit-2.2a.orig/python/xgflib.py xgridfit-2.2a/python/xgflib.py +--- xgridfit-2.2a.orig/python/xgflib.py 2010-03-30 17:26:55.000000000 +0200 ++++ xgridfit-2.2a/python/xgflib.py 2010-06-06 18:55:45.840596588 +0200 +@@ -18,7 +18,7 @@ + VERSION = '2.2' + JAVA_EXECUTABLE = 'java' + DISPLAY_DIAGNOSTIC_MESSAGES = False +-XGRIDFIT_DIR = abspath('/usr/local/share/xml/xgridfit/') ++XGRIDFIT_DIR = abspath('@xgridfit_dir@') + XSLT_DIR = abspath(join(XGRIDFIT_DIR, 'lib')) + UTIL_DIR = abspath(join(XGRIDFIT_DIR, 'utils')) + SCHEMA_DIR = abspath(join(XGRIDFIT_DIR, 'schemas')) diff --git a/xgridfit.spec b/xgridfit.spec index f80dfde..a5dc4af 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -4,7 +4,7 @@ Name: xgridfit Version: 2.2 %global patchlevel a -Release: 2%{?patchlevel:.%{patchlevel}}%{?dist} +Release: 3%{?patchlevel:.%{patchlevel}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -12,6 +12,7 @@ Group: Applications/Publishing License: LGPLv2 URL: http://%{name}.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{archivever}.tar.gz +Patch1: %{name}-2.2a-maindir-in-python.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -42,6 +43,7 @@ Xgridfit font hinting tool user documentation. %prep %setup -q -n %{name} +%patch1 -p1 -b .mip %build @@ -98,6 +100,8 @@ xmlcatalog --noout --del \ %changelog * Sun Jun 6 2010 Nicolas Mailhot +- 2.2-3.a +— Fix hardcoded path in python module - 2.2-2.a — Add missing requires From f45d505d0df599dcdaa582839184846297fd467f Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 13 Jun 2010 14:15:23 +0000 Subject: [PATCH 19/45] Remove BuildRoot specification, it's been ignored since rpm 4.6.0 --- xgridfit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index a5dc4af..025f49e 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -14,7 +14,7 @@ URL: http://%{name}.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{archivever}.tar.gz Patch1: %{name}-2.2a-maindir-in-python.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + BuildArch: noarch BuildRequires: python2-devel From 5627108757b88b542fc03f09d5381119d18b00c2 Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 25 Jul 2010 08:45:05 +0000 Subject: [PATCH 20/45] bump to cvs version for edrip --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- xgridfit.spec | 15 +++++++++++---- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index ec8ee6d..1c16a91 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xgridfit-2.2a.tar.gz +xgridfit-xgridfit.tar.gz diff --git a/import.log b/import.log index 4eef6ac..edb9e17 100644 --- a/import.log +++ b/import.log @@ -7,3 +7,4 @@ xgridfit-1_19-1_b_fc12:HEAD:xgridfit-1.19-1.b.fc12.src.rpm:1247572850 xgridfit-2_2-1_a_fc14:HEAD:xgridfit-2.2-1.a.fc14.src.rpm:1275764541 xgridfit-2_2-2_a_fc14:HEAD:xgridfit-2.2-2.a.fc14.src.rpm:1275841818 xgridfit-2_2-3_a_fc14:HEAD:xgridfit-2.2-3.a.fc14.src.rpm:1275845326 +xgridfit-2_2-4_a_20100725cvs_fc14:HEAD:xgridfit-2.2-4.a.20100725cvs.fc14.src.rpm:1280047456 diff --git a/sources b/sources index 952114b..636a1da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6959a505d8276fc0dab133fa39d5c2d xgridfit-2.2a.tar.gz +73b5bbf484a0761ec878f817b5c15b44 xgridfit-xgridfit.tar.gz diff --git a/xgridfit.spec b/xgridfit.spec index 025f49e..3ed5abf 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -1,17 +1,20 @@ -%global archivever %{version}%{?patchlevel} %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} +%global alphatag 20100725cvs +%global patchlevel a + +%global archivever %{!?alphatag:%{version}%{?patchlevel}}%{?alphatag:%{name}} + Name: xgridfit Version: 2.2 -%global patchlevel a -Release: 3%{?patchlevel:.%{patchlevel}}%{?dist} +Release: 4%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge Group: Applications/Publishing License: LGPLv2 URL: http://%{name}.sf.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{archivever}.tar.gz +Source0: %{!?alphatag:http://downloads.sourceforge.net/%{name}/}%{name}-%{archivever}.tar.gz Patch1: %{name}-2.2a-maindir-in-python.patch @@ -99,6 +102,10 @@ xmlcatalog --noout --del \ %changelog +* Sun Jul 25 2010 Nicolas Mailhot +- 2.2-4.a.20100725cvs +— Bump to cvs version (required by edrip) + * Sun Jun 6 2010 Nicolas Mailhot - 2.2-3.a — Fix hardcoded path in python module From 6d6f1e3f4ed1fef9273b3e982f350a8fba565cad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:52:34 +0000 Subject: [PATCH 21/45] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 10 ---------- 3 files changed, 31 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d4d5261..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xgridfit -# $Id: Makefile,v 1.1 2008/03/12 23:57:47 kevin Exp $ -NAME := xgridfit -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index edb9e17..0000000 --- a/import.log +++ /dev/null @@ -1,10 +0,0 @@ -xgridfit-1_9-1_fc10:HEAD:xgridfit-1.9-1.fc10.src.rpm:1220282275 -xgridfit-1_11-1_a_fc11:HEAD:xgridfit-1.11-1.a.fc11.src.rpm:1226659397 -xgridfit-1_17-1_fc11:HEAD:xgridfit-1.17-1.fc11.src.rpm:1233346359 -xgridfit-1_17-2_a_fc11:HEAD:xgridfit-1.17-2.a.fc11.src.rpm:1234826759 -xgridfit-1_17-3_a_fc11:HEAD:xgridfit-1.17-3.a.fc11.src.rpm:1235379796 -xgridfit-1_19-1_b_fc12:HEAD:xgridfit-1.19-1.b.fc12.src.rpm:1247572850 -xgridfit-2_2-1_a_fc14:HEAD:xgridfit-2.2-1.a.fc14.src.rpm:1275764541 -xgridfit-2_2-2_a_fc14:HEAD:xgridfit-2.2-2.a.fc14.src.rpm:1275841818 -xgridfit-2_2-3_a_fc14:HEAD:xgridfit-2.2-3.a.fc14.src.rpm:1275845326 -xgridfit-2_2-4_a_20100725cvs_fc14:HEAD:xgridfit-2.2-4.a.20100725cvs.fc14.src.rpm:1280047456 From e6ab5319d02a761e2784612c6718449e9b2c78b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:52:34 +0000 Subject: [PATCH 22/45] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 81dd75a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xgridfit -# $Id$ -NAME := xgridfit -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 From 00d8e20c0985d8f95da00c850299d8b5d1e58218 Mon Sep 17 00:00:00 2001 From: Nicolas Mailhot Date: Fri, 30 Jul 2010 19:15:10 +0200 Subject: [PATCH 23/45] bump for python 2.7 --- xgridfit.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 3ed5abf..9ab4fdc 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.2 -Release: 4%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -102,6 +102,10 @@ xmlcatalog --noout --del \ %changelog +* Thu Jul 29 2010 Nicolas Mailhot +- 2.2-5.a.20100725cvs +— Rebuild against python 2.7 + * Sun Jul 25 2010 Nicolas Mailhot - 2.2-4.a.20100725cvs — Bump to cvs version (required by edrip) From d1d8a16407832b945a1fd1fc8c97f80eaa4be4d3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:09:04 -0600 Subject: [PATCH 24/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 9ab4fdc..f74a3a0 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.2 -Release: 5%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -102,6 +102,9 @@ xmlcatalog --noout --del \ %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 2.2-6.a.20100725cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Jul 29 2010 Nicolas Mailhot - 2.2-5.a.20100725cvs — Rebuild against python 2.7 From 87999c1d23d1451f7ab29741a7d3efff705774af Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:57:02 -0600 Subject: [PATCH 25/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index f74a3a0..b43c09e 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.2 -Release: 6%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -102,6 +102,9 @@ xmlcatalog --noout --del \ %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 2.2-7.a.20100725cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 2.2-6.a.20100725cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From d9ffa68b4f6d05e2cb8f230b3aa7bf906da9cc88 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 00:32:52 -0500 Subject: [PATCH 26/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index b43c09e..be38f21 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.2 -Release: 7%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} +Release: 8%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -102,6 +102,9 @@ xmlcatalog --noout --del \ %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 2.2-8.a.20100725cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 2.2-7.a.20100725cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From d2a514367ad826d9e26b8b70e40e544041667083 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:44:21 -0600 Subject: [PATCH 27/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index be38f21..4c537fb 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.2 -Release: 8%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} +Release: 9%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -102,6 +102,9 @@ xmlcatalog --noout --del \ %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 2.2-9.a.20100725cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 2.2-8.a.20100725cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 495a7887190e8fbb5a09038450c1d2d52aa3a51b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:16:35 -0500 Subject: [PATCH 28/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 4c537fb..6740a75 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.2 -Release: 9%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} +Release: 10%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -102,6 +102,9 @@ xmlcatalog --noout --del \ %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2.2-10.a.20100725cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 2.2-9.a.20100725cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From cc36c6616a8d5aff6ebd7cdc7e4434f9d1905df9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:54:50 -0500 Subject: [PATCH 29/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 6740a75..953f383 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.2 -Release: 10%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} +Release: 11%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -102,6 +102,9 @@ xmlcatalog --noout --del \ %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2.2-11.a.20100725cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 2.2-10.a.20100725cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 7e45d866c5590de670243e1e3e2bc99f3c960487 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:03:26 +0000 Subject: [PATCH 30/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 953f383..15f6968 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.2 -Release: 11%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} +Release: 12%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -102,6 +102,9 @@ xmlcatalog --noout --del \ %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2.2-12.a.20100725cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 2.2-11.a.20100725cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From a156f3e1d7bbdf602e4852294927b53e0734d08e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:31:54 +0000 Subject: [PATCH 31/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 15f6968..59af407 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.2 -Release: 12%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} +Release: 13%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -102,6 +102,9 @@ xmlcatalog --noout --del \ %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2.2-13.a.20100725cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 2.2-12.a.20100725cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 54f93552df0a49f1acda922310966ba80d4a177c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 13:11:54 +0000 Subject: [PATCH 32/45] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 59af407..29e67f5 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.2 -Release: 13%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} +Release: 14%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -102,6 +102,9 @@ xmlcatalog --noout --del \ %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 2.2-14.a.20100725cvs +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Fri Feb 05 2016 Fedora Release Engineering - 2.2-13.a.20100725cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From ec1dea6e33a270223b928d75222b19c1865b9b2c Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sat, 3 Dec 2016 18:36:39 -0200 Subject: [PATCH 33/45] - Rebuilt for new upstream release 2.3, fixes rhbz #xgridfit + spec clean up --- .gitignore | 1 + sources | 2 +- xgridfit.spec | 22 ++++++---------------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 1c16a91..37188d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xgridfit-xgridfit.tar.gz +/xgridfit-2.3.tar.gz diff --git a/sources b/sources index 636a1da..98c8d41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73b5bbf484a0761ec878f817b5c15b44 xgridfit-xgridfit.tar.gz +df594c0d993e7d9bf06a7981faf972b5 xgridfit-2.3.tar.gz diff --git a/xgridfit.spec b/xgridfit.spec index 29e67f5..1c53093 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -6,15 +6,15 @@ %global archivever %{!?alphatag:%{version}%{?patchlevel}}%{?alphatag:%{name}} Name: xgridfit -Version: 2.2 -Release: 14%{?patchlevel:.%{patchlevel}}%{?alphatag:.%{alphatag}}%{?dist} +Version: 2.3 +Release: 1%{?dist} Summary: Font hinting tool # This is where we drop fontforge Group: Applications/Publishing License: LGPLv2 URL: http://%{name}.sf.net/ -Source0: %{!?alphatag:http://downloads.sourceforge.net/%{name}/}%{name}-%{archivever}.tar.gz +Source0: %{name}-%{version}.tar.gz Patch1: %{name}-2.2a-maindir-in-python.patch @@ -52,8 +52,6 @@ Xgridfit font hinting tool user documentation. %install -rm -fr %{buildroot} - make install DESTDIR=%{buildroot} \ BINDIR=%{_bindir} \ MANDIR=%{_mandir} \ @@ -63,9 +61,6 @@ make install DESTDIR=%{buildroot} \ ln -s catalog.xml \ %{buildroot}%{_datadir}/xml/%{name}-%{version}/schemas/catalog-%{version}.%{release}.xml -%clean -rm -fr %{buildroot} - %post cd %{_sysconfdir}/xml @@ -84,24 +79,19 @@ xmlcatalog --noout --del \ %files -%defattr(0644,root,root,0755) %doc COPYING ChangeLog - %{_datadir}/xml/%{name}-%{version} %{_mandir}/man1/* - %{python_sitelib}/* - -%defattr(0755,root,root,0755) %{_bindir}/* - %files doc -%defattr(0644,root,root,0755) %doc docs/* - %changelog +* Sat Dec 03 2016 Filipe Rosset - 2.3-1 +- Rebuilt for new upstream release 2.3, fixes rhbz #xgridfit + spec clean up + * Tue Jul 19 2016 Fedora Release Engineering - 2.2-14.a.20100725cvs - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From ee0589db0282b3f992e88b09fcf209181a5ba479 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:53:26 +0000 Subject: [PATCH 34/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 1c53093..673513c 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -89,6 +89,9 @@ xmlcatalog --noout --del \ %doc docs/* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Dec 03 2016 Filipe Rosset - 2.3-1 - Rebuilt for new upstream release 2.3, fixes rhbz #xgridfit + spec clean up From 9cd9002213bee2874c11abc6281e0f0ff594411e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:09:18 +0000 Subject: [PATCH 35/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 673513c..e3759e8 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -89,6 +89,9 @@ xmlcatalog --noout --del \ %doc docs/* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 947ee5423b241368acd9fd1269eca1027381b26d Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 3 Nov 2017 20:23:36 +0100 Subject: [PATCH 36/45] fix script output so that python3 can use them --- xgridfit.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index e3759e8..067677f 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -16,6 +16,7 @@ License: LGPLv2 URL: http://%{name}.sf.net/ Source0: %{name}-%{version}.tar.gz Patch1: %{name}-2.2a-maindir-in-python.patch +Patch2: %{name}-2.3-python3.patch BuildArch: noarch @@ -47,6 +48,7 @@ Xgridfit font hinting tool user documentation. %prep %setup -q -n %{name} %patch1 -p1 -b .mip +%patch2 -p1 -b .py3 %build @@ -89,6 +91,9 @@ xmlcatalog --noout --del \ %doc docs/* %changelog +* Fri Nov 03 2017 Karsten Hopp - 2.3-4 +- fontforge with python3 can't handle python2 print statements + * Thu Jul 27 2017 Fedora Release Engineering - 2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 0c7e1c169036119c4eefb145023c7e5d6000e302 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 3 Nov 2017 20:25:35 +0100 Subject: [PATCH 37/45] fix script output so that python3 can use them --- xgridfit-2.3-python3.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 xgridfit-2.3-python3.patch diff --git a/xgridfit-2.3-python3.patch b/xgridfit-2.3-python3.patch new file mode 100644 index 0000000..2b70eee --- /dev/null +++ b/xgridfit-2.3-python3.patch @@ -0,0 +1,19 @@ +diff -up xgridfit/lib/xgridfit-python.xsl.py3 xgridfit/lib/xgridfit-python.xsl +--- xgridfit/lib/xgridfit-python.xsl.py3 2017-11-03 20:19:21.947851599 +0100 ++++ xgridfit/lib/xgridfit-python.xsl 2017-11-03 20:19:46.137844915 +0100 +@@ -540,11 +540,11 @@ CURRENT_FONT.maxp_maxStackDepth = 0 + try: + CURRENT_FONT[name].ttinstrs = fontforge.parseTTInstrs(instrs) + except TypeError as detail: +- print "Warning: can't install instructions for glyph ", name +- print detail ++ print ("Warning: can't install instructions for glyph ", name) ++ print (detail) + except ValueError as detail: +- print "Warning: can't install instructions for glyph ", name +- print detail ++ print ("Warning: can't install instructions for glyph ", name) ++ print (detail) + + + CURRENT_FONT.cvt = ( From 5665d50b725b0f2c00082a3239ac3a1d50fb7d61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:41:38 +0000 Subject: [PATCH 38/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 067677f..c0ffe6f 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -91,6 +91,9 @@ xmlcatalog --noout --del \ %doc docs/* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Nov 03 2017 Karsten Hopp - 2.3-4 - fontforge with python3 can't handle python2 print statements From 52b5c43ab205a77c42d00f8cc56d523b28aae44b Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Fri, 9 Feb 2018 23:48:01 +0100 Subject: [PATCH 39/45] Update Python 2 dependency declarations to new packaging standards --- xgridfit.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xgridfit.spec b/xgridfit.spec index c0ffe6f..2fd30b7 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -23,7 +23,7 @@ BuildArch: noarch BuildRequires: python2-devel -Requires: %{_bindir}/xsltproc, fontforge, libxml2-python +Requires: %{_bindir}/xsltproc, fontforge, python2-libxml2 Requires(post): %{_bindir}/xmlcatalog Requires(preun): %{_bindir}/xmlcatalog @@ -91,6 +91,10 @@ xmlcatalog --noout --del \ %doc docs/* %changelog +* Fri Feb 09 2018 Iryna Shcherbina - 2.3-6 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Feb 09 2018 Fedora Release Engineering - 2.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 42d6a0812c12732a9526106486184ab93b1ce087 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:19:56 +0000 Subject: [PATCH 40/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 2fd30b7..c09b114 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -91,6 +91,9 @@ xmlcatalog --noout --del \ %doc docs/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Iryna Shcherbina - 2.3-6 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 9fefb98399ed1a8d90ffa49359e512f52e296641 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 29 Jul 2018 23:11:53 +0200 Subject: [PATCH 41/45] =?UTF-8?q?%{python=5Fsitelib}=20=E2=86=92=20%{pytho?= =?UTF-8?q?n2=5Fsitelib}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Igor Gnatenko --- xgridfit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index c09b114..0621197 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -84,7 +84,7 @@ xmlcatalog --noout --del \ %doc COPYING ChangeLog %{_datadir}/xml/%{name}-%{version} %{_mandir}/man1/* -%{python_sitelib}/* +%{python2_sitelib}/* %{_bindir}/* %files doc From 37018a6babbeca55197a66fccd3359745cb36729 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:31 +0100 Subject: [PATCH 42/45] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xgridfit.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xgridfit.spec b/xgridfit.spec index 0621197..304c845 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -11,7 +11,6 @@ Release: 7%{?dist} Summary: Font hinting tool # This is where we drop fontforge -Group: Applications/Publishing License: LGPLv2 URL: http://%{name}.sf.net/ Source0: %{name}-%{version}.tar.gz @@ -36,7 +35,6 @@ Open-Source font editor, to do so. %package doc -Group: Documentation Summary: Font hinting tool use documentation # Does not really make sense without the tool itself Requires: %{name} = %{version}-%{release} From 16f7bb4ad74d7dc552a163a94c3f204f91821f1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:27:36 +0000 Subject: [PATCH 43/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 304c845..175e25d 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -89,6 +89,9 @@ xmlcatalog --noout --del \ %doc docs/* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 611e23da24b7eab82a27870f4c1bfae4f1c79ee5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:15:12 +0000 Subject: [PATCH 44/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xgridfit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgridfit.spec b/xgridfit.spec index 175e25d..751c3e6 100644 --- a/xgridfit.spec +++ b/xgridfit.spec @@ -7,7 +7,7 @@ Name: xgridfit Version: 2.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Font hinting tool # This is where we drop fontforge @@ -89,6 +89,9 @@ xmlcatalog --noout --del \ %doc docs/* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ce88e9df223cd6ebc041672df2659b7e0f649349 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Aug 2019 16:50:47 +0000 Subject: [PATCH 45/45] xgridfit fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676231 --- .gitignore | 2 - dead.package | 1 + sources | 1 - xgridfit-2.2a-maindir-in-python.patch | 26 ---- xgridfit-2.3-python3.patch | 19 --- xgridfit.spec | 206 -------------------------- 6 files changed, 1 insertion(+), 254 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xgridfit-2.2a-maindir-in-python.patch delete mode 100644 xgridfit-2.3-python3.patch delete mode 100644 xgridfit.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 37188d1..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -xgridfit-xgridfit.tar.gz -/xgridfit-2.3.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..e92c3d0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +xgridfit fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676231 diff --git a/sources b/sources deleted file mode 100644 index 98c8d41..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -df594c0d993e7d9bf06a7981faf972b5 xgridfit-2.3.tar.gz diff --git a/xgridfit-2.2a-maindir-in-python.patch b/xgridfit-2.2a-maindir-in-python.patch deleted file mode 100644 index dde987a..0000000 --- a/xgridfit-2.2a-maindir-in-python.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -uNr xgridfit-2.2a.orig/Makefile xgridfit-2.2a/Makefile ---- xgridfit-2.2a.orig/Makefile 2010-03-30 17:58:56.000000000 +0200 -+++ xgridfit-2.2a/Makefile 2010-06-06 19:04:26.302726506 +0200 -@@ -46,7 +46,9 @@ - done - @install -d -m 0755 $(DESTDIR)$(MANDIR)/man1 - @install -p -m 0644 man/*.1 $(DESTDIR)$(MANDIR)/man1 -- @cd python ; python setup.py install --root=$(DESTDIR)/ -+ @rm -fr python.tmp ; cp -pr python python.tmp ; sed -i -e "s|@xgridfit_dir@|${MAINDIR}|g" python.tmp/xgflib.py -+ @cd python.tmp ; python setup.py install --root=$(DESTDIR)/ -+ @cd - ; rm -fr python.tmp - @echo "Xgridfit installed successfully." - - -diff -uNr xgridfit-2.2a.orig/python/xgflib.py xgridfit-2.2a/python/xgflib.py ---- xgridfit-2.2a.orig/python/xgflib.py 2010-03-30 17:26:55.000000000 +0200 -+++ xgridfit-2.2a/python/xgflib.py 2010-06-06 18:55:45.840596588 +0200 -@@ -18,7 +18,7 @@ - VERSION = '2.2' - JAVA_EXECUTABLE = 'java' - DISPLAY_DIAGNOSTIC_MESSAGES = False --XGRIDFIT_DIR = abspath('/usr/local/share/xml/xgridfit/') -+XGRIDFIT_DIR = abspath('@xgridfit_dir@') - XSLT_DIR = abspath(join(XGRIDFIT_DIR, 'lib')) - UTIL_DIR = abspath(join(XGRIDFIT_DIR, 'utils')) - SCHEMA_DIR = abspath(join(XGRIDFIT_DIR, 'schemas')) diff --git a/xgridfit-2.3-python3.patch b/xgridfit-2.3-python3.patch deleted file mode 100644 index 2b70eee..0000000 --- a/xgridfit-2.3-python3.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up xgridfit/lib/xgridfit-python.xsl.py3 xgridfit/lib/xgridfit-python.xsl ---- xgridfit/lib/xgridfit-python.xsl.py3 2017-11-03 20:19:21.947851599 +0100 -+++ xgridfit/lib/xgridfit-python.xsl 2017-11-03 20:19:46.137844915 +0100 -@@ -540,11 +540,11 @@ CURRENT_FONT.maxp_maxStackDepth = 0 - try: - CURRENT_FONT[name].ttinstrs = fontforge.parseTTInstrs(instrs) - except TypeError as detail: -- print "Warning: can't install instructions for glyph ", name -- print detail -+ print ("Warning: can't install instructions for glyph ", name) -+ print (detail) - except ValueError as detail: -- print "Warning: can't install instructions for glyph ", name -- print detail -+ print ("Warning: can't install instructions for glyph ", name) -+ print (detail) - - - CURRENT_FONT.cvt = ( diff --git a/xgridfit.spec b/xgridfit.spec deleted file mode 100644 index 751c3e6..0000000 --- a/xgridfit.spec +++ /dev/null @@ -1,206 +0,0 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} - -%global alphatag 20100725cvs -%global patchlevel a - -%global archivever %{!?alphatag:%{version}%{?patchlevel}}%{?alphatag:%{name}} - -Name: xgridfit -Version: 2.3 -Release: 9%{?dist} -Summary: Font hinting tool - -# This is where we drop fontforge -License: LGPLv2 -URL: http://%{name}.sf.net/ -Source0: %{name}-%{version}.tar.gz -Patch1: %{name}-2.2a-maindir-in-python.patch -Patch2: %{name}-2.3-python3.patch - - -BuildArch: noarch - -BuildRequires: python2-devel - -Requires: %{_bindir}/xsltproc, fontforge, python2-libxml2 -Requires(post): %{_bindir}/xmlcatalog -Requires(preun): %{_bindir}/xmlcatalog - -%description -Xgridfit is a high-level, XML-based language for gridfitting, or ‘hinting’, -fonts. The Xgridfit program compiles an XML source file into tables and -instructions that relate to the gridfitting of glyphs. Xgridfit does not -insert these elements into a font itself, but rather relies on FontForge, the -Open-Source font editor, to do so. - - -%package doc -Summary: Font hinting tool use documentation -# Does not really make sense without the tool itself -Requires: %{name} = %{version}-%{release} - -%description doc -Xgridfit font hinting tool user documentation. - - -%prep -%setup -q -n %{name} -%patch1 -p1 -b .mip -%patch2 -p1 -b .py3 - -%build - - -%install -make install DESTDIR=%{buildroot} \ - BINDIR=%{_bindir} \ - MANDIR=%{_mandir} \ - MAINDIR=%{_datadir}/xml/%{name}-%{version} - -# Simplify preun/post catalog logic -ln -s catalog.xml \ - %{buildroot}%{_datadir}/xml/%{name}-%{version}/schemas/catalog-%{version}.%{release}.xml - - -%post -cd %{_sysconfdir}/xml -[ -e catalog ] || xmlcatalog --noout --create catalog -xmlcatalog --noout --add \ - nextCatalog %{_datadir}/xml/%{name}-%{version}/schemas/catalog-%{version}.%{release}.xml "" catalog >/dev/null -: - - -%preun -xmlcatalog --noout --del \ - %{_datadir}/xml/%{name}-%{version}/schemas/catalog-%{version}.%{release}.xml \ - %{_sysconfdir}/xml/catalog >/dev/null >/dev/null -: - - - -%files -%doc COPYING ChangeLog -%{_datadir}/xml/%{name}-%{version} -%{_mandir}/man1/* -%{python2_sitelib}/* -%{_bindir}/* - -%files doc -%doc docs/* - -%changelog -* Sat Jul 27 2019 Fedora Release Engineering - 2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Iryna Shcherbina - 2.3-6 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Fedora Release Engineering - 2.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Nov 03 2017 Karsten Hopp - 2.3-4 -- fontforge with python3 can't handle python2 print statements - -* Thu Jul 27 2017 Fedora Release Engineering - 2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Dec 03 2016 Filipe Rosset - 2.3-1 -- Rebuilt for new upstream release 2.3, fixes rhbz #xgridfit + spec clean up - -* Tue Jul 19 2016 Fedora Release Engineering - 2.2-14.a.20100725cvs -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Feb 05 2016 Fedora Release Engineering - 2.2-13.a.20100725cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.2-12.a.20100725cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.2-11.a.20100725cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 2.2-10.a.20100725cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 2.2-9.a.20100725cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 2.2-8.a.20100725cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 2.2-7.a.20100725cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 2.2-6.a.20100725cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jul 29 2010 Nicolas Mailhot -- 2.2-5.a.20100725cvs -— Rebuild against python 2.7 - -* Sun Jul 25 2010 Nicolas Mailhot -- 2.2-4.a.20100725cvs -— Bump to cvs version (required by edrip) - -* Sun Jun 6 2010 Nicolas Mailhot -- 2.2-3.a -— Fix hardcoded path in python module -- 2.2-2.a -— Add missing requires - -* Sat Jun 5 2010 Nicolas Mailhot -- 2.2-1.a -— Major upstream changes (python utilities, namespace, etc) - -* Mon Jul 27 2009 Fedora Release Engineering -- 1.19-2.b -— Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jul 14 2009 Nicolas Mailhot -- 1.19-1.b -— Rework to use upstream makefile now there is one - -* Thu Feb 26 2009 Fedora Release Engineering -- 1.17-4.a -— Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 23 2009 Nicolas Mailhot -- 1.17-3.a -— global-ization - -* Mon Feb 16 2009 Nicolas Mailhot -- 1.17-2.a - -* Fri Jan 30 2009 Nicolas Mailhot -- 1.17-1 - -* Fri Nov 14 2008 Nicolas Mailhot -- 1.11-1.a -◮ update for F11 cycle - -* Mon Sep 1 2008 Nicolas Mailhot -- 1.9-1 -ᕏ Major update, many changes -ᕚ Only package xsltproc support for now - -* Sun May 18 2008 Nicolas Mailhot -- 1.6-3 -⊸ Lots of new makefile goodness - -* Thu Mar 13 2008 Nicolas Mailhot -- 1.5-2 -✓ Fix path munging - -* Tue Mar 11 2008 Nicolas Mailhot -- 1.5-1 -✓ Initial Fedora packaging