From 3d80811cc229ee4c9667437ac69024a2e4208667 Mon Sep 17 00:00:00 2001 From: Fabio Alessandro Locati Date: Thu, 5 May 2016 09:54:22 +0100 Subject: [PATCH] Update to 4.6.2 --- .gitignore | 1 + README-Trademarks.txt | 255 ++++++++++++++++++++++++++--------------- fontawesome-fonts.spec | 7 +- sources | 2 +- trademarks.py | 29 +++++ 5 files changed, 200 insertions(+), 94 deletions(-) create mode 100755 trademarks.py diff --git a/.gitignore b/.gitignore index 40fedfa..1242dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /font-awesome-4.4.0.zip /font-awesome-4.5.0.zip /font-awesome-4.6.1.zip +/font-awesome-4.6.2.zip diff --git a/README-Trademarks.txt b/README-Trademarks.txt index 9d379d7..add06f9 100644 --- a/README-Trademarks.txt +++ b/README-Trademarks.txt @@ -1,95 +1,166 @@ Brand icons may be subject to trademark and brand guidelines of their -respective owners. Always check before deploying other companies’ branding. +respective owners. Always check before deploying other companies' branding. Brand Icons: -fa-adn -fa-android -fa-apple -fa-bitbucket -fa-bitbucket-square -fa-bitcoin (alias) -fa-bluetooth-b -fa-btc -fa-codiepie -fa-css3 -fa-dribbble -fa-dropbox -fa-edge -fa-envira -fa-facebook -fa-facebook-square -fa-flickr -fa-fort-awesome -fa-foursquare -fa-github -fa-github-alt -fa-github-square -fa-gitlab -fa-gittip -fa-glide -fa-glide-g -fa-google-plus -fa-google-plus-square -fa-html5 -fa-instagram -fa-linkedin -fa-linkedin-square -fa-linux -fa-maxcdn -fa-mixcloud -fa-modx -fa-pagelines -fa-pinterest -fa-pinterest-square -fa-product-hunt -fa-reddit-alien -fa-renren -fa-scribd -fa-skype -fa-snapchat -fa-snapchat-ghost -fa-snapchat-square -fa-stack-exchange -fa-stack-overflow -fa-trello -fa-tumblr -fa-tumblr-square -fa-twitter -fa-twitter-square -fa-usb -fa-viadeo -fa-viadeo-square -fa-vimeo-square -fa-vk -fa-weibo -fa-windows -fa-wpbeginner -fa-wpforms -fa-xing -fa-xing-square -fa-youtube -fa-youtube-play -fa-youtube-square - -Brand Guidelines (incomplete list): -Android: http://developer.android.com/distribute/googleplay/promote/brand.html -Apple: http://www.apple.com/legal/intellectual-property/guidelinesfor3rdparties.html -Dribble: http://dribbble.com/branding -Dropbox: https://www.dropbox.com/branding -Facebook: https://www.facebookbrand.com/ -Foursquare: https://foursquare.com/legal/trademark https://foursquare.com/about/logos -GitHub: https://github.com/logos -Gittip: https://www.gittip.com/about/terms/ -Google Plus: https://developers.google.com/+/branding-guidelines -HTML5: http://www.w3.org/html/logo/ -Instagram: http://help.instagram.com/304689166306603/ -LinkedIn: http://developer.linkedin.com/documents/branding-guidelines -Pinterest: http://business.pinterest.com/brand-guidelines/ -Skype: http://www.skype.com/en/legal/brand-guidelines/ -Stack Exchange, Stack Overflow: http://stackexchange.com/legal/trademark-guidance -Tumblr: http://www.tumblr.com/docs/en/trademark_guidelines -Twitter: https://about.twitter.com/press/brand-assets -Vimeo: http://vimeo.com/about/brand_guidelines -Windows: http://www.microsoft.com/en-us/legal/intellectualproperty/Trademarks/Usage/Windows.aspx -Xing: https://dev.xing.com/docs/policies -YouTube: http://www.youtube.com/yt/brand/ + * fa-500px + * fa-adn + * fa-amazon + * fa-android + * fa-angellist + * fa-apple + * fa-behance + * fa-behance-square + * fa-bitbucket + * fa-bitbucket-square + * fa-black-tie + * fa-bluetooth + * fa-bluetooth-b + * fa-btc + * fa-buysellads + * fa-cc-amex + * fa-cc-diners-club + * fa-cc-discover + * fa-cc-jcb + * fa-cc-mastercard + * fa-cc-paypal + * fa-cc-stripe + * fa-cc-visa + * fa-chrome + * fa-codepen + * fa-codiepie + * fa-connectdevelop + * fa-contao + * fa-css3 + * fa-dashcube + * fa-delicious + * fa-deviantart + * fa-digg + * fa-dribbble + * fa-dropbox + * fa-drupal + * fa-edge + * fa-empire + * fa-envira + * fa-expeditedssl + * fa-facebook + * fa-facebook-official + * fa-facebook-square + * fa-firefox + * fa-first-order + * fa-flickr + * fa-fonticons + * fa-fort-awesome + * fa-forumbee + * fa-foursquare + * fa-get-pocket + * fa-gg + * fa-gg-circle + * fa-git + * fa-git-square + * fa-github + * fa-github-alt + * fa-github-square + * fa-gitlab + * fa-glide + * fa-glide-g + * fa-google + * fa-google-plus + * fa-google-plus-square + * fa-google-wallet + * fa-gratipay + * fa-hacker-news + * fa-houzz + * fa-html5 + * fa-instagram + * fa-internet-explorer + * fa-ioxhost + * fa-joomla + * fa-jsfiddle + * fa-lastfm + * fa-lastfm-square + * fa-leanpub + * fa-linkedin + * fa-linkedin-square + * fa-linux + * fa-maxcdn + * fa-meanpath + * fa-medium + * fa-mixcloud + * fa-modx + * fa-odnoklassniki + * fa-odnoklassniki-square + * fa-opencart + * fa-openid + * fa-opera + * fa-optin-monster + * fa-pagelines + * fa-paypal + * fa-pied-piper + * fa-pied-piper-alt + * fa-pied-piper-pp + * fa-pinterest + * fa-pinterest-p + * fa-pinterest-square + * fa-product-hunt + * fa-qq + * fa-rebel + * fa-reddit + * fa-reddit-alien + * fa-reddit-square + * fa-renren + * fa-safari + * fa-scribd + * fa-sellsy + * fa-share-alt + * fa-share-alt-square + * fa-shirtsinbulk + * fa-simplybuilt + * fa-skyatlas + * fa-skype + * fa-slack + * fa-slideshare + * fa-snapchat + * fa-snapchat-ghost + * fa-snapchat-square + * fa-soundcloud + * fa-spotify + * fa-stack-exchange + * fa-stack-overflow + * fa-steam + * fa-steam-square + * fa-stumbleupon + * fa-stumbleupon-circle + * fa-tencent-weibo + * fa-themeisle + * fa-trello + * fa-tripadvisor + * fa-tumblr + * fa-tumblr-square + * fa-twitch + * fa-twitter + * fa-twitter-square + * fa-usb + * fa-viacoin + * fa-viadeo + * fa-viadeo-square + * fa-vimeo + * fa-vimeo-square + * fa-vine + * fa-vk + * fa-weibo + * fa-weixin + * fa-whatsapp + * fa-wikipedia-w + * fa-windows + * fa-wordpress + * fa-wpbeginner + * fa-wpforms + * fa-xing + * fa-xing-square + * fa-y-combinator + * fa-yahoo + * fa-yelp + * fa-yoast + * fa-youtube + * fa-youtube-play + * fa-youtube-square diff --git a/fontawesome-fonts.spec b/fontawesome-fonts.spec index 53485d0..5c838b4 100644 --- a/fontawesome-fonts.spec +++ b/fontawesome-fonts.spec @@ -2,7 +2,7 @@ %global fontconf 60-%{fontname}.conf Name: %{fontname}-fonts -Version: 4.6.1 +Version: 4.6.2 Release: 1%{?dist} Summary: Iconic font set @@ -79,6 +79,11 @@ cp -a css less scss %{buildroot}%{_datadir}/font-awesome-web/ %{_datadir}/fonts/fontawesome/fontawesome-webfont.eot %changelog +* Thu May 05 2016 Fabio Alessandro Locati - 4.6.2-1 +- Update to 4.6.1 +- Update the brand icons list using a new script +- Add the script to create brand icons list + * Wed Apr 13 2016 Fabio Alessandro Locati - 4.6.1-1 - Update to 4.6.0 - Update the brand list with the icons new in 4.6.0 diff --git a/sources b/sources index 32bd3a4..5e39f37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a9da525fbd40369882ccc69bbfc27552 font-awesome-4.6.1.zip +9338ef86cf5eb3369db9e2be5390871f font-awesome-4.6.2.zip diff --git a/trademarks.py b/trademarks.py new file mode 100755 index 0000000..788e0b2 --- /dev/null +++ b/trademarks.py @@ -0,0 +1,29 @@ +#! /usr/bin/python + +# Small and dirty script to create the README-Trademarks.txt file. This file +# has to be created by scratch at every release. To do so, use: +# ./trademarks.py > README-Trademarks.txt + +import urllib2 +import yaml + +response = urllib2.urlopen('https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/src/icons.yml') +document = yaml.load(response) + +brands = [] + +for icon in document['icons']: + if 'Brand Icons' in icon['categories']: + brands.append(icon['id']) + +brands.sort() + +out = 'Brand icons may be subject to trademark and brand guidelines of their\n' +out+= 'respective owners. Always check before deploying other companies\' branding.\n' +out+= '\n' +out+= 'Brand Icons:' + +for brand in brands: + out+= '\n * fa-' + brand + +print out