rpms/apanov-edrip-fonts/devel .cvsignore, 1.2, 1.3 apanov-edrip-fonts.spec, 1.10, 1.11 import.log, 1.6, 1.7 sources, 1.2, 1.3 apanov-edrip-fonts-bolditalic.patch, 1.1, NONE apanov-edrip-fonts-license.patch, 1.1, NONE

[nim]

Author: nim

Update of /cvs/extras/rpms/apanov-edrip-fonts/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15505/devel

Modified Files:
	.cvsignore apanov-edrip-fonts.spec import.log sources 
Removed Files:
	apanov-edrip-fonts-bolditalic.patch 
	apanov-edrip-fonts-license.patch 
Log Message:
Update to latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apanov-edrip-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Jan 2009 06:55:56 -0000	1.2
+++ .cvsignore	25 Jul 2010 08:50:53 -0000	1.3
@@ -1 +1 @@
-edrip-src-20081007.tar.bz2
+edrip-src-r6.tar.xz


Index: apanov-edrip-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/apanov-edrip-fonts/devel/apanov-edrip-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- apanov-edrip-fonts.spec	13 Jun 2010 14:09:45 -0000	1.10
+++ apanov-edrip-fonts.spec	25 Jul 2010 08:50:56 -0000	1.11
@@ -1,28 +1,29 @@
 %global fontname apanov-edrip
 %global fontconf 61-%{fontname}.conf
 
-%global archivename edrip-src-%{version}
+%global archivename    edrip-src-%{archiveversion}
+%global archiveversion r6
+%global googlename     edrip
 
 Name:    %{fontname}-fonts
-Version: 20081007
-Release: 10%{?dist}
+Version: 20100430
+Release: 2%{?dist}
 Summary: A decorative contrast sans-serif font
 
 Group:     User Interface/X
 License:   OFL
-URL:       ftp://ftp.dvo.ru/pub/Font/edrip/
-Source0:   %{url}%{archivename}.tar.bz2
+URL:       http://code.google.com/p/%{googlename}/
+
+# Upstream has still not completed hosting switching
+Source0:   ftp://ftp.dvo.ru/pub/Font/edrip/%{archivename}.tar.xz
+#Source0:   http://%{googlename}.googlecode.com/files/%{archivename}.tar.xz
 Source1:   %{name}-fontconfig.conf
-Patch0:    %{name}-license.patch
-Patch1:    %{name}-bolditalic.patch
 
 
 BuildArch:     noarch
+BuildRequires: fontforge, xgridfit >= 2.2-4.a.20100725cvs.fc14
 BuildRequires: fontpackages-devel
-BuildRequires: xgridfit
-BuildRequires: fontforge
 Requires:      fontpackages-filesystem
-Obsoletes:     edrip-fonts < 20081007-3
 
 %description
 Edrip font is a contrast sans-serif font. It is based on the Teams font
@@ -32,18 +33,15 @@ Latin alphabets.
 
 %prep
 %setup -q -c
-%patch0 -p1
-%patch1 -p1
 
 %build
-make %{?_smp_mflags} all
-
+make %{?_smp_mflags}
 
 %install
 rm -fr %{buildroot}
 
 install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+install -m 0644 -p *\.ttf %{buildroot}%{_fontdir}
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                    %{buildroot}%{_fontconfig_confdir}
@@ -59,10 +57,17 @@ rm -fr %{buildroot}
 
 
 %_font_pkg -f %{fontconf} *.ttf
-
 %doc *.txt README
 
 %changelog
+* Sun Jul 25 2010 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20100430-2
+— Edrip requires cvs xgridfit to build
+
+* Sun Jun 13 2010 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20100430-1
+— Switch to new upstream hosting
+
 * Mon Sep 25 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20081007-10
 — fix BoldItalic naming


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/apanov-edrip-fonts/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	28 Sep 2009 07:24:37 -0000	1.6
+++ import.log	25 Jul 2010 08:50:56 -0000	1.7
@@ -4,3 +4,4 @@ apanov-edrip-fonts-20081007-6_fc11:HEAD:
 apanov-edrip-fonts-20081007-6_fc11:HEAD:apanov-edrip-fonts-20081007-6.fc11.src.rpm:1235377546
 apanov-edrip-fonts-20081007-8_fc11:HEAD:apanov-edrip-fonts-20081007-8.fc11.src.rpm:1237144512
 apanov-edrip-fonts-20081007-10_fc12:HEAD:apanov-edrip-fonts-20081007-10.fc12.src.rpm:1254122643
+apanov-edrip-fonts-20100430-2_fc14:HEAD:apanov-edrip-fonts-20100430-2.fc14.src.rpm:1280047834


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apanov-edrip-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Jan 2009 06:55:57 -0000	1.2
+++ sources	25 Jul 2010 08:50:56 -0000	1.3
@@ -1 +1 @@
-b745af94b865df2b0c20fe72ff58b568  edrip-src-20081007.tar.bz2
+810fc6a2c74ede88d8c51435b3bd30c4  edrip-src-r6.tar.xz


--- apanov-edrip-fonts-bolditalic.patch DELETED ---


--- apanov-edrip-fonts-license.patch DELETED ---