Author: nim
Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4031/devel
Modified Files:
.cvsignore import.log sources
stix-fonts-integrals-fontconfig.conf
stix-fonts-sizes-fontconfig.conf stix-fonts.spec
Removed Files:
stix-fonts-License.txt
Log Message:
Update to latest version, switch to OFL
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 1 Nov 2007 15:37:32 -0000 1.2
+++ .cvsignore 25 Jul 2010 16:45:09 -0000 1.3
@@ -1 +1 @@
-STIXBeta.zip
+STIXv1.0.0.zip
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log 23 Feb 2009 09:02:21 -0000 1.4
+++ import.log 25 Jul 2010 16:45:09 -0000 1.5
@@ -2,3 +2,4 @@ stix-fonts-0_9-7_fc10:HEAD:stix-fonts-0.
stix-fonts-0_9-9_fc11:HEAD:stix-fonts-0.9-9.fc11.src.rpm:1229543904
stix-fonts-0_9-10_fc11:HEAD:stix-fonts-0.9-10.fc11.src.rpm:1232141192
stix-fonts-0_9-11_fc11:HEAD:stix-fonts-0.9-11.fc11.src.rpm:1235379717
+stix-fonts-1_0_0-1_fc14:HEAD:stix-fonts-1.0.0-1.fc14.src.rpm:1280076051
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 1 Nov 2007 15:37:32 -0000 1.2
+++ sources 25 Jul 2010 16:45:09 -0000 1.3
@@ -1 +1 @@
-3d869530e7fe4803658d3974392b5911 STIXBeta.zip
+c8ce241126591ab76e488a1a10bf49f5 STIXv1.0.0.zip
Index: stix-fonts-integrals-fontconfig.conf
===================================================================
RCS file:
/cvs/extras/rpms/stix-fonts/devel/stix-fonts-integrals-fontconfig.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- stix-fonts-integrals-fontconfig.conf 13 Sep 2009 09:43:48 -0000
1.5
+++ stix-fonts-integrals-fontconfig.conf 25 Jul 2010 16:45:09 -0000
1.6
@@ -2,7 +2,31 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<alias binding="same">
- <family>STIXIntegrals</family>
+ <family>STIXIntegralsD</family>
+ <accept>
+ <family>STIXGeneral</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>STIXIntegralsSm</family>
+ <accept>
+ <family>STIXGeneral</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>STIXIntegralsUp</family>
+ <accept>
+ <family>STIXGeneral</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>STIXIntegralsUpD</family>
+ <accept>
+ <family>STIXGeneral</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>STIXIntegralsSm</family>
<accept>
<family>STIXGeneral</family>
</accept>
Index: stix-fonts-sizes-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-sizes-fontconfig.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- stix-fonts-sizes-fontconfig.conf 13 Sep 2009 09:43:56 -0000 1.5
+++ stix-fonts-sizes-fontconfig.conf 25 Jul 2010 16:45:09 -0000 1.6
@@ -2,31 +2,31 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<alias binding="same">
- <family>STIXSize1</family>
+ <family>STIXSizeOneSym</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
- <family>STIXSize2</family>
+ <family>STIXSizeTwoSym</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
- <family>STIXSize3</family>
+ <family>STIXSizeThreeSym</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
- <family>STIXSize4</family>
+ <family>STIXSizeFourSym</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
- <family>STIXSize5</family>
+ <family>STIXSizeFiveSym</family>
<accept>
<family>STIXGeneral</family>
</accept>
Index: stix-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- stix-fonts.spec 13 Jun 2010 14:15:14 -0000 1.11
+++ stix-fonts.spec 25 Jul 2010 16:45:09 -0000 1.12
@@ -1,7 +1,7 @@
%global fontname stix
%global fontconf 61-%{fontname}
-%global archivename STIXBeta
+%global archivename STIXv%{version}
%global common_desc \
The mission of the Scientific and Technical Information Exchange (STIX) font \
@@ -10,21 +10,20 @@ the scientific and engineering community
creation through final publication, both in electronic and print formats.
Name: %{fontname}-fonts
-Version: 0.9
-Release: 13%{?dist}
-Summary: STIX scientific and engineering fonts
-
-Group: User Interface/X
-License: STIX
-URL: http://www.stixfonts.org/
-Source0: %{archivename}.zip
-Source1: %{name}-License.txt
-Source2: stix-fonts-fontconfig.conf
-Source3: stix-fonts-pua-fontconfig.conf
-Source4: stix-fonts-integrals-fontconfig.conf
-Source5: stix-fonts-sizes-fontconfig.conf
-Source6: stix-fonts-variants-fontconfig.conf
-
+Version: 1.0.0
+Release: 1%{?dist}
+Summary: Scientific and engineering fonts
+
+Group: User Interface/X
+License: OFL
+URL: http://www.stixfonts.org/
+# Download hidden behind a form
+Source0: %{archivename}.zip
+Source10: stix-fonts-fontconfig.conf
+Source11: stix-fonts-pua-fontconfig.conf
+Source12: stix-fonts-integrals-fontconfig.conf
+Source13: stix-fonts-sizes-fontconfig.conf
+Source14: stix-fonts-variants-fontconfig.conf
BuildArch: noarch
BuildRequires: fontpackages-devel
@@ -36,13 +35,14 @@ Requires: fontpackages-filesystem
This package includes base Unicode fonts containing most glyphs for standard
use.
+%_font_pkg -f %{fontconf}.conf STIXGeneral*otf
+%doc License/*.pdf
+
%package -n %{fontname}-pua-fonts
-Summary: STIX scientific and engineering fonts, PUA glyphs
+Summary: Scientific and engineering fonts, PUA glyphs
Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-pua < 0.9-10
-
%description -n %{fontname}-pua-fonts
%common_desc
@@ -56,11 +56,9 @@ Consortium and moved to an official code
%package -n %{fontname}-integrals-fonts
-Summary: STIX scientific and engineering fonts, additional integral glyphs
+Summary: Scientific and engineering fonts, additional integral glyphs
Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-integrals < 0.9-10
-
%description -n %{fontname}-integrals-fonts
%common_desc
@@ -71,11 +69,9 @@ and slant.
%package -n %{fontname}-sizes-fonts
-Summary: STIX scientific and engineering fonts, additional glyph sizes
+Summary: Scientific and engineering fonts, additional glyph sizes
Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-sizes < 0.9-10
-
%description -n %{fontname}-sizes-fonts
%common_desc
@@ -86,11 +82,9 @@ This package includes fonts containing g
%package -n %{fontname}-variants-fonts
-Summary: STIX scientific and engineering fonts, additional glyph variants
+Summary: Scientific and engineering fonts, additional glyph variants
Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-variants < 0.9-10
-
%description -n %{fontname}-variants-fonts
%common_desc
@@ -99,10 +93,17 @@ This package includes fonts containing a
%_font_pkg -n variants -f %{fontconf}-variants.conf STIXVar*otf
+%package doc
+Summary: Scientific and engineering fonts, documentation
+
+%description doc
+%common_desc
+
+This package includes the documentation released by the STIX project.
+
%prep
-%setup -c -q -n %{archivename}
-install -m 0644 -p %{SOURCE1} License.txt
-for txt in *.txt ; do
+%setup -q -n %{archivename}
+for txt in */*.TXT ; do
fold -s $txt > $txt.new
sed -i 's/\r//' $txt.new
touch -r $txt $txt.new
@@ -117,20 +118,20 @@ done
rm -fr %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.otf %{buildroot}%{_fontdir}
+install -m 0644 -p Fonts/*.otf %{buildroot}%{_fontdir}
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
%{buildroot}%{_fontconfig_confdir}
-install -m 0644 -p %{SOURCE2} \
+install -m 0644 -p %{SOURCE10} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
-install -m 0644 -p %{SOURCE3} \
+install -m 0644 -p %{SOURCE11} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pua.conf
-install -m 0644 -p %{SOURCE4} \
+install -m 0644 -p %{SOURCE12} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-integrals.conf
-install -m 0644 -p %{SOURCE5} \
+install -m 0644 -p %{SOURCE13} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sizes.conf
-install -m 0644 -p %{SOURCE6} \
+install -m 0644 -p %{SOURCE14} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-variants.conf
for fconf in %{fontconf}.conf \
@@ -147,17 +148,25 @@ done
rm -fr %{buildroot}
-%_font_pkg -f %{fontconf}.conf STIXGeneral*otf
-
-%doc *.txt
+%files doc
+%defattr(0644,root,root,0755)
+%doc *.pdf Blocks/ Glyphs/ HTML/ License/
%changelog
-* Sun Jul 26 2009 Fedora Release Engineering <[email protected]>
- 0.9-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <[email protected]>
- 0.9-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sun Jul 25 2010 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 1.0.0-1
+— Update to non-beta release
+— Switch licensing to OFL
+— Add -doc subpackage
+
+* Sun Jul 26 2009 Fedora Release Engineering <[email protected]>
+- 0.9-13
+— Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <[email protected]>
+- 0.9-12
+— Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Feb 16 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 0.9-11
--- stix-fonts-License.txt DELETED ---
_______________________________________________
fonts-bugs mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/fonts-bugs
http://fonts.fedoraproject.org/
