rpms/xgridfit/devel .cvsignore, 1.8, 1.9 import.log, 1.6, 1.7 sources, 1.8, 1.9 xgridfit.spec, 1.14, 1.15 xgridfit-1.19-1.b.patch, 1.1, NONE

[nim]

Author: nim

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

Modified Files:
	.cvsignore import.log sources xgridfit.spec 
Removed Files:
	xgridfit-1.19-1.b.patch 
Log Message:
2.2a : python, xml catalogs…


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 Jul 2009 12:01:29 -0000	1.8
+++ .cvsignore	5 Jun 2010 19:02:53 -0000	1.9
@@ -1 +1 @@
-xgridfit-1-19b.tar.gz
+xgridfit-2.2a.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	14 Jul 2009 12:01:29 -0000	1.6
+++ import.log	5 Jun 2010 19:02:53 -0000	1.7
@@ -4,3 +4,4 @@ xgridfit-1_17-1_fc11:HEAD:xgridfit-1.17-
 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Jul 2009 12:01:29 -0000	1.8
+++ sources	5 Jun 2010 19:02:53 -0000	1.9
@@ -1 +1 @@
-1cbaa3148950356777b470eca29a9cac  xgridfit-1-19b.tar.gz
+b6959a505d8276fc0dab133fa39d5c2d  xgridfit-2.2a.tar.gz


Index: xgridfit.spec
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/xgridfit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xgridfit.spec	27 Jul 2009 08:03:46 -0000	1.14
+++ xgridfit.spec	5 Jun 2010 19:02:53 -0000	1.15
@@ -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 document
 %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 <rel-eng at lists.fedoraproject.org> - 1.19-2.b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sat Jun 5 2010 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.2-1.a
+— Major upstream changes (python utilities, namespace, etc)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 1.19-2.b
+— Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Jul 14 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 1.19-1.b


--- xgridfit-1.19-1.b.patch DELETED ---