diff --git a/.fontawesome-fonts.metadata b/.fontawesome-fonts.metadata index 5c12e71..5496237 100644 --- a/.fontawesome-fonts.metadata +++ b/.fontawesome-fonts.metadata @@ -1 +1 @@ -f20f07560900a8f7ea80399af70770d97adb3741 SOURCES/Font-Awesome-6.7.2.tar.gz +fb9e9103426be4ad6e50872219d119b837314ac6 SOURCES/font-awesome-4.7.0.zip diff --git a/SOURCES/README-Trademarks.txt b/SOURCES/README-Trademarks.txt index 9b5e7ad..8660b39 100644 --- a/SOURCES/README-Trademarks.txt +++ b/SOURCES/README-Trademarks.txt @@ -3,59 +3,22 @@ respective owners. Always check before deploying other companies' branding. Brand Icons: * fa-500px - * fa-accessible-icon - * fa-accusoft - * fa-acquisitions-incorporated * fa-adn - * fa-adversal - * fa-affiliatetheme - * fa-airbnb - * fa-algolia - * fa-alipay * fa-amazon - * fa-amazon-pay - * fa-amilia * fa-android * fa-angellist - * fa-angrycreative - * fa-angular - * fa-app-store - * fa-app-store-ios - * fa-apper * fa-apple - * fa-apple-pay - * fa-artstation - * fa-asymmetrik - * fa-atlassian - * fa-audible - * fa-autoprefixer - * fa-avianex - * fa-aviato - * fa-aws * fa-bandcamp - * fa-battle-net * fa-behance * fa-behance-square - * fa-bimobject * fa-bitbucket - * fa-bitcoin - * fa-bity + * fa-bitbucket-square * fa-black-tie - * fa-blackberry - * fa-blogger - * fa-blogger-b * fa-bluetooth * fa-bluetooth-b - * fa-bootstrap * fa-btc - * fa-buffer - * fa-buromobelexperte - * fa-buy-n-large * fa-buysellads - * fa-canadian-maple-leaf - * fa-cc-amazon-pay * fa-cc-amex - * fa-cc-apple-pay * fa-cc-diners-club * fa-cc-discover * fa-cc-jcb @@ -63,399 +26,156 @@ Brand Icons: * fa-cc-paypal * fa-cc-stripe * fa-cc-visa - * fa-centercode - * fa-centos * fa-chrome - * fa-chromecast - * fa-cloudflare - * fa-cloudscale - * fa-cloudsmith - * fa-cloudversify * fa-codepen * fa-codiepie - * fa-confluence * fa-connectdevelop * fa-contao - * fa-cotton-bureau - * fa-cpanel - * fa-creative-commons - * fa-creative-commons-by - * fa-creative-commons-nc - * fa-creative-commons-nc-eu - * fa-creative-commons-nc-jp - * fa-creative-commons-nd - * fa-creative-commons-pd - * fa-creative-commons-pd-alt - * fa-creative-commons-remix - * fa-creative-commons-sa - * fa-creative-commons-sampling - * fa-creative-commons-sampling-plus - * fa-creative-commons-share - * fa-creative-commons-zero - * fa-critical-role * fa-css3 - * fa-css3-alt - * fa-cuttlefish - * fa-d-and-d - * fa-d-and-d-beyond - * fa-dailymotion * fa-dashcube - * fa-deezer * fa-delicious - * fa-deploydog - * fa-deskpro - * fa-dev * fa-deviantart - * fa-dhl - * fa-diaspora * fa-digg - * fa-digital-ocean - * fa-discord - * fa-discourse - * fa-dochub - * fa-docker - * fa-draft2digital * fa-dribbble - * fa-dribbble-square * fa-dropbox * fa-drupal - * fa-dyalog - * fa-earlybirds - * fa-ebay * fa-edge - * fa-edge-legacy - * fa-elementor - * fa-ello - * fa-ember + * fa-eercast * fa-empire * fa-envira - * fa-erlang - * fa-ethereum * fa-etsy - * fa-evernote * fa-expeditedssl * fa-facebook - * fa-facebook-f - * fa-facebook-messenger + * fa-facebook-official * fa-facebook-square - * fa-fantasy-flight-games - * fa-fedex - * fa-fedora - * fa-figma * fa-firefox - * fa-firefox-browser * fa-first-order - * fa-first-order-alt - * fa-firstdraft * fa-flickr - * fa-flipboard - * fa-fly * fa-font-awesome - * fa-font-awesome-alt - * fa-font-awesome-flag - * fa-font-awesome-logo-full * fa-fonticons - * fa-fonticons-fi * fa-fort-awesome - * fa-fort-awesome-alt * fa-forumbee * fa-foursquare * fa-free-code-camp - * fa-freebsd - * fa-fulcrum - * fa-galactic-republic - * fa-galactic-senate * fa-get-pocket * fa-gg * fa-gg-circle * fa-git - * fa-git-alt * fa-git-square * fa-github * fa-github-alt * fa-github-square - * fa-gitkraken * fa-gitlab - * fa-gitter * fa-glide * fa-glide-g - * fa-gofore - * fa-goodreads - * fa-goodreads-g * fa-google - * fa-google-drive - * fa-google-pay - * fa-google-play * fa-google-plus - * fa-google-plus-g + * fa-google-plus-official * fa-google-plus-square * fa-google-wallet * fa-gratipay * fa-grav - * fa-gripfire - * fa-grunt - * fa-guilded - * fa-gulp * fa-hacker-news - * fa-hacker-news-square - * fa-hackerrank - * fa-hips - * fa-hire-a-helper - * fa-hive - * fa-hooli - * fa-hornbill - * fa-hotjar * fa-houzz * fa-html5 - * fa-hubspot - * fa-ideal * fa-imdb - * fa-innosoft * fa-instagram - * fa-instagram-square - * fa-instalod - * fa-intercom * fa-internet-explorer - * fa-invision * fa-ioxhost - * fa-itch-io - * fa-itunes - * fa-itunes-note - * fa-java - * fa-jedi-order - * fa-jenkins - * fa-jira - * fa-joget * fa-joomla - * fa-js - * fa-js-square * fa-jsfiddle - * fa-kaggle - * fa-keybase - * fa-keycdn - * fa-kickstarter - * fa-kickstarter-k - * fa-korvue - * fa-laravel * fa-lastfm * fa-lastfm-square * fa-leanpub - * fa-less - * fa-line * fa-linkedin - * fa-linkedin-in + * fa-linkedin-square * fa-linode * fa-linux - * fa-lyft - * fa-magento - * fa-mailchimp - * fa-mandalorian - * fa-markdown - * fa-mastodon * fa-maxcdn - * fa-mdb - * fa-medapps + * fa-meanpath * fa-medium - * fa-medium-m - * fa-medrt * fa-meetup - * fa-megaport - * fa-mendeley - * fa-microblog - * fa-microsoft - * fa-mix * fa-mixcloud - * fa-mixer - * fa-mizuni * fa-modx - * fa-monero - * fa-napster - * fa-neos - * fa-nimblr - * fa-node - * fa-node-js - * fa-npm - * fa-ns8 - * fa-nutritionix - * fa-octopus-deploy * fa-odnoklassniki * fa-odnoklassniki-square - * fa-old-republic * fa-opencart * fa-openid * fa-opera * fa-optin-monster - * fa-orcid - * fa-osi - * fa-page4 * fa-pagelines - * fa-palfed - * fa-patreon * fa-paypal - * fa-penny-arcade - * fa-perbyte - * fa-periscope - * fa-phabricator - * fa-phoenix-framework - * fa-phoenix-squadron - * fa-php * fa-pied-piper * fa-pied-piper-alt - * fa-pied-piper-hat * fa-pied-piper-pp - * fa-pied-piper-square * fa-pinterest * fa-pinterest-p * fa-pinterest-square - * fa-playstation * fa-product-hunt - * fa-pushed - * fa-python * fa-qq - * fa-quinscape * fa-quora - * fa-r-project - * fa-raspberry-pi * fa-ravelry - * fa-react - * fa-reacteurope - * fa-readme * fa-rebel - * fa-red-river * fa-reddit * fa-reddit-alien * fa-reddit-square - * fa-redhat * fa-renren - * fa-replyd - * fa-researchgate - * fa-resolving - * fa-rev - * fa-rocketchat - * fa-rockrms - * fa-rust * fa-safari - * fa-salesforce - * fa-sass - * fa-schlix * fa-scribd - * fa-searchengin - * fa-sellcast * fa-sellsy - * fa-servicestack + * fa-share-alt + * fa-share-alt-square * fa-shirtsinbulk - * fa-shopify - * fa-shopware * fa-simplybuilt - * fa-sistrix - * fa-sith - * fa-sketch * fa-skyatlas * fa-skype * fa-slack - * fa-slack-hash * fa-slideshare * fa-snapchat * fa-snapchat-ghost * fa-snapchat-square * fa-soundcloud - * fa-sourcetree - * fa-speakap - * fa-speaker-deck * fa-spotify - * fa-squarespace * fa-stack-exchange * fa-stack-overflow - * fa-stackpath - * fa-staylinked * fa-steam * fa-steam-square - * fa-steam-symbol - * fa-sticker-mule - * fa-strava - * fa-stripe - * fa-stripe-s - * fa-studiovinari * fa-stumbleupon * fa-stumbleupon-circle * fa-superpowers - * fa-supple - * fa-suse - * fa-swift - * fa-symfony - * fa-teamspeak * fa-telegram - * fa-telegram-plane * fa-tencent-weibo - * fa-the-red-yeti - * fa-themeco * fa-themeisle - * fa-think-peaks - * fa-tiktok - * fa-trade-federation * fa-trello + * fa-tripadvisor * fa-tumblr * fa-tumblr-square * fa-twitch * fa-twitter * fa-twitter-square - * fa-typo3 - * fa-uber - * fa-ubuntu - * fa-uikit - * fa-umbraco - * fa-uncharted - * fa-uniregistry - * fa-unity - * fa-unsplash - * fa-untappd - * fa-ups * fa-usb - * fa-usps - * fa-ussunnah - * fa-vaadin * fa-viacoin * fa-viadeo * fa-viadeo-square - * fa-viber * fa-vimeo * fa-vimeo-square - * fa-vimeo-v * fa-vine * fa-vk - * fa-vnv - * fa-vuejs - * fa-watchman-monitoring - * fa-waze - * fa-weebly * fa-weibo * fa-weixin * fa-whatsapp - * fa-whatsapp-square - * fa-whmcs * fa-wikipedia-w * fa-windows - * fa-wix - * fa-wizards-of-the-coast - * fa-wodu - * fa-wolf-pack-battalion * fa-wordpress - * fa-wordpress-simple * fa-wpbeginner * fa-wpexplorer * fa-wpforms - * fa-wpressr - * fa-xbox * fa-xing * fa-xing-square * fa-y-combinator * fa-yahoo - * fa-yammer - * fa-yandex - * fa-yandex-international - * fa-yarn * fa-yelp * fa-yoast * fa-youtube + * fa-youtube-play * fa-youtube-square - * fa-zhihu diff --git a/SPECS/fontawesome-fonts.spec b/SPECS/fontawesome-fonts.spec index fa5f021..4c6d7e6 100644 --- a/SPECS/fontawesome-fonts.spec +++ b/SPECS/fontawesome-fonts.spec @@ -1,202 +1,91 @@ -Name: fontawesome-fonts -Summary: Support files for the FontAwesome fonts -Epoch: 1 -Version: 6.7.2 -Release: 2%{?dist} - -License: MIT -URL: https://fontawesome.com/ -VCS: git:https://github.com/FortAwesome/Font-Awesome.git -BuildArch: noarch +%global fontname fontawesome +%global fontconf 60-%{fontname}.conf -%global _desc %{expand: -Font Awesome gives you scalable vector icons that can instantly be -customized - size, color, drop shadow, and anything that can be done -with the power of CSS.} - -%global fontlicense OFL-1.1-RFN -%global fontlicenses LICENSE.txt -%global fontdocs CHANGELOG.md README.md UPGRADING.md -%global fontorg com.fontawesome - -%global fontfamily1 FontAwesome 6 Free -%global fontsummary1 Iconic font set -%global fonts1 otfs/*Free* -%global fontconfs1 %{SOURCE3} -%global fontpkgheader1 %{expand: -# This can be removed when F42 reaches EOL -Obsoletes: fontawesome5-free-fonts < 5.15.4-5 -Provides: fontawesome5-free-fonts = %{version}-%{release} -} -%global fontdescription1 %{expand:%_desc - -The FontAwesome Free Fonts contain large numbers of icons packaged as -font files.} - -%global fontfamily2 FontAwesome 6 Brands Regular -%global fontsummary2 Iconic font set -%global fonts2 otfs/*Brands* -%global fontconfs2 %{SOURCE4} -%global fontpkgheader2 %{expand: -# This can be removed when F42 reaches EOL -Obsoletes: fontawesome5-brands-fonts < 5.15.4-5 -Provides: fontawesome5-brands-fonts = %{version}-%{release} -} -%global fontdescription2 %{expand:%_desc - -The FontAwesome Brand Fonts contain brand logos packaged as font files.} - -Source0: https://github.com/FortAwesome/Font-Awesome/archive/%{version}/Font-Awesome-%{version}.tar.gz -# Script to generate Source2 -Source1: trademarks.py +Name: %{fontname}-fonts +Epoch: 1 +Version: 4.7.0 +Release: 13%{?dist} + +Summary: Iconic font set +License: OFL +URL: http://fontawesome.io +Source0: font-awesome-%{version}.zip +Source1: %{name}-fontconfig.conf Source2: README-Trademarks.txt -Source3: 60-%{fontpkgname1}.conf -Source4: 60-%{fontpkgname2}.conf - -# Not for upstream. This patch modifies the CSS to point to local OpenType -# font files, rather than to the eot, svg, ttf, woff, and woff2 web fonts, as -# required by Fedora's font packaging guidelines. -Patch: %{name}-opentype-css.patch - -%description %_desc - -%fontpkg -a - -# NOTE: We would like to do this here: -#%%fontmetapkg -d %%_desc -# However, the fontmetapkg macro has no facility for adding Obsoletes and -# Provides, so we expand it by hand. -%package all -Summary: Metapackage that requires all Font Awesome fonts -Requires: fontawesome-6-brands-fonts = 1:%{version}-%{release} -Requires: fontawesome-6-free-fonts = 1:%{version}-%{release} +BuildArch: noarch +BuildRequires: fontpackages-devel +BuildRequires: ttembed +Requires: fontpackages-filesystem -# This can be removed when F42 reaches EOL -Obsoletes: fontawesome5-fonts-all < 5.15.4-5 -Provides: fontawesome5-fonts-all = %{version}-%{release} -%description all %_desc +%description +Font Awesome gives you scalable vector icons that can instantly be +customized — size, color, drop shadow, and anything that can be done with the +power of CSS. -This package is a metapackage that ensures all Font Awesome fonts are -installed. +This package contains OpenType and TrueType font files which are typically used +locally. %package web -License: CC-BY-4.0 -Summary: Iconic font set, JavaScript and SVG files - -# This can be removed when F42 reaches EOL -Obsoletes: fontawesome5-fonts < 5.15.4-5 -Provides: fontawesome5-fonts = %{version}-%{release} -Obsoletes: fontawesome5-fonts-web < 5.15.4-5 -Provides: fontawesome5-fonts-web = %{version}-%{release} +License: OFL and MIT +Requires: %{fontname}-fonts = %{?epoch:%{epoch}:}%{version}-%{release} +Summary: Iconic font set, web files -%description web %_desc +%description web +Font Awesome gives you scalable vector icons that can instantly be +customized — size, color, drop shadow, and anything that can be done with the +power of CSS. -This package contains CSS, SCSS and LESS style files for each of the -fonts in the FontAwesome family, as well as JSON and YAML metadata. -It also contains JavaScript, TTF, and SVG files, which are typically -used on web pages. +This package contains CSS, SCSS and LESS style files as well as Web Open Font +Format versions 1 and 2, Embedded OpenType and SVG font files which are +typically used on the web. %prep -%autosetup -n Font-Awesome-%{version} -p1 +%setup -q -n font-awesome-%{version} cp -p %SOURCE2 . %build -%fontbuild -a +ttembed fonts/*.ttf fonts/*.otf %install -%fontinstall -a +install -m 0755 -d %{buildroot}%{_fontdir} +install -m 0644 -p fonts/*.ttf fonts/*.otf fonts/*.woff fonts/*.svg fonts/*.woff2 fonts/*.eot %{buildroot}%{_fontdir} -# Install the web files -mkdir -p %{buildroot}%{_datadir}/fontawesome -cp -a css js less metadata scss sprites svgs webfonts \ - %{buildroot}%{_datadir}/fontawesome +install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ + %{buildroot}%{_fontconfig_confdir} -# Create unversioned fontawesome directory -mkdir -p %{buildroot}%{_datadir}/fonts/fontawesome -cp %{fonts1} %{buildroot}%{_datadir}/fonts/fontawesome +install -m 0644 -p %{SOURCE1} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf} -# Fix up the generated metainfo; see bz 1943727 -sed -e 's,updatecontact,update_contact,g' \ - -e 's,,\1,g' \ - -i %{buildroot}%{_metainfodir}/*.metainfo.xml +ln -s %{_fontconfig_templatedir}/%{fontconf} \ + %{buildroot}%{_fontconfig_confdir}/%{fontconf} -%check -%fontcheck -a +mkdir -p %{buildroot}%{_datadir}/font-awesome-web/ +cp -a css less scss %{buildroot}%{_datadir}/font-awesome-web/ -%fontfiles -a +# files: +%_font_pkg -f %{fontconf} *.ttf *.otf +%exclude %{_datadir}/fonts/fontawesome/fontawesome-webfont.svg +%exclude %{_datadir}/fonts/fontawesome/fontawesome-webfont.woff +%exclude %{_datadir}/fonts/fontawesome/fontawesome-webfont.woff2 +%exclude %{_datadir}/fonts/fontawesome/fontawesome-webfont.eot -%files all -%{_datadir}/fonts/fontawesome/ +%doc README-Trademarks.txt %files web -%doc CHANGELOG.md README* UPGRADING.md -%license LICENSE.txt -%{_datadir}/fontawesome/ +%{_datadir}/font-awesome-web/ +%{_datadir}/fonts/fontawesome/fontawesome-webfont.svg +%{_datadir}/fonts/fontawesome/fontawesome-webfont.woff +%{_datadir}/fonts/fontawesome/fontawesome-webfont.woff2 +%{_datadir}/fonts/fontawesome/fontawesome-webfont.eot %changelog -* Mon Mar 10 2024 Joel Capitao - 1:6.7.2-2 -- Create unversioned fontawesome directory - -* Tue Dec 17 2024 Jerry James - 1:6.7.2-1 -- Version 6.7.2 - -* Wed Nov 20 2024 Jerry James - 1:6.7.1-1 -- Version 6.7.1 - -* Tue Nov 19 2024 Jerry James - 1:6.7.0-1 -- Version 6.7.0 - -* Wed Jul 17 2024 Fedora Release Engineering - 1:6.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jul 17 2024 Jerry James - 1:6.6.0-1 -- Version 6.6.0 - -* Tue Jul 16 2024 Jerry James - 1:6.5.2-2 -- Fix VCS field - -* Wed Apr 03 2024 Jerry James - 1:6.5.2-1 -- Version 6.5.2 - -* Wed Jan 24 2024 Fedora Release Engineering - 1:6.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1:6.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Dec 2 2023 Jerry James - 1:6.5.1-1 -- Version 6.5.1 - -* Thu Nov 30 2023 Jerry James - 1:6.5.0-1 -- Version 6.5.0 - -* Thu Aug 3 2023 Jerry James - 1:6.4.2-1 -- Version 6.4.2 - -* Tue Jul 18 2023 Jerry James - 1:6.4.0-2 -- Remove redundant metainfo checks - -* Mon Apr 10 2023 Jerry James - 1:6.4.0-2 -- Move obsoletes/provides to the right package (rhbz#2185459) - -* Tue Mar 28 2023 Jerry James - 1:6.4.0-1 -- Version 6.4.0 -- Convert License tags to SPDX -- Comply with the font policy -- Update trademarks.py for python3 - -* Thu Jan 19 2023 Fedora Release Engineering - 1:4.7.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 1:4.7.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1:4.7.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Mon Aug 09 2021 Mohan Boddu - 1:4.7.0-13 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 -* Wed Jul 21 2021 Fedora Release Engineering - 1:4.7.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Thu Apr 15 2021 Mohan Boddu - 1:4.7.0-12 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 * Tue Jan 26 2021 Fedora Release Engineering - 1:4.7.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild