From 2466c7759448cf7d82ac52e04f491375b34997fc Mon Sep 17 00:00:00 2001 From: Carl George Date: May 26 2021 19:00:25 +0000 Subject: Update to 85.5 --- diff --git a/.centos-logos.metadata b/.centos-logos.metadata index b3ba5a8..5c2b6a5 100644 --- a/.centos-logos.metadata +++ b/.centos-logos.metadata @@ -1 +1 @@ -95c7af87eb04ddcd9aa05b019bb5e452ffdac654 SOURCES/centos-logos-85.4.tar.xz +e4fbc0f0f19e7883c8dd9c717759f2b7b091ff8d SOURCES/centos-logos-85.4.tar.xz diff --git a/SPECS/centos-logos.spec b/SPECS/centos-logos.spec index 046c570..ce2f74f 100644 --- a/SPECS/centos-logos.spec +++ b/SPECS/centos-logos.spec @@ -4,18 +4,16 @@ %global debug_package %{nil} Name: centos-logos -Version: 85.4 -Release: 2%{?dist} +Version: 85.5 +Release: 1%{?dist} Summary: CentOS-related icons and pictures Group: System Environment/Base -URL: http://www.centos.org -# No upstream, done in internal git -Source0: centos-logos-%{version}.tar.xz +URL: https://github.com/CentOS/centos-logos +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz 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} @@ -54,9 +52,9 @@ Licensed only for approved usage, see COPYING for details. Summary: CentOS-related desktop backgrounds BuildArch: noarch -Obsoletes: redhat-logos < 80.1-2 +Obsoletes: centos-logos < 80.1-2 Provides: system-backgrounds = %{version}-%{release} -Requires: redhat-logos = %{version}-%{release} +Requires: centos-logos = %{version}-%{release} %description -n centos-backgrounds Licensed only for approved usage, see COPYING for details. @@ -123,13 +121,12 @@ 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/ -cp -a testpage/index.html $RPM_BUILD_ROOT%{_datadir}/testpage/ - +mkdir -p $RPM_BUILD_ROOT%{_datadir}/testpage +install -p -m 644 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 +hardlink -v %{buildroot}/usr %ifnarch x86_64 i686 rm -f $RPM_BUILD_ROOT%{_datadir}/anaconda/boot/splash.lss @@ -218,6 +215,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue May 25 2021 Carl George - 85.5-1 +- Use upstream centos-logos repo for source + * Mon May 24 2021 Johnny Hughes - 85.4-1 - update index.html for newer httpd and nginx