rpms/xgridfit/devel xgridfit-2.2a-maindir-in-python.patch, NONE, 1.1 import.log, 1.8, 1.9 xgridfit.spec, 1.16, 1.17

[nim]

Author: nim

Update of /cvs/extras/rpms/xgridfit/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26086/devel

Modified Files:
	import.log xgridfit.spec 
Added Files:
	xgridfit-2.2a-maindir-in-python.patch 
Log Message:
Fix stray hardcoded path in python module

xgridfit-2.2a-maindir-in-python.patch:
 Makefile         |    4 +++-
 python/xgflib.py |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE xgridfit-2.2a-maindir-in-python.patch ---
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'))


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	6 Jun 2010 16:32:08 -0000	1.8
+++ import.log	6 Jun 2010 17:29:28 -0000	1.9
@@ -6,3 +6,4 @@ xgridfit-1_17-3_a_fc11:HEAD:xgridfit-1.1
 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


Index: xgridfit.spec
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/xgridfit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xgridfit.spec	6 Jun 2010 16:32:08 -0000	1.16
+++ xgridfit.spec	6 Jun 2010 17:29:28 -0000	1.17
@@ -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 document
 
 %prep
 %setup -q -n %{name}
+%patch1 -p1 -b .mip
 
 %build
 
@@ -98,6 +100,8 @@ xmlcatalog --noout --del \
 
 %changelog
 * Sun Jun 6 2010 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.2-3.a
+— Fix hardcoded path in python module
 - 2.2-2.a
 — Add missing requires