Author: nim
Update of /cvs/extras/rpms/xgridfit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12227/devel
Modified Files:
.cvsignore import.log sources xgridfit.spec
Added Files:
xgridfit-1.19-1.b.patch
Log Message:
1.19.b
xgridfit-1.19-1.b.patch:
--- NEW FILE xgridfit-1.19-1.b.patch ---
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 *.*~ *~
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 16 Feb 2009 23:26:32 -0000 1.7
+++ .cvsignore 14 Jul 2009 12:01:29 -0000 1.8
@@ -1 +1 @@
-xgridfit-1-17a.tar.gz
+xgridfit-1-19b.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log 23 Feb 2009 09:03:38 -0000 1.5
+++ import.log 14 Jul 2009 12:01:29 -0000 1.6
@@ -3,3 +3,4 @@ xgridfit-1_11-1_a_fc11:HEAD:xgridfit-1.1
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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 16 Feb 2009 23:26:32 -0000 1.7
+++ sources 14 Jul 2009 12:01:29 -0000 1.8
@@ -1 +1 @@
-943b0540441d7184977f60b1b0dc4a59 xgridfit-1-17a.tar.gz
+1cbaa3148950356777b470eca29a9cac xgridfit-1-19b.tar.gz
Index: xgridfit.spec
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/xgridfit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xgridfit.spec 26 Feb 2009 09:34:37 -0000 1.12
+++ xgridfit.spec 14 Jul 2009 12:01:29 -0000 1.13
@@ -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 document
%prep
%setup -q -n %{name}
+%patch0 -p1
%build
@@ -44,23 +46,10 @@ Xgridfit font hinting tool user document
%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 <[email protected]>
- 1.17-4.a
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Jul 14 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 1.19-1.b
+â Rework to use upstream makefile now there is one
+
+* Thu Feb 26 2009 Fedora Release Engineering <[email protected]>
+- 1.17-4.a
+â Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Feb 23 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 1.17-3.a
_______________________________________________
Fedora-fonts-bugs-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/fedora-fonts-bugs-list
