[cherokee/el5] Remove the upstream cherokee logo due to: https://fedorahosted.org/fesco/ticket/1230
Toshio くらとみ
toshio at fedoraproject.org
Thu Mar 6 01:08:54 UTC 2014
commit 508f1b83c44eb3cf5702ad8f5c6c6d0194765f83
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Wed Mar 5 17:08:35 2014 -0800
Remove the upstream cherokee logo due to: https://fedorahosted.org/fesco/ticket/1230
admin_handler_dirlist_ex.png | Bin 0 -> 12516 bytes
admin_handler_onlylisting_ex.png | Bin 0 -> 12482 bytes
admin_index.png | Bin 0 -> 41470 bytes
admin_launch.png | Bin 0 -> 3028 bytes
cherokee-admin-launcher-128.png | Bin 0 -> 12095 bytes
cherokee-admin-launcher-16.png | Bin 0 -> 1269 bytes
cherokee-admin-launcher-256.png | Bin 0 -> 25723 bytes
cherokee-admin-launcher-32.png | Bin 0 -> 2406 bytes
cherokee-admin-launcher-48.png | Bin 0 -> 3785 bytes
cherokee-admin-launcher-512.png | Bin 0 -> 56031 bytes
cherokee-admin-launcher-96.png | Bin 0 -> 8684 bytes
cherokee-logo.png | Bin 0 -> 9027 bytes
cherokee.spec | 76 +++++++++++++++++++++++++++++++++++++-
favicon.ico | Bin 0 -> 1584 bytes
logo.png | Bin 0 -> 20172 bytes
screencast.png | Bin 0 -> 54367 bytes
16 files changed, 75 insertions(+), 1 deletions(-)
---
diff --git a/admin_handler_dirlist_ex.png b/admin_handler_dirlist_ex.png
new file mode 100644
index 0000000..40ec411
Binary files /dev/null and b/admin_handler_dirlist_ex.png differ
diff --git a/admin_handler_onlylisting_ex.png b/admin_handler_onlylisting_ex.png
new file mode 100644
index 0000000..aeef383
Binary files /dev/null and b/admin_handler_onlylisting_ex.png differ
diff --git a/admin_index.png b/admin_index.png
new file mode 100644
index 0000000..e6b1620
Binary files /dev/null and b/admin_index.png differ
diff --git a/admin_launch.png b/admin_launch.png
new file mode 100644
index 0000000..04d6218
Binary files /dev/null and b/admin_launch.png differ
diff --git a/cherokee-admin-launcher-128.png b/cherokee-admin-launcher-128.png
new file mode 100644
index 0000000..f40086d
Binary files /dev/null and b/cherokee-admin-launcher-128.png differ
diff --git a/cherokee-admin-launcher-16.png b/cherokee-admin-launcher-16.png
new file mode 100644
index 0000000..012ce88
Binary files /dev/null and b/cherokee-admin-launcher-16.png differ
diff --git a/cherokee-admin-launcher-256.png b/cherokee-admin-launcher-256.png
new file mode 100644
index 0000000..f6d82d0
Binary files /dev/null and b/cherokee-admin-launcher-256.png differ
diff --git a/cherokee-admin-launcher-32.png b/cherokee-admin-launcher-32.png
new file mode 100644
index 0000000..69daec5
Binary files /dev/null and b/cherokee-admin-launcher-32.png differ
diff --git a/cherokee-admin-launcher-48.png b/cherokee-admin-launcher-48.png
new file mode 100644
index 0000000..acc0ed6
Binary files /dev/null and b/cherokee-admin-launcher-48.png differ
diff --git a/cherokee-admin-launcher-512.png b/cherokee-admin-launcher-512.png
new file mode 100644
index 0000000..8190804
Binary files /dev/null and b/cherokee-admin-launcher-512.png differ
diff --git a/cherokee-admin-launcher-96.png b/cherokee-admin-launcher-96.png
new file mode 100644
index 0000000..0562fdb
Binary files /dev/null and b/cherokee-admin-launcher-96.png differ
diff --git a/cherokee-logo.png b/cherokee-logo.png
new file mode 100644
index 0000000..b19dada
Binary files /dev/null and b/cherokee-logo.png differ
diff --git a/cherokee.spec b/cherokee.spec
index 2ccd547..0819785 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -5,7 +5,7 @@
Name: cherokee
Version: 1.2.101
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -20,6 +20,43 @@ Source3: %{name}.service
Source100: http://www.openssl.org/source/openssl-%{opensslversion}.tar.gz
%endif
+# Temporary replacement images for cherokee logos due to :
+# https://fedorahosted.org/fesco/ticket/1230
+#
+# Unless noted, images from openclipart with license:
+# https://openclipart.org/share
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+# Replaces admin logos
+# https://openclipart.org/detail/34951/architetto----utensili-chiave-e-cacci-by-anonymous
+Source101: cherokee-admin-launcher.svg
+Source102: cherokee-admin-launcher-256.png
+Source103: cherokee-admin-launcher-128.png
+Source104: cherokee-admin-launcher-96.png
+Source105: cherokee-admin-launcher-48.png
+Source106: cherokee-admin-launcher-512.png
+Source107: cherokee-admin-launcher-32.png
+Source108: cherokee-admin-launcher-16.png
+
+# Replaces Cherokee logo (image only, no name)
+# https://openclipart.org/detail/35389/tango-applications-internet-by-warszawianka
+Source109: favicon.ico
+
+# Modified Cherokee images to omit logo
+# image + name. Replacement keeps name, just removes logo
+Source110: logo.png
+Source111: cherokee-logo.png
+
+# Modified Cherokee images to remove logo in documentation files
+Source112: admin_handler_dirlist_ex.png
+Source113: admin_handler_onlylisting_ex.png
+Source114: admin_index.png
+Source115: admin_launch.png
+
+# Replaces screencast image
+# https://openclipart.org/detail/172871/tango-styled-video-player-icon-by-flooredmusic-172871
+Source116: screencast.png
+
# Drop privileges to cherokee:cherokee after startup
Patch0: 01-drop-privileges.patch
@@ -73,6 +110,40 @@ This package holds the development files for cherokee.
%endif
%patch0 -p1 -b .privs
+# Replace upstream logos: https://fedorahosted.org/fesco/ticket/1230
+for i in admin/icons/cherokee-admin-launcher-* \
+ admin/static/images/favicon.ico \
+ themes/default/logo.png \
+ www/cherokee-logo.png \
+ www/favicon.ico \
+ doc/media/images/admin_handler_dirlist_ex.png \
+ doc/media/images/admin_handler_onlylisting_ex.png \
+ doc/media/images/admin_index.png \
+ doc/media/images/admin_launch.png \
+ doc/media/images/screencast.png ; do
+ rm $i
+done
+cp %{SOURCE101} admin/icons/
+cp %{SOURCE102} admin/icons/
+cp %{SOURCE103} admin/icons/
+cp %{SOURCE104} admin/icons/
+cp %{SOURCE105} admin/icons/
+cp %{SOURCE106} admin/icons/
+cp %{SOURCE107} admin/icons/
+cp %{SOURCE108} admin/icons/
+
+cp %{SOURCE109} www/favicon.ico
+cp %{SOURCE109} admin/static/images/favicon.ico
+
+cp %{SOURCE110} themes/default/
+cp %{SOURCE111} www/
+
+cp %{SOURCE112} doc/media/images/
+cp %{SOURCE113} doc/media/images/
+cp %{SOURCE114} doc/media/images/
+cp %{SOURCE115} doc/media/images/
+cp %{SOURCE116} doc/media/images/
+
%build
%if "%{rhel}" == "4" || "%{rhel}" == "5"
pushd openssl-%{opensslversion}
@@ -247,6 +318,9 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Wed Mar 5 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 1.2.101-4
+- Remove the upstream cherokee logo due to: https://fedorahosted.org/fesco/ticket/1230
+
* Tue Feb 21 2012 Pavel Lisý <pali at fedoraproject.org> - 1.2.101-3
- Resolves bz 786748 - systemd service script seems broken
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000..601db19
Binary files /dev/null and b/favicon.ico differ
diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000..b87ebea
Binary files /dev/null and b/logo.png differ
diff --git a/screencast.png b/screencast.png
new file mode 100644
index 0000000..112fcd0
Binary files /dev/null and b/screencast.png differ
More information about the scm-commits
mailing list