diff --git a/README-Trademarks.txt b/README-Trademarks.txt index 1d99a85..8660b39 100644 --- a/README-Trademarks.txt +++ b/README-Trademarks.txt @@ -3,60 +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-adobe - * 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 @@ -64,329 +26,126 @@ Brand Icons: * fa-cc-paypal * fa-cc-stripe * fa-cc-visa - * fa-centercode - * fa-centos * fa-chrome - * fa-chromecast - * 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-gulp * fa-hacker-news - * fa-hacker-news-square - * fa-hackerrank - * fa-hips - * fa-hire-a-helper - * fa-hooli - * fa-hornbill - * fa-hotjar * fa-houzz * fa-html5 - * fa-hubspot - * fa-ideal * fa-imdb * fa-instagram - * fa-instagram-square - * 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-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-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 @@ -394,60 +153,29 @@ Brand Icons: * fa-twitch * fa-twitter * fa-twitter-square - * fa-typo3 - * fa-uber - * fa-ubuntu - * fa-uikit - * fa-umbraco - * 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-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-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/fontawesome-fonts-fontconfig.conf b/fontawesome-fonts-fontconfig.conf index 2a32eb9..1394b88 100644 --- a/fontawesome-fonts-fontconfig.conf +++ b/fontawesome-fonts-fontconfig.conf @@ -1,62 +1,14 @@ - + - - - Font Awesome 5 Brands - - - FontAwesome - - - FontAwesome - - - - - Font Awesome 5 Free - - - FontAwesome - - - FontAwesome - - - - - FontAwesome - - - Solid - - - FontAwesome Black - - - Black - - - - fantasy + + FontAwesome - FontAwesome + fantasy - FontAwesome - - fantasy - - - - Font Awesome 5 Brands - - FontAwesome - - - - Font Awesome 5 Free + fantasy FontAwesome diff --git a/fontawesome-fonts.spec b/fontawesome-fonts.spec index f22c151..8ee62a6 100644 --- a/fontawesome-fonts.spec +++ b/fontawesome-fonts.spec @@ -1,21 +1,22 @@ %global fontname fontawesome %global fontconf 60-%{fontname}.conf -Name: %{fontname}-fonts -Version: 5.13.1 -Release: 2%{?dist} +Name: %{fontname}-fonts +Epoch: 1 +Version: 4.7.0 +Release: 8%{?dist} + +Summary: Iconic font set +License: OFL +URL: http://fontawesome.io +Source0: http://fontawesome.io/assets/font-awesome-%{version}.zip +Source1: %{name}-fontconfig.conf +Source2: README-Trademarks.txt +BuildArch: noarch +BuildRequires: fontpackages-devel +BuildRequires: ttembed +Requires: fontpackages-filesystem -Summary: Iconic font set -License: OFL -URL: http://fontawesome.io -Source0: https://github.com/FortAwesome/Font-Awesome/archive/%{version}.tar.gz -Source1: %{name}-fontconfig.conf -Source2: README-Trademarks.txt -BuildArch: noarch -BuildRequires: fontpackages-devel -BuildRequires: ttembed -Requires: fontpackages-filesystem -Provides: font(fontawesome) %description Font Awesome gives you scalable vector icons that can instantly be @@ -40,37 +41,48 @@ Format versions 1 and 2, Embedded OpenType and SVG font files which are typically used on the web. %prep -%autosetup -n Font-Awesome-%{version} -cp -p %{SOURCE2} . +%setup -q -n font-awesome-%{version} +cp -p %SOURCE2 . %build -ttembed webfonts/*.ttf otfs/*.otf +ttembed fonts/*.ttf fonts/*.otf %install install -m 0755 -d %{buildroot}%{_fontdir} -install -m 0644 -p otfs/*.otf webfonts/*.woff webfonts/*.svg webfonts/*.woff2 webfonts/*.eot %{buildroot}%{_fontdir} -install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir} -install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf} -ln -s %{_fontconfig_templatedir}/%{fontconf} %{buildroot}%{_fontconfig_confdir}/%{fontconf} +install -m 0644 -p fonts/*.ttf fonts/*.otf fonts/*.woff fonts/*.svg fonts/*.woff2 fonts/*.eot %{buildroot}%{_fontdir} + +install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ + %{buildroot}%{_fontconfig_confdir} + +install -m 0644 -p %{SOURCE1} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf} + +ln -s %{_fontconfig_templatedir}/%{fontconf} \ + %{buildroot}%{_fontconfig_confdir}/%{fontconf} + mkdir -p %{buildroot}%{_datadir}/font-awesome-web/ cp -a css less scss %{buildroot}%{_datadir}/font-awesome-web/ # files: -%_font_pkg -f %{fontconf} *.otf -%exclude %{_datadir}/fonts/fontawesome/fa-*.svg -%exclude %{_datadir}/fonts/fontawesome/fa-*.woff -%exclude %{_datadir}/fonts/fontawesome/fa-*.woff2 -%exclude %{_datadir}/fonts/fontawesome/fa-*.eot +%_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 + %doc README-Trademarks.txt %files web %{_datadir}/font-awesome-web/ -%{_datadir}/fonts/fontawesome/fa-*.svg -%{_datadir}/fonts/fontawesome/fa-*.woff -%{_datadir}/fonts/fontawesome/fa-*.woff2 -%{_datadir}/fonts/fontawesome/fa-*.eot +%{_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 +* Wed Jul 08 2020 Fabio Alessandro Locati - 1:4.7.0-8 +- Rollback to FA4 + * Tue Jul 07 2020 Fabio Alessandro Locati - 5.13.1-2 - Provide the right font configuration - Drop ttf format since upstream affirms that otf is to be preferred diff --git a/sources b/sources index b10a056..bc6d6ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.13.1.tar.gz) = 944d34b1e7519f7eeb6aa8207766aaa6e278dc9b4926d52cae6196824bf3a52c19b23f068c7334435cb205c8c37d5af62cf6fec91ae4641492c48f9cf03962cf +4d7d73ec30555f5351db74f6cfebe91e font-awesome-4.7.0.zip diff --git a/trademarks.py b/trademarks.py index 55fbc09..788e0b2 100755 --- a/trademarks.py +++ b/trademarks.py @@ -4,15 +4,17 @@ # has to be created by scratch at every release. To do so, use: # ./trademarks.py > README-Trademarks.txt -import requests +import urllib2 +import yaml + +response = urllib2.urlopen('https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/src/icons.yml') +document = yaml.load(response) -response = requests.get('https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/metadata/icons.json') -icons = response.json() brands = [] -for name in icons: - if 'brands' in icons[name]['styles']: - brands.append(name) +for icon in document['icons']: + if 'Brand Icons' in icon['categories']: + brands.append(icon['id']) brands.sort() @@ -24,4 +26,4 @@ out+= 'Brand Icons:' for brand in brands: out+= '\n * fa-' + brand -print(out) +print out