From a0d31997f3cdaed9cce414188b7012e484371c7729cf92d518f4efc2b6f2384e Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 13 Oct 2011 06:25:56 +0000 Subject: [PATCH 1/2] - don't set init boot option (bnc #723678) OBS-URL: https://build.opensuse.org/package/show/system:install:head/gfxboot?expand=0&rev=82 --- KDE.tar.bz2 | 4 ++-- SLED.tar.bz2 | 4 ++-- SLES.tar.bz2 | 4 ++-- examples.tar.bz2 | 4 ++-- gfxboot-4.4.5.tar.bz2 | 3 --- gfxboot-4.4.6.tar.bz2 | 3 +++ gfxboot.changes | 5 +++++ gfxboot.spec | 8 ++++---- openSUSE.tar.bz2 | 4 ++-- upstream.tar.bz2 | 4 ++-- 10 files changed, 24 insertions(+), 19 deletions(-) delete mode 100644 gfxboot-4.4.5.tar.bz2 create mode 100644 gfxboot-4.4.6.tar.bz2 diff --git a/KDE.tar.bz2 b/KDE.tar.bz2 index 3eb13c3..9fcd0e2 100644 --- a/KDE.tar.bz2 +++ b/KDE.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31ad6a89e75f2deb781b4d47ccdc875cc3bcf5fa8a94468dc864469a1f0e1806 -size 83182 +oid sha256:9cb812bb01660ea31e2e034ef40ced33f09a42fef27d20d658088aff83999f0e +size 83158 diff --git a/SLED.tar.bz2 b/SLED.tar.bz2 index 2e8f3a7..3010623 100644 --- a/SLED.tar.bz2 +++ b/SLED.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bd45eae37e4b0c8ead1980a05d86ce25788e51cf3e98bd84bd4639bcd8999a9 -size 130752 +oid sha256:98051e887c6c2c06790713cdda050b56cbf18cc886b5b1df9014dee8743c71f1 +size 130717 diff --git a/SLES.tar.bz2 b/SLES.tar.bz2 index 2c282c2..42ea0a1 100644 --- a/SLES.tar.bz2 +++ b/SLES.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89c45b68c30b52a62e901b494bda271179ef846ef0edf7562dfc232b4ab1c865 -size 130392 +oid sha256:81c9e29e930c899c0986be344d7b0e15e9d6f076b44a5b31da0c02f01ed97327 +size 130388 diff --git a/examples.tar.bz2 b/examples.tar.bz2 index 82fec77..121e51b 100644 --- a/examples.tar.bz2 +++ b/examples.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3f2e9c389807f81f3e3e69c1d91a12a6fb84e4ea901a8d92a926adaef3556b3 -size 184652 +oid sha256:2c0b0de13dcba10455c00a8736eacaac6232e7d9a5bbf6ec16a68bf57aa91e06 +size 184619 diff --git a/gfxboot-4.4.5.tar.bz2 b/gfxboot-4.4.5.tar.bz2 deleted file mode 100644 index 9ee9d92..0000000 --- a/gfxboot-4.4.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91b3b332954fb8b9126ef206f304c45d20e1c064534556cf04d7f873ac1ae709 -size 163990 diff --git a/gfxboot-4.4.6.tar.bz2 b/gfxboot-4.4.6.tar.bz2 new file mode 100644 index 0000000..fe94788 --- /dev/null +++ b/gfxboot-4.4.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8986ebd7a937da27d4fd383ac39fc2c644a968de54cc247175fcbe7cdc585c7c +size 164154 diff --git a/gfxboot.changes b/gfxboot.changes index a151c78..cdf48b4 100644 --- a/gfxboot.changes +++ b/gfxboot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 13 08:23:18 CEST 2011 - snwint@suse.de + +- don't set init boot option (bnc #723678) + ------------------------------------------------------------------- Wed Sep 21 14:01:32 UTC 2011 - coolo@suse.com diff --git a/gfxboot.spec b/gfxboot.spec index d7eac25..f39984b 100644 --- a/gfxboot.spec +++ b/gfxboot.spec @@ -18,19 +18,19 @@ Name: gfxboot -Version: 4.4.5 +Version: 4.4.6 Release: 1 License: GPLv2+ Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX Url: http://en.opensuse.org/SDB:Gfxboot Group: System/Boot -Source: %{name}-%{version}.tar.bz2 -Source6: examples.tar.bz2 +Source: gfxboot-4.4.6.tar.bz2 Source1: KDE.tar.bz2 Source2: openSUSE.tar.bz2 Source3: SLED.tar.bz2 Source4: SLES.tar.bz2 Source5: upstream.tar.bz2 +Source6: examples.tar.bz2 BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: fribidi @@ -118,7 +118,7 @@ Conflicts: otherproviders(%{name}-branding) KDE theme for gfxboot (bootloader graphics). %prep -%setup -q +%setup %setup -T -D -a 1 %setup -T -D -a 2 %setup -T -D -a 3 diff --git a/openSUSE.tar.bz2 b/openSUSE.tar.bz2 index 046d228..558683b 100644 --- a/openSUSE.tar.bz2 +++ b/openSUSE.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dea56dfbf6edacedb7e6729342b55c3631a54a010f0343850eb751966f891568 -size 5257685 +oid sha256:321d988eeeeb8837fd6d5a2b0d935531fee565741a42b82d7154ed592e80a8a5 +size 5257074 diff --git a/upstream.tar.bz2 b/upstream.tar.bz2 index c59f627..07b2745 100644 --- a/upstream.tar.bz2 +++ b/upstream.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6082671f127ce878c3c1c0c2a0229a45fb57658cfe94ad1433af61128773ea13 -size 49794 +oid sha256:527e8a6b887f8fe5dfb9e4be4734d7c5f2f627f1f24adf7ac6ca476c917c6e73 +size 49772 From ab2bef6ef7a9559a92be469a26ce84d3f07a6de9c826882c0088b33d491dc7d5 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 13 Oct 2011 07:28:43 +0000 Subject: [PATCH 2/2] - version 4.4.7 OBS-URL: https://build.opensuse.org/package/show/system:install:head/gfxboot?expand=0&rev=83 --- KDE.tar.bz2 | 4 ++-- SLED.tar.bz2 | 4 ++-- SLES.tar.bz2 | 4 ++-- gfxboot-4.4.6.tar.bz2 | 3 --- gfxboot-4.4.7.tar.bz2 | 3 +++ gfxboot.changes | 5 +++++ gfxboot.spec | 4 ++-- openSUSE.tar.bz2 | 4 ++-- upstream.tar.bz2 | 4 ++-- 9 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 gfxboot-4.4.6.tar.bz2 create mode 100644 gfxboot-4.4.7.tar.bz2 diff --git a/KDE.tar.bz2 b/KDE.tar.bz2 index 9fcd0e2..91f916d 100644 --- a/KDE.tar.bz2 +++ b/KDE.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cb812bb01660ea31e2e034ef40ced33f09a42fef27d20d658088aff83999f0e -size 83158 +oid sha256:303e685d8066fcd1141cd3557ec4e866cd024d998bbf7b93fac16a7668f1575a +size 83150 diff --git a/SLED.tar.bz2 b/SLED.tar.bz2 index 3010623..2266368 100644 --- a/SLED.tar.bz2 +++ b/SLED.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98051e887c6c2c06790713cdda050b56cbf18cc886b5b1df9014dee8743c71f1 -size 130717 +oid sha256:30714eb6de93360312a0ad908f8ca4ff485e33ebfe56e5811f04a4431063feae +size 130734 diff --git a/SLES.tar.bz2 b/SLES.tar.bz2 index 42ea0a1..1fc8eae 100644 --- a/SLES.tar.bz2 +++ b/SLES.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81c9e29e930c899c0986be344d7b0e15e9d6f076b44a5b31da0c02f01ed97327 -size 130388 +oid sha256:e1b6bdee0e05fbf9a9b5a1c9659afe11f939d1dbfc1921de9200021c7410a980 +size 130370 diff --git a/gfxboot-4.4.6.tar.bz2 b/gfxboot-4.4.6.tar.bz2 deleted file mode 100644 index fe94788..0000000 --- a/gfxboot-4.4.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8986ebd7a937da27d4fd383ac39fc2c644a968de54cc247175fcbe7cdc585c7c -size 164154 diff --git a/gfxboot-4.4.7.tar.bz2 b/gfxboot-4.4.7.tar.bz2 new file mode 100644 index 0000000..dfb00c8 --- /dev/null +++ b/gfxboot-4.4.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7a21c61895f50642167b2e989a988e2505cacd5870f31b11b4e27c222392c50 +size 164148 diff --git a/gfxboot.changes b/gfxboot.changes index cdf48b4..e9f21ea 100644 --- a/gfxboot.changes +++ b/gfxboot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 13 09:28:31 CEST 2011 - snwint@suse.de + +- fix isohybrid detection + ------------------------------------------------------------------- Thu Oct 13 08:23:18 CEST 2011 - snwint@suse.de diff --git a/gfxboot.spec b/gfxboot.spec index f39984b..58e6d4c 100644 --- a/gfxboot.spec +++ b/gfxboot.spec @@ -18,13 +18,13 @@ Name: gfxboot -Version: 4.4.6 +Version: 4.4.7 Release: 1 License: GPLv2+ Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX Url: http://en.opensuse.org/SDB:Gfxboot Group: System/Boot -Source: gfxboot-4.4.6.tar.bz2 +Source: gfxboot-4.4.7.tar.bz2 Source1: KDE.tar.bz2 Source2: openSUSE.tar.bz2 Source3: SLED.tar.bz2 diff --git a/openSUSE.tar.bz2 b/openSUSE.tar.bz2 index 558683b..65b6317 100644 --- a/openSUSE.tar.bz2 +++ b/openSUSE.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:321d988eeeeb8837fd6d5a2b0d935531fee565741a42b82d7154ed592e80a8a5 -size 5257074 +oid sha256:e15b9eeb3576163b6fee69710fa69cb1d7aec650d105c0a5f7ce7a6a3ae8295b +size 5257205 diff --git a/upstream.tar.bz2 b/upstream.tar.bz2 index 07b2745..281c456 100644 --- a/upstream.tar.bz2 +++ b/upstream.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:527e8a6b887f8fe5dfb9e4be4734d7c5f2f627f1f24adf7ac6ca476c917c6e73 -size 49772 +oid sha256:a9abaa8dc621b8adb7a5521e39b7bd878ce9a69115fe92693fa93e05ac183f65 +size 49774