diff --git a/SPECS/centos-logos.spec b/SPECS/centos-logos.spec index ce583e6..046c570 100644 --- a/SPECS/centos-logos.spec +++ b/SPECS/centos-logos.spec @@ -4,8 +4,8 @@ %global debug_package %{nil} Name: centos-logos -Version: 85.3 -Release: 3%{?dist} +Version: 85.4 +Release: 2%{?dist} Summary: CentOS-related icons and pictures Group: System Environment/Base @@ -15,6 +15,7 @@ Source0: centos-logos-%{version}.tar.xz License: Licensed only for approved usage, see COPYING for details. Obsoletes: centos-logos < 80.1-2 +Obsoletes: redhat-logos < 80.1-2 Provides: system-logos = %{version}-%{release} Provides: redhat-logos = %{version}-%{release} @@ -23,7 +24,7 @@ Conflicts: redhat-artwork <= 5.0.5 # For splashtolss.sh %ifarch x86_64 i686 -BuildRequires: syslinux-perl, netpbm-progs +BuildRequires: netpbm-progs %endif Requires(post): coreutils BuildRequires: hardlink @@ -53,9 +54,9 @@ Licensed only for approved usage, see COPYING for details. Summary: CentOS-related desktop backgrounds BuildArch: noarch -Obsoletes: centos-logos < 80.1-2 +Obsoletes: redhat-logos < 80.1-2 Provides: system-backgrounds = %{version}-%{release} -Requires: centos-logos = %{version}-%{release} +Requires: redhat-logos = %{version}-%{release} %description -n centos-backgrounds Licensed only for approved usage, see COPYING for details. @@ -68,9 +69,7 @@ Licensed only for approved usage, see COPYING for details. %install mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -for i in backgrounds/*.jpg backgrounds/*.xml; do - install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -done +cp -r backgrounds/c8 $RPM_BUILD_ROOT%{_datadir}/backgrounds/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas install -p -m 644 backgrounds/10_org.gnome.desktop.background.default.gschema.override $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas @@ -101,7 +100,6 @@ for size in 16x16 22x22 24x24 32x32 36x36 48x48 96x96 256x256 ; do done done - mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} pushd $RPM_BUILD_ROOT%{_sysconfdir} ln -s %{_datadir}/icons/hicolor/16x16/apps/fedora-logo-icon.png favicon.png @@ -118,19 +116,17 @@ popd (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install) -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} -cp -a fedora/*.svg $RPM_BUILD_ROOT%{_datadir}/%{name} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/redhat-logos +cp -a fedora/*.svg $RPM_BUILD_ROOT%{_datadir}/redhat-logos mkdir -p $RPM_BUILD_ROOT%{_datadir}/ipa/ui/images cp -a ipa/*.png $RPM_BUILD_ROOT%{_datadir}/ipa/ui/images cp -a ipa/*.jpg $RPM_BUILD_ROOT%{_datadir}/ipa/ui/images -mkdir -p $RPM_BUILD_ROOT%{_datadir}/testpage -install -p -m 644 testpage/index.html $RPM_BUILD_ROOT%{_datadir}/testpage - mkdir -p $RPM_BUILD_ROOT%{_datadir}/testpage/ cp -a testpage/index.html $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. /usr/sbin/hardlink -v %{buildroot}/usr @@ -167,7 +163,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/anaconda/boot/syslinux-splash.png %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/places/* -%{_datadir}/%{name}/ +%{_datadir}/redhat-logos/ # we multi-own these directories, so as not to require the packages that # provide them, thereby dragging in excess dependencies. @@ -202,9 +198,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files httpd %license COPYING +%{_datadir}/pixmaps/poweredby.png %{_datadir}/testpage %{_datadir}/testpage/index.html -%{_datadir}/pixmaps/poweredby.png %files ipa %license COPYING @@ -222,56 +218,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog -* Sat May 1 2021 Alain Reguera Delgado - 85.2-1 -- Update installer artwork to improve fading on background -- Remove left/right empty spaces in logo to improve visiblity -- Apply pngquant to png images to reduce size - -* Thu Mar 4 2021 Alain Reguera Delgado - 85.1-2 -- Add CentOS logos and backgrounds - -* Tue Feb 16 2021 Vendula Poncova - 85.1-1 -- Add a custom installer stylesheet for RHEL - Resolves: #1928711 - -* Fri Jan 29 2021 Ray Strode - 84.1-1 -- Add a few more rotated backgrounds - Resolves: #1854287 - -* Thu Jan 28 2021 Ray Strode - 84.0-1 -- Improve appearance of backgrounds on rotated tablets - Resolves: #1854287 - -* Tue Nov 10 2020 Lubos Uhliarik - 82.2-1 -- Add web server test page index.html to redhat-logos - Resolves: #1896319 - -* Fri Aug 16 2019 Ray Strode - 81.1-1 -- Add missing metadata in 8 abstract light wallpapers - Related: #1720610 - -* Mon Aug 12 2019 Ray Strode - 81.0-1 -- Add wallpapers for wider screen monitors - Related: #1720610 -- Move logo to corner in wallpapers that have it in center - Resolves: #1706793 - -* Mon Jun 17 2019 Ray Strode - 80.8-1 -- Fix black spot in one of the backgrounds - Resolves: #1684106 -- Add missing 2560x1600 8-abstract-light background - Resolves: #1692309 -- letter box instead of crop backgrounds when there's no - good aspect ratio - Related: #1720610 - -* Wed Jan 30 2019 Ray Strode - 80.7-1 -- Put in place new logos and wallpapers - Resolves: #1637686 - -* Mon Jan 14 2019 Ray Strode - 80.6-1 -- Update anaconda sidebar and top bar - Resolves: #1638383 +* Mon May 24 2021 Johnny Hughes - 85.4-1 +- update index.html for newer httpd and nginx + +* Mon Jan 25 2021 bstinson@centosproject.org - 82.0-2 +- Add a bare testpage required by newer versions of nginx + +* Sat Jul 27 2019 Alain Reguera Delgado - 80.5-2 +- Add CentOS brands +- Add CentOS backgrounds based on artistic motif sketch 4 +- Support rolling notes localization in CentOS installer * Mon Oct 15 2018 Ray Strode - 80.5-1 - Another wallpaper content update