diff --git a/fedora-logos.spec b/fedora-logos.spec index 890d344..8a223a2 100644 --- a/fedora-logos.spec +++ b/fedora-logos.spec @@ -1,9 +1,9 @@ -%global codename beefy_miracle +%global codename sphericalcow Name: fedora-logos Summary: Fedora-related icons and pictures -Version: 17.0.2 -Release: 6%{?dist} +Version: 17.0.3 +Release: 1%{?dist} Group: System Environment/Base URL: http://git.fedorahosted.org/git/fedora-logos.git/ Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2 @@ -50,12 +50,16 @@ make bootloader/fedora.icns %install # should be ifarch i386 -# mkdir -p $RPM_BUILD_ROOT/boot/grub -# install -p -m 644 -D bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz +%if 0%{?fedora} <= 17 +mkdir -p $RPM_BUILD_ROOT/boot/grub +install -p -m 644 -D bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz +%endif mkdir -p $RPM_BUILD_ROOT/boot/grub2/themes/system/ install -p -m 644 bootloader/background.png $RPM_BUILD_ROOT/boot/grub2/themes/system/background.png pushd $RPM_BUILD_ROOT/boot/grub2/themes/system/ -ln -s background.png fireworks.png +# We have to do a cp here instead of an ls because some envs require that +# /boot is VFAT, which doesn't support symlinks. +cp -a background.png fireworks.png popd # end i386 bits @@ -140,6 +144,8 @@ popd mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a fedora/*.svg $RPM_BUILD_ROOT%{_datadir}/%{name} +cp -a css3 $RPM_BUILD_ROOT%{_datadir}/%{name}/ + # save some dup'd icons /usr/sbin/hardlink -v %{buildroot}/ @@ -258,12 +264,19 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || : # %dir %{_kde4_appsdir}/ksplash/Themes/Leonidas/ # %dir %{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536 # should be ifarch i386 -# /boot/grub/splash.xpm.gz +%if 0%{?fedora} <= 17 +/boot/grub/splash.xpm.gz +%endif /boot/grub2/themes/system/background.png /boot/grub2/themes/system/fireworks.png # end i386 bits %changelog +* Fri Sep 21 2012 Tom Callaway - 17.0.3-1 +- update to 17.0.3 (adds css3 bits) +- make fireworks.png an actual file instead of a symlink (bz853494) +- conditionalize grub1 art so it is packaged for f17 and older + * Tue Sep 4 2012 Tom Callaway - 17.0.2-6 - drop grub1 art (nothing uses it anymore) @@ -271,7 +284,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || : - add fireworks.png symlink * Thu Aug 2 2012 Tom Callaway - 17.0.2-4 -- codename update for f17 +- codename update for f18 - drop unused kde dir ownerships * Thu Jul 19 2012 Fedora Release Engineering - 17.0.2-3 diff --git a/sources b/sources index 3a4ba14..374b183 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -472d190671d036ec421ac8a3173f31e7 fedora-logos-17.0.2.tar.bz2 +dc43ab61d5bffebee771f9f0a4ccba10 fedora-logos-17.0.3.tar.bz2