Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at 2012-07-09 07:54:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "branding-openSUSE", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes 2012-06-26 15:15:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.branding-openSUSE.new/branding-openSUSE.changes 2012-07-09 07:54:52.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jul 4 08:35:25 UTC 2012 - [email protected] + +- Fix grub2 config not update on UEFI system. (bnc#770031) + +------------------------------------------------------------------- +Thu Jun 28 09:05:41 UTC 2012 - [email protected] + +- make grub2 branding optional (for arm) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.H3Y5Hn/_old 2012-07-09 07:54:54.000000000 +0200 +++ /var/tmp/diff_new_pack.H3Y5Hn/_new 2012-07-09 07:54:54.000000000 +0200 @@ -31,6 +31,10 @@ %define package_gfxboot 1 BuildRequires: gfxboot-devel %endif +%ifarch %{ix86} x86_64 ppc ppc64 +%define package_grub2_theme 1 +BuildRequires: grub2 +%endif Summary: SuSE Brand File License: BSD-3-Clause Group: System/Fhs @@ -227,11 +231,12 @@ This package contains the openSUSE splash screen for the The GNU Image Manipulation Program (GIMP) package +%if 0%{?package_grub2_theme} > 0 + %package -n grub2-branding-openSUSE Summary: openSUSE branding for GRUB2's graphical console License: CC-BY-SA-3.0 Group: System/Fhs -BuildRequires: grub2 Requires: grub2 Provides: grub2-branding = %{version} BuildArch: noarch @@ -239,6 +244,8 @@ %description -n grub2-branding-openSUSE openSUSE %{version} branding for the GRUB2's graphical console +%endif + %prep %setup -q -c cp -a openSUSE/LICENSE COPYING @@ -305,6 +312,11 @@ # try how far we get without them rm -v %{buildroot}/usr/share/wallpapers/openSUSE*desktop %{buildroot}/usr/share/wallpapers/openSUSE*jpg %{buildroot}/usr/share/wallpapers/default* +# remove +%if 0%{?package_grub2_theme} < 1 +rm -rf %{buildroot}/%{_datadir}/grub2 +%endif + %check make -C openSUSE check DESTDIR=%{buildroot} @@ -342,14 +354,20 @@ %post -n kdm-branding-openSUSE %{fillup_only -n displaymanager -s kdm} +%if 0%{?package_grub2_theme} > 0 %post -n grub2-branding-openSUSE %{_datadir}/grub2/themes/%theme_name/activate-theme -/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg +if test -e /boot/grub2/grub.cfg ; then + /usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg || true +elif test -e /boot/grub2-efi/grub.cfg ; then + /usr/sbin/grub2-efi-mkconfig -o /boot/grub2-efi/grub.cfg || true +fi %postun -n grub2-branding-openSUSE if [ $1 = 0 ] ; then rm -rf /boot/grub2/themes/%theme_name fi +%endif %files %defattr(-,root,root) @@ -450,9 +468,11 @@ %doc COPYING %{_datadir}/gimp/2.0/images +%if 0%{?package_grub2_theme} > 0 %files -n grub2-branding-openSUSE %defattr(-,root,root) %{_datadir}/grub2 %ghost /boot/grub2 +%endif %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
