commit branding-openSUSE for openSUSE:12.2

2012-08-04 Thread h_root
Hello community,

here is the log from the commit of package branding-openSUSE for openSUSE:12.2 
checked in at 2012-08-04 21:40:00

Comparing /work/SRC/openSUSE:12.2/branding-openSUSE (Old)
 and  /work/SRC/openSUSE:12.2/.branding-openSUSE.new (New)


Package is branding-openSUSE, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:12.2/branding-openSUSE/branding-openSUSE.changes 
2012-07-30 20:13:58.0 +0200
+++ /work/SRC/openSUSE:12.2/.branding-openSUSE.new/branding-openSUSE.changes
2012-08-05 00:24:27.0 +0200
@@ -1,0 +2,5 @@
+Sat Aug  4 07:25:56 UTC 2012 - dmi...@roshchin.org
+
+- Add new welcome text for install splash
+
+---



Other differences:
--
++ openSUSE.tar.gz ++
/work/SRC/openSUSE:12.2/branding-openSUSE/openSUSE.tar.gz 
/work/SRC/openSUSE:12.2/.branding-openSUSE.new/openSUSE.tar.gz differ: char 5, 
line 1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit branding-openSUSE for openSUSE:12.2

2012-07-30 Thread h_root
Hello community,

here is the log from the commit of package branding-openSUSE for openSUSE:12.2 
checked in at 2012-07-30 20:11:57

Comparing /work/SRC/openSUSE:12.2/branding-openSUSE (Old)
 and  /work/SRC/openSUSE:12.2/.branding-openSUSE.new (New)


