[fontik] 0.6.1, fix ftbfs

Tom Callaway spot at fedoraproject.org
Mon Mar 5 18:24:52 UTC 2012


commit 1aea6dd1fe001dcad91574ca1174b076f50e3cfa
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Mar 5 13:24:38 2012 -0500

    0.6.1, fix ftbfs

 .gitignore           |    1 +
 fontik-gee-0.8.patch |   12 ++++++++++++
 fontik.spec          |   14 +++++++++-----
 sources              |    2 +-
 4 files changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6fa869f..6d5f66e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /fontik-8e8cea81d.tar.gz
 /fontik-8dd5b9fe7.tar.gz
+/fontik-5dbbc513.tar.gz
diff --git a/fontik-gee-0.8.patch b/fontik-gee-0.8.patch
new file mode 100644
index 0000000..2b1f36b
--- /dev/null
+++ b/fontik-gee-0.8.patch
@@ -0,0 +1,12 @@
+diff -up fontik-5dbbc513/Makefile.geefix fontik-5dbbc513/Makefile
+--- fontik-5dbbc513/Makefile.geefix	2012-03-05 13:13:17.136741587 -0500
++++ fontik-5dbbc513/Makefile	2012-03-05 13:13:30.847591332 -0500
+@@ -19,7 +19,7 @@ PROGRAM_FILES = $(PROGRAM_SOURCES) \
+              COPYING README
+ PROGRAM_TGZ = $(PACKAGE)-$(PACKAGE_VERSION).tar.gz
+ 
+-LIBS = --pkg gtk+-2.0 --pkg gee-1.0 --pkg gmodule-2.0 --pkg libxml-2.0
++LIBS = --pkg gtk+-2.0 --pkg gee-0.8 --pkg gmodule-2.0 --pkg libxml-2.0
+ 
+ all: $(PROGRAM)
+ 
diff --git a/fontik.spec b/fontik.spec
index 3ab3c96..45cd2aa 100644
--- a/fontik.spec
+++ b/fontik.spec
@@ -1,7 +1,7 @@
-%global		fontikcommit	8dd5b9fe7
+%global		fontikcommit	5dbbc513
 Name:		fontik
-Version:	0.6
-Release:	6.20100901git%{fontikcommit}%{?dist}
+Version:	0.6.1
+Release:	1.20120305git%{fontikcommit}%{?dist}
 Summary:	A Configuration Tool for Font-wise, User-set Fontconfig Rules
 
 Group:		User Interface/X
@@ -11,12 +11,13 @@ URL:		http://suruma.freeflux.net/blog/archive/2009/10/14/fontik-a-font-configura
 # following commands to generate the tarball:
 #  git clone git://gitorious.org/fontik/fontik.git
 #  cd fontik
-#  export fontikcommit=8dd5b9fe7
+#  export fontikcommit=5dbbc513
 #  git archive --format tar --prefix fontik-${fontikcommit}/ ${fontikcommit} |\
 #      gzip -c > ../fontik-${fontikcommit}.tar.gz
 Source0:	%{name}-%{fontikcommit}.tar.gz
 Source1:	%{name}.desktop
 Patch0:		%{name}-valac-save-temps.patch
+Patch1:		fontik-gee-0.8.patch
 
 BuildRequires:	libgee-devel
 BuildRequires:	libxml2-devel
@@ -33,7 +34,7 @@ user.
 %prep
 %setup -q -n %{name}-%{fontikcommit}
 %patch0 -p1 -b .valac-save-temps
-
+%patch1 -p1 -b .geefix
 
 %build
 make %{?_smp_mflags}
@@ -56,6 +57,9 @@ desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
 
 
 %changelog
+* Mon Mar  5 2012 Tom Callaway <spot at fedoraproject.org> - 0.6.1-1.20120305git5dbbc513
+- update to 0.6.1
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-6.20100901git8dd5b9fe7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 4e3471b..7af869c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8d4322e37d34b35b815831f75ee8c0d  fontik-8dd5b9fe7.tar.gz
+3ffed0689ff0a5c81bb53135aac38074  fontik-5dbbc513.tar.gz


More information about the scm-commits mailing list