From 4f38fd070e148603fbc311cba92d172588b0a92f Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 25 Jul 2010 16:45:09 +0000 Subject: [PATCH] Update to latest version, switch to OFL --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- stix-fonts-License.txt | 65 ------------------- stix-fonts-integrals-fontconfig.conf | 26 +++++++- stix-fonts-sizes-fontconfig.conf | 10 +-- stix-fonts.spec | 95 +++++++++++++++------------- 7 files changed, 85 insertions(+), 116 deletions(-) delete mode 100644 stix-fonts-License.txt diff --git a/.cvsignore b/.cvsignore index 03b36d0..4d3b1f8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -STIXBeta.zip +STIXv1.0.0.zip diff --git a/import.log b/import.log index 3a0fda6..71567d3 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ stix-fonts-0_9-7_fc10:HEAD:stix-fonts-0.9-7.fc10.src.rpm:1215809789 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 diff --git a/sources b/sources index 2d9dd61..ca27fa9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d869530e7fe4803658d3974392b5911 STIXBeta.zip +c8ce241126591ab76e488a1a10bf49f5 STIXv1.0.0.zip diff --git a/stix-fonts-License.txt b/stix-fonts-License.txt deleted file mode 100644 index cf5d6fd..0000000 --- a/stix-fonts-License.txt +++ /dev/null @@ -1,65 +0,0 @@ -TERMS AND CONDITIONS - - 1. Permission is hereby granted, free of charge, to any person obtaining a -copy of the STIX Fonts-TM set accompanying this license (collectively, the -"Fonts") and the associated documentation files (collectively with the Fonts, -the "Font Software"), to reproduce and distribute the Font Software, including -the rights to use, copy, merge and publish copies of the Font Software, and to -permit persons to whom the Font Software is furnished to do so same, subject to -the following terms and conditions (the "License"). - - 2. The following copyright and trademark notice and these Terms and -Conditions shall be included in all copies of one or more of the Font typefaces -and any derivative work created as permitted under this License: - - Copyright (c) 2001-2005 by the STI Pub Companies, consisting of the -American Institute of Physics, the American Chemical Society, the American -Mathematical Society, the American Physical Society, Elsevier, Inc., and The -Institute of Electrical and Electronic Engineers, Inc. Portions copyright (c) -1998-2003 by MicroPress, Inc. Portions copyright (c) 1990 by Elsevier, Inc. All -rights reserved. STIX Fonts-TM is a trademark of The Institute of Electrical -and Electronics Engineers, Inc. - - 3. You may (a) convert the Fonts from one format to another (e.g., from -TrueType to PostScript), in which case the normal and reasonable distortion -that occurs during such conversion shall be permitted and (b) embed or include -a subset of the Fonts in a document for the purposes of allowing users to read -text in the document that utilizes the Fonts. In each case, you may use the -STIX Fonts-TM mark to designate the resulting Fonts or subset of the Fonts. - - 4. You may also (a) add glyphs or characters to the Fonts, or modify the -shape of existing glyphs, so long as the base set of glyphs is not removed and -(b) delete glyphs or characters from the Fonts, provided that the resulting -font set is distributed with the following disclaimer: "This [name] font does -not include all the Unicode points covered in the STIX Fonts-TM set but may -include others." In each case, the name used to denote the resulting font set -shall not include the term "STIX" or any similar term. - - 5. You may charge a fee in connection with the distribution of the Font -Software, provided that no copy of one or more of the individual Font typefaces -that form the STIX Fonts-TM set may be sold by itself. - - 6. THE FONT SOFTWARE IS PROVIDED "AS IS," WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF -COPYRIGHT, PATENT, TRADEMARK OR OTHER RIGHT. IN NO EVENT SHALL MICROPRESS OR -ANY OF THE STI PUB COMPANIES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, INCLUDING, BUT NOT LIMITED TO, ANY GENERAL, SPECIAL, INDIRECT, -INCIDENTAL OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM OR OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE -OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - - 7. Except as contained in the notice set forth in Section 2, the names -MicroPress Inc. and STI Pub Companies, as well as the names of the -companies/organizations that compose the STI Pub Companies, shall not be used -in advertising or otherwise to promote the sale, use or other dealings in the -Font Software without the prior written consent of the respective company or -organization. - - 8. This License shall become null and void in the event of any material -breach of the Terms and Conditions herein by licensee. - - 9. A substantial portion of the STIX Fonts set was developed by MicroPress -Inc. for the STI Pub Companies. To obtain additional mathematical fonts, please -contact MicroPress, Inc., 68-30 Harrow Street, Forest Hills, NY 11375, USA - -Phone: (718) 575-1816. diff --git a/stix-fonts-integrals-fontconfig.conf b/stix-fonts-integrals-fontconfig.conf index 5d33591..12d53c6 100644 --- a/stix-fonts-integrals-fontconfig.conf +++ b/stix-fonts-integrals-fontconfig.conf @@ -2,7 +2,31 @@ - STIXIntegrals + STIXIntegralsD + + STIXGeneral + + + + STIXIntegralsSm + + STIXGeneral + + + + STIXIntegralsUp + + STIXGeneral + + + + STIXIntegralsUpD + + STIXGeneral + + + + STIXIntegralsSm STIXGeneral diff --git a/stix-fonts-sizes-fontconfig.conf b/stix-fonts-sizes-fontconfig.conf index 8c5967f..875e4fb 100644 --- a/stix-fonts-sizes-fontconfig.conf +++ b/stix-fonts-sizes-fontconfig.conf @@ -2,31 +2,31 @@ - STIXSize1 + STIXSizeOneSym STIXGeneral - STIXSize2 + STIXSizeTwoSym STIXGeneral - STIXSize3 + STIXSizeThreeSym STIXGeneral - STIXSize4 + STIXSizeFourSym STIXGeneral - STIXSize5 + STIXSizeFiveSym STIXGeneral diff --git a/stix-fonts.spec b/stix-fonts.spec index a4ad4f8..e2f0ea7 100644 --- a/stix-fonts.spec +++ b/stix-fonts.spec @@ -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 in the process from manuscript \ 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 codepoint. %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 glyphs in additional sizes (Mostly %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 alternative variants of some glyphs. %_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 - 0.9-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Sun Jul 25 2010 Nicolas Mailhot +- 1.0.0-1 +— Update to non-beta release +— Switch licensing to OFL +— Add -doc subpackage -* Wed Feb 25 2009 Fedora Release Engineering - 0.9-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Sun Jul 26 2009 Fedora Release Engineering +- 0.9-13 +— Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering +- 0.9-12 +— Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Mon Feb 16 2009 Nicolas Mailhot - 0.9-11