Package is branding-openSUSE, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:12.2/branding-openSUSE/branding-openSUSE.changes 
2012-07-18 17:12:28.0 +0200
+++ /work/SRC/openSUSE:12.2/.branding-openSUSE.new/branding-openSUSE.changes
2012-07-30 20:13:58.0 +0200
@@ -1,0 +2,11 @@
+Fri Jul 27 09:36:42 UTC 2012 - tittiatc...@gmail.com
+
+- Update to the grub2 theme to include also the theming for 
+  the terminal windows (bnc#770107)
+
+---
+Thu Jul 26 13:54:58 UTC 2012 - tittiatc...@gmail.com
+
+- Add the openSUSE branding for the Plymouth bootsplash
+
+---



Other differences:
--
++ branding-openSUSE.spec ++
--- /var/tmp/diff_new_pack.4Ra39w/_old  2012-07-30 20:15:15.0 +0200
+++ /var/tmp/diff_new_pack.4Ra39w/_new  2012-07-30 20:15:15.0 +0200
@@ -248,6 +248,21 @@
 
 %endif
 
+%package -n plymouth-branding-openSUSE
+Summary:openSUSE branding for Plymouth bootsplash
+License:GPL-2.0+
+Group:  System/Fhs
+Requires:   plymouth-plugin-label
+Requires:   plymouth-plugin-script
+Requires(post): plymouth-scripts
+Supplements:packageand(plymouth:branding-openSUSE)
+Provides:   plymouth-branding = %{version}
+Conflicts:  otherproviders(plymouth-branding)
+BuildArch:  noarch
+
+%description -n plymouth-branding-openSUSE
+openSUSE %{version} branding for the plymouth bootsplash
+
 %prep
 %setup -q -c
 cp -a openSUSE/LICENSE COPYING 
@@ -371,6 +386,22 @@
 fi
 %endif
 
+%post -n plymouth-branding-openSUSE
+if [ ! -e /.buildenv ]; then
+   export LIB=%{_libdir}
+   if [ $(%{_sbindir}/plymouth-set-default-theme) == text -o 
$(%{_sbindir}/plymouth-set-default-theme) == openSUSE -o 
$(%{_sbindir}/plymouth-set-default-theme) == basedonopensuse ]; then
+  %{_sbindir}/plymouth-set-default-theme -R openSUSE
+   fi
+fi
+
+%postun -n plymouth-branding-openSUSE
+if [ $1 -eq 0 ]; then
+export LIB=%{_libdir}
+if [ $(%{_sbindir}/plymouth-set-default-theme) == openSUSE ]; then
+%{_sbindir}/plymouth-set-default-theme -R --reset
+fi
+fi
+
 %files
 %defattr(-,root,root)
 %doc COPYING
@@ -477,4 +508,8 @@
 %ghost /boot/grub2
 %endif
 
+%files -n plymouth-branding-openSUSE
+%defattr(-, root, root)
+%{_datadir}/plymouth/themes/openSUSE/
+
 %changelog

++ openSUSE.tar.gz ++
/work/SRC/openSUSE:12.2/branding-openSUSE/openSUSE.tar.gz 
/work/SRC/openSUSE:12.2/.branding-openSUSE.new/openSUSE.tar.gz differ: char 5, 
line 1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit branding-openSUSE for openSUSE:12.2

2012-07-18 Thread h_root
Hello community,

here is the log from the commit of package branding-openSUSE for openSUSE:12.2 
checked in at 2012-07-18 17:12:28

Comparing /work/SRC/openSUSE:12.2/branding-openSUSE (Old)
 and  /work/SRC/openSUSE:12.2/.branding-openSUSE.new (New)


Package is branding-openSUSE, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:12.2/branding-openSUSE/branding-openSUSE.changes 
2012-07-09 07:54:58.0 +0200
+++ /work/SRC/openSUSE:12.2/.branding-openSUSE.new/branding-openSUSE.changes
2012-07-18 17:12:28.0 +0200
@@ -1,0 +2,10 @@
+Mon Jul 16 14:52:20 CEST 2012 - snw...@suse.de
+
+- remove /boot/grub2/backgrounds
+
+---
+Thu Jul 12 08:50:56 UTC 2012 - co...@suse.com
+
+- let grub2-branding supplement grub2
+
+---



Other differences:
--
++ branding-openSUSE.spec ++
--- /var/tmp/diff_new_pack.TmPbMG/_old  2012-07-18 17:12:30.0 +0200
+++ /var/tmp/diff_new_pack.TmPbMG/_new  2012-07-18 17:12:30.0 +0200
@@ -239,6 +239,8 @@
 Group:  System/Fhs
 Requires:   grub2
 Provides:   grub2-branding = %{version}
+Supplements:packageand(grub2:branding-openSUSE)
+Conflicts:  otherproviders(grub2-branding)
 BuildArch:  noarch
 
 %description -n grub2-branding-openSUSE

++ openSUSE.tar.gz ++
/work/SRC/openSUSE:12.2/branding-openSUSE/openSUSE.tar.gz 
/work/SRC/openSUSE:12.2/.branding-openSUSE.new/openSUSE.tar.gz differ: char 5, 
line 1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit branding-openSUSE for openSUSE:12.2

2012-07-08 Thread h_root
Hello community,

here is the log from the commit of package branding-openSUSE for openSUSE:12.2 
checked in at 2012-07-09 07:54:57

Comparing /work/SRC/openSUSE:12.2/branding-openSUSE (Old)
 and  /work/SRC/openSUSE:12.2/.branding-openSUSE.new (New)


Package is branding-openSUSE, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:12.2/branding-openSUSE/branding-openSUSE.changes 
2012-06-26 15:15:40.0 +0200
+++ /work/SRC/openSUSE:12.2/.branding-openSUSE.new/branding-openSUSE.changes
2012-07-09 07:54:58.0 +0200
@@ -1,0 +2,10 @@
+Wed Jul  4 08:35:25 UTC 2012 - mch...@suse.com
+
+- Fix grub2 config not update on UEFI system. (bnc#770031)
+
+---
+Thu Jun 28 09:05:41 UTC 2012 - dmuel...@suse.com
+
+- make grub2 branding optional (for arm)
+
+---



Other differences:
--
++ branding-openSUSE.spec ++
--- /var/tmp/diff_new_pack.WFOhSw/_old  2012-07-09 07:54:59.0 +0200
+++ /var/tmp/diff_new_pack.WFOhSw/_new  2012-07-09 07:54:59.0 +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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit branding-openSUSE for openSUSE:12.2

2012-06-26 Thread h_root
Hello community,

here is the log from the commit of package branding-openSUSE for openSUSE:12.2 
checked in at 2012-06-26 15:15:37

Comparing /work/SRC/openSUSE:12.2/branding-openSUSE (Old)
 and  /work/SRC/openSUSE:12.2/.branding-openSUSE.new (New)


Package is branding-openSUSE, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:12.2/branding-openSUSE/branding-openSUSE.changes 
2012-06-25 15:16:05.0 +0200
+++ /work/SRC/openSUSE:12.2/.branding-openSUSE.new/branding-openSUSE.changes
2012-06-26 15:15:40.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun 22 16:10:52 CEST 2012 - snw...@suse.de
+
+- reworked grub2 branding packages and named them grub2-branding-XXX
+  (changes are in git tree)
+
+---

Old:

  grub2-gfxconsole.patch



Other differences:
--
++ branding-openSUSE.spec ++
--- /var/tmp/diff_new_pack.dAvOo5/_old  2012-06-26 15:15:41.0 +0200
+++ /var/tmp/diff_new_pack.dAvOo5/_new  2012-06-26 15:15:41.0 +0200
@@ -45,6 +45,8 @@
 This package contains the file /etc/SuSE-brand, and its name is used as
 a trigger for installation of correct vendor brand packages.
 
+%define theme_name openSUSE
+
 %if 0%{?package_gfxboot}  0
 
 %package-n gfxboot-branding-openSUSE
@@ -225,14 +227,16 @@
 This package contains the openSUSE splash screen for the
 The GNU Image Manipulation Program (GIMP) package
 
-%package -n grub2-gfxconsole-branding-openSUSE
+%package -n grub2-branding-openSUSE
 Summary:openSUSE branding for GRUB2's graphical console
 License:CC-BY-SA-3.0
 Group:  System/Fhs
-Provides:   grub2-gfxconsole-branding = %{version}
+BuildRequires:  grub2
+Requires:   grub2
+Provides:   grub2-branding = %{version}
 BuildArch:  noarch
 
-%description -n grub2-gfxconsole-branding-openSUSE
+%description -n grub2-branding-openSUSE
 openSUSE %{version} branding for the GRUB2's graphical console
 
 %prep
@@ -338,6 +342,15 @@
 %post -n kdm-branding-openSUSE
 %{fillup_only -n displaymanager -s kdm}
 
+%post -n grub2-branding-openSUSE
+%{_datadir}/grub2/themes/%theme_name/activate-theme
+/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg
+
+%postun -n grub2-branding-openSUSE
+if [ $1 = 0 ] ; then
+  rm -rf /boot/grub2/themes/%theme_name
+fi
+
 %files
 %defattr(-,root,root)
 %doc COPYING
@@ -437,9 +450,9 @@
 %doc COPYING
 %{_datadir}/gimp/2.0/images
 
-%files -n grub2-gfxconsole-branding-openSUSE
+%files -n grub2-branding-openSUSE
 %defattr(-,root,root)
-%dir /boot/grub2
-/boot/grub2/backgrounds
+%{_datadir}/grub2
+%ghost /boot/grub2
 
 %changelog

++ openSUSE.tar.gz ++
/work/SRC/openSUSE:12.2/branding-openSUSE/openSUSE.tar.gz 
/work/SRC/openSUSE:12.2/.branding-openSUSE.new/openSUSE.tar.gz differ: char 5, 
line 1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org