From b3cc41860010bb374d11688355dfb4d0c7584f4c Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mar 27 2021 01:48:23 +0000 Subject: update to new logo, make -classic subpackage --- diff --git a/.gitignore b/.gitignore index e57ffd1..9d0f39a 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ fedora-logos-13.0.3.tar.bz2 /fedora-logos-30.0.1.tar.bz2 /fedora-logos-30.0.2.tar.bz2 /fedora-logos-33.0.0.tar.bz2 +/fedora-logos-34.0.1.tar.xz diff --git a/fedora-logos.spec b/fedora-logos.spec index ed28aa0..97c08b3 100644 --- a/fedora-logos.spec +++ b/fedora-logos.spec @@ -1,9 +1,9 @@ Name: fedora-logos Summary: Fedora-related icons and pictures -Version: 33.0.0 -Release: 3%{?dist} +Version: 34.0.1 +Release: 1%{?dist} URL: https://pagure.io/fedora-logos -Source0: https://releases.pagure.org/fedora-logos/fedora-logos-%{version}.tar.bz2 +Source0: https://releases.pagure.org/fedora-logos/fedora-logos-%{version}.tar.xz License: Licensed only for approved usage, see COPYING for details. Provides: redhat-logos = %{version}-%{release} Provides: gnome-logos = %{version}-%{release} @@ -34,6 +34,7 @@ redistribution of this package and its contents. Summary: Fedora-related icons and pictures used by httpd Provides: system-logos-httpd = %{version}-%{release} BuildArch: noarch +Recommends: julietaula-montserrat-base-web-fonts %description httpd The fedora-logos-httpd package contains image files which incorporate the @@ -49,6 +50,25 @@ the more liberally licensed generic-logos package. See the included COPYING file for full information on copying and redistribution of this package and its contents. +%package classic +Summary: Classic versions of the Fedora icons and pictures +BuildArch: noarch + +%description classic +The fedora-logos-classic package contains image files which incorporate the +classic Fedora trademarks (the "Marks"). The Marks are trademarks or +registered trademarks of Red Hat, Inc. in the United States and other +countries and are used by permission. + +This package and its content may not be distributed with anything but +unmodified packages from Fedora Project. + +See the included COPYING file for full information on copying and +redistribution of this package and its contents. + +PLEASE NOTE: This package does not provide system-logos and cannot be +used as a drop-in replacement for fedora-logos. + %prep %autosetup -p1 @@ -59,6 +79,10 @@ redistribution of this package and its contents. mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/bootloader # To regenerate this file, see the bootloader/fedora.icns entry in the Makefile install -p -m 644 bootloader/fedora.icns $RPM_BUILD_ROOT%{_datadir}/pixmaps/bootloader + +# Classic variant +install -p -m 644 bootloader/fedora_classic.icns $RPM_BUILD_ROOT%{_datadir}/pixmaps/bootloader + # To regenerate these files, run: # pngtopnm foo.png | ppmtoapplevol > foo.vol install -p -m 644 bootloader/fedora.vol bootloader/fedora-media.vol $RPM_BUILD_ROOT%{_datadir}/pixmaps/bootloader @@ -69,11 +93,13 @@ for i in pixmaps/* ; do done # Anaconda release notes (that contain Fedora logos) +# Pretty sure these are legacy/unused now (2021). for i in rnotes/* ; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/anaconda/pixmaps/$i install -p -m 644 $i/* $RPM_BUILD_ROOT%{_datadir}/anaconda/pixmaps/$i done +# OLD LOGO ONLY # The Plymouth charge theme (uses the Fedora logo) mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge for i in plymouth/charge/* ; do @@ -90,9 +116,13 @@ for size in 16x16 22x22 24x24 32x32 36x36 48x48 96x96 256x256 ; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/$size/apps pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/$size/apps ln -s ../../../hicolor/$size/apps/fedora-logo-icon.png icon-panel-menu.png + ln -s ../../../hicolor/$size/apps/fedora-logo-icon_classic.png icon-panel-menu_classic.png ln -s ../../../hicolor/$size/apps/fedora-logo-icon.png gnome-main-menu.png + ln -s ../../../hicolor/$size/apps/fedora-logo-icon_classic.png gnome-main-menu_classic.png ln -s ../../../hicolor/$size/apps/fedora-logo-icon.png kmenu.png + ln -s ../../../hicolor/$size/apps/fedora-logo-icon_classic.png kmenu_classic.png ln -s ../../../hicolor/$size/apps/fedora-logo-icon.png start-here.png + ln -s ../../../hicolor/$size/apps/fedora-logo-icon_classic.png start-here_classic.png popd for i in icons/hicolor/$size/apps/* ; do install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps @@ -102,33 +132,42 @@ done for i in 16 22 24 32 36 48 96 256 ; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/places install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/places/start-here.png + install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon_classic.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/places/start-here_classic.png %if ! 0%{?eln} - install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_kde4_iconsdir}/oxygen/${i}x${i}/places/start-here-kde-fedora.png + install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_kde4_iconsdir}/oxygen/${i}x${i}/places/start-here-kde-fedora.png + install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon_classic.png $RPM_BUILD_ROOT%{_kde4_iconsdir}/oxygen/${i}x${i}/places/start-here-kde-fedora_classic.png %endif done %if ! 0%{?eln} mkdir -p $RPM_BUILD_ROOT%{_kde4_iconsdir}/oxygen/scalable/apps/ install -p -m 644 icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller.svg $RPM_BUILD_ROOT%{_kde4_iconsdir}/oxygen/scalable/apps/ +install -p -m 644 icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller_classic.svg $RPM_BUILD_ROOT%{_kde4_iconsdir}/oxygen/scalable/apps/ %endif # Fedora favicon mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} pushd $RPM_BUILD_ROOT%{_sysconfdir} ln -s %{_datadir}/icons/hicolor/16x16/apps/fedora-logo-icon.png favicon.png + ln -s %{_datadir}/icons/hicolor/16x16/apps/fedora-logo-icon_classic.png favicon_classic.png popd # Fedora hicolor icons mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps install -p -m 644 icons/hicolor/scalable/apps/xfce4_xicon1.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps +install -p -m 644 icons/hicolor/scalable/apps/xfce4_xicon1_classic.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps install -p -m 644 icons/hicolor/scalable/apps/fedora-logo-icon.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/start-here.svg +install -p -m 644 icons/hicolor/scalable/apps/fedora-logo-icon_classic.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/start-here_classic.svg install -p -m 644 icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller.svg +install -p -m 644 icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller_classic.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller_classic.svg mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/places/ pushd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/places/ ln -s ../apps/start-here.svg . + ln -s ../apps/start-here_classic.svg . popd mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/symbolic/apps install -p -m 644 icons/hicolor/symbolic/apps/org.fedoraproject.AnacondaInstaller-symbolic.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/symbolic/apps/ +install -p -m 644 icons/hicolor/symbolic/apps/org.fedoraproject.AnacondaInstaller-symbolic_classic.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/symbolic/apps/ # Fedora logos for the clearlooks theme (icewm) mkdir -p $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks/taskbar/ @@ -136,11 +175,19 @@ install -p -m 644 icons/clearlooks/taskbar/icewm_taskbar_logos_fedora.tar.gz $RP install -p -m 644 icons/clearlooks/taskbar/linux.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks/taskbar/ install -p -m 644 icons/clearlooks/taskbar/linux_fedora.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks/taskbar/ install -p -m 644 icons/clearlooks/taskbar/linux_fedora_logo.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks/taskbar/ +install -p -m 644 icons/clearlooks/taskbar/icewm_taskbar_logos_fedora_classic.tar.gz $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks/taskbar/ +install -p -m 644 icons/clearlooks/taskbar/linux_classic.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks/taskbar/ +install -p -m 644 icons/clearlooks/taskbar/linux_fedora_classic.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks/taskbar/ +install -p -m 644 icons/clearlooks/taskbar/linux_fedora_logo_classic.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks/taskbar/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks-2px/taskbar/ install -p -m 644 icons/clearlooks/taskbar/icewm_taskbar_logos_fedora.tar.gz $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks-2px/taskbar/ install -p -m 644 icons/clearlooks/taskbar/linux.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks-2px/taskbar/ install -p -m 644 icons/clearlooks/taskbar/linux_fedora.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks-2px/taskbar/ install -p -m 644 icons/clearlooks/taskbar/linux_fedora_logo.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks-2px/taskbar/ +install -p -m 644 icons/clearlooks/taskbar/icewm_taskbar_logos_fedora_classic.tar.gz $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks-2px/taskbar/ +install -p -m 644 icons/clearlooks/taskbar/linux_classic.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks-2px/taskbar/ +install -p -m 644 icons/clearlooks/taskbar/linux_fedora_classic.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks-2px/taskbar/ +install -p -m 644 icons/clearlooks/taskbar/linux_fedora_logo_classic.xpm $RPM_BUILD_ROOT%{_datadir}/icewm/themes/clearlooks-2px/taskbar/ # Fedora art in anaconda # To regenerate the lss file, see anaconda/Makefile @@ -151,10 +198,13 @@ install -p -m 644 anaconda/syslinux-splash.png %{buildroot}%{_datadir}/anaconda/ install -p -m 644 anaconda/syslinux-vesa-splash.png %{buildroot}%{_datadir}/anaconda/boot/splash.png mkdir -p %{buildroot}%{_datadir}/anaconda/pixmaps install -p -m 644 anaconda/anaconda_header.png %{buildroot}%{_datadir}/anaconda/pixmaps/ -install -p -m 644 anaconda/progress_first.png %{buildroot}%{_datadir}/anaconda/pixmaps/ +install -p -m 644 anaconda/anaconda_header_classic.png %{buildroot}%{_datadir}/anaconda/pixmaps/ +# This had not been regenerated since Fedora 17. Clearly not used anymore. +# install -p -m 644 anaconda/progress_first.png %%{buildroot}%%{_datadir}/anaconda/pixmaps/ +# install -p -m 644 anaconda/splash.png %%{buildroot}%%{_datadir}/anaconda/pixmaps/ install -p -m 644 anaconda/sidebar-logo.png %{buildroot}%{_datadir}/anaconda/pixmaps/ +install -p -m 644 anaconda/sidebar-logo_classic.png %{buildroot}%{_datadir}/anaconda/pixmaps/ install -p -m 644 anaconda/sidebar-bg.png %{buildroot}%{_datadir}/anaconda/pixmaps/ -install -p -m 644 anaconda/splash.png %{buildroot}%{_datadir}/anaconda/pixmaps/ install -p -m 644 anaconda/topbar-bg.png %{buildroot}%{_datadir}/anaconda/pixmaps/ # Variant Anaconda art @@ -169,6 +219,7 @@ popd # DO NOT REMOVE THIS ICON!!! We still support the Leonidas and Solar themes! mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/ install -p -m 644 kde-splash/Leonidas-fedora.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png +install -p -m 644 kde-splash/Leonidas-fedora_classic.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo_classic.png %endif # SVG Fedora logos @@ -189,32 +240,53 @@ ln -s fedora-testpage $RPM_BUILD_ROOT%{_datadir}/testpage # save some dup'd icons # Except in /boot. Because some people think it is fun to use VFAT for /boot. # hardlink is /usr/sbin/hardlink on Fedora <= 30 and /usr/bin/hardlink on F31+ -hardlink -v %{buildroot}/usr +hardlink -vv %{buildroot}/usr %files %license COPYING %config(noreplace) %{_sysconfdir}/favicon.png -%{_datadir}/plymouth/themes/charge/ %{_datadir}/plymouth/themes/spinner/ %if ! 0%{?eln} # No one else before us owns this, so we shall. %dir %{_kde4_sharedir}/kde4/ +%exclude %{_kde4_iconsdir}/oxygen/*/places/start-here-kde-fedora_classic.png +%exclude %{_kde4_iconsdir}/oxygen/scalable/apps/org.fedoraproject.AnacondaInstaller_classic.svg %{_kde4_iconsdir}/oxygen/ # DO NOT REMOVE THIS ICON!!! We still support the Leonidas and Solar themes! %{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png %endif +# in -classic +%exclude %{_datadir}/pixmaps/bootloader/fedora_classic.icns +%exclude %{_datadir}/pixmaps/fedora-gdm-logo_classic.png +%exclude %{_datadir}/pixmaps/fedora-logo_classic.png +%exclude %{_datadir}/pixmaps/fedora-logo-small_classic.png +%exclude %{_datadir}/pixmaps/fedora-logo-sprite_classic.png +%exclude %{_datadir}/pixmaps/fedora-logo-sprite_classic.svg +%exclude %{_datadir}/pixmaps/fedora_whitelogo_classic.svg +%exclude %{_datadir}/pixmaps/poweredby_classic.png +%exclude %{_datadir}/pixmaps/system-logo-white_classic.png %{_datadir}/pixmaps/* # This lives in the http subpackage %exclude %{_datadir}/pixmaps/poweredby.png +%exclude %{_datadir}/anaconda/pixmaps/*_classic* +%exclude %{_datadir}/anaconda/pixmaps/*/*_classic* %{_datadir}/anaconda/pixmaps/* %{_datadir}/anaconda/boot/splash.lss %{_datadir}/anaconda/boot/syslinux-splash.png %{_datadir}/anaconda/boot/splash.png +%exclude %{_datadir}/icewm/themes/clearlooks/taskbar/*_classic* +%exclude %{_datadir}/icewm/themes/clearlooks-2px/taskbar/*_classic* %{_datadir}/icewm/themes/clearlooks/taskbar/* %{_datadir}/icewm/themes/clearlooks-2px/taskbar/* +%exclude %{_datadir}/icons/hicolor/*/apps/*_classic* +%exclude %{_datadir}/icons/hicolor/*/places/*_classic* +%exclude %{_datadir}/icons/Bluecurve/*/apps/*_classic* %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/places/* %{_datadir}/icons/Bluecurve/*/apps/* +%exclude %{_datadir}/%{name}/*_classic* +# old logo +%exclude %{_datadir}/%{name}/css3 %{_datadir}/%{name}/ # we multi-own these directories, so as not to require the packages that # provide them, thereby dragging in excess dependencies. @@ -284,7 +356,45 @@ hardlink -v %{buildroot}/usr %{_datadir}/fedora-testpage/index.html %{_datadir}/pixmaps/poweredby.png +# EVERYTHING IN CLASSIC USES OLD LOGO +%files classic +%license COPYING +%if ! 0%{?eln} +%{_kde4_iconsdir}/oxygen/*/places/start-here-kde-fedora_classic.png +%{_kde4_iconsdir}/oxygen/scalable/apps/org.fedoraproject.AnacondaInstaller_classic.svg +%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo_classic.png +%endif +%{_sysconfdir}/favicon_classic.png +%{_datadir}/anaconda/pixmaps/*_classic* +%{_datadir}/anaconda/pixmaps/*/*_classic* +%{_datadir}/icewm/themes/clearlooks/taskbar/*_classic* +%{_datadir}/icewm/themes/clearlooks-2px/taskbar/*_classic* +%{_datadir}/icons/hicolor/*/apps/*_classic* +%{_datadir}/icons/hicolor/*/places/*_classic* +%{_datadir}/icons/Bluecurve/*/apps/*_classic* +%{_datadir}/%{name}/*_classic* +%{_datadir}/%{name}/css3/ +%{_datadir}/pixmaps/bootloader/fedora_classic.icns +%{_datadir}/pixmaps/fedora-gdm-logo_classic.png +%{_datadir}/pixmaps/fedora-logo_classic.png +%{_datadir}/pixmaps/fedora-logo-small_classic.png +%{_datadir}/pixmaps/fedora-logo-sprite_classic.png +%{_datadir}/pixmaps/fedora-logo-sprite_classic.svg +%{_datadir}/pixmaps/fedora_whitelogo_classic.svg +%{_datadir}/pixmaps/poweredby_classic.png +%{_datadir}/pixmaps/system-logo-white_classic.png +%{_datadir}/plymouth/themes/charge/ + + + %changelog +* Fri Mar 26 2021 Tom Callaway - 34.0.1-1 +- pull latest changes for new logo + +* Tue Mar 23 2021 Tom Callaway - 34.0.0-1 +- update to new logo +- make -classic subpackage + * Tue Feb 09 2021 Jan Grulich - 33.0.0-3 - Do not require kde-filesystem on ELN diff --git a/sources b/sources index 8858463..ea693cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fedora-logos-33.0.0.tar.bz2) = aacbd610c3cc6d66bb6d7860bf01171119a96595bc5567abfa3f7e73d9f0c1c0f77ba07d19813627813f23fe4f38c5477cc33011fc16748ca7ce2f47096df26d +SHA512 (fedora-logos-34.0.1.tar.xz) = bb429388ec8c376deed14cb03b50a92f1cf79d69b6784d078910c887eedf00323ef3330f31eb838b5ed5c6ade550c129c9b5c318aacd4d712c4cfb828a30c517