From d48ea4f4e27ae9b226c050c7b82b57acd4bfc8ed4f61a516b943420143b289e4 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Mon, 2 Nov 2009 15:39:07 +0000 Subject: [PATCH 1/5] Accepting request 23605 from home:michal-m:branches:Base:System Copy from home:michal-m:branches:Base:System/mdadm via accept of submit request 23605 revision 2. Request was accepted with message: . OBS-URL: https://build.opensuse.org/request/show/23605 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=6 --- mdadm.changes | 5 +++++ mkinitrd-boot.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mdadm.changes b/mdadm.changes index 6de6c6a..d8cf938 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 30 16:49:40 CET 2009 - mmarek@suse.cz + +- mkinitrd-boot.sh: add /sbin/mdmon to the initrd (fate#306823). + ------------------------------------------------------------------- Thu Oct 1 10:51:38 CEST 2009 - mmarek@suse.cz diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh index ca68fdc..0e216d4 100644 --- a/mkinitrd-boot.sh +++ b/mkinitrd-boot.sh @@ -1,6 +1,6 @@ #!/bin/bash #%stage: softraid -#%programs: /sbin/mdadm +#%programs: /sbin/mdadm /sbin/mdmon #%modules: raid0 raid1 raid456 #%if: -n "$need_mdadm" # From 89700d3b9461225286e87b3833a81d09c2875572f5f3179baa6db9a12e06863b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 2 Nov 2009 17:10:09 +0000 Subject: [PATCH 2/5] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=7 --- mdadm.changes | 5 ----- mkinitrd-boot.sh | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/mdadm.changes b/mdadm.changes index d8cf938..6de6c6a 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 30 16:49:40 CET 2009 - mmarek@suse.cz - -- mkinitrd-boot.sh: add /sbin/mdmon to the initrd (fate#306823). - ------------------------------------------------------------------- Thu Oct 1 10:51:38 CEST 2009 - mmarek@suse.cz diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh index 0e216d4..ca68fdc 100644 --- a/mkinitrd-boot.sh +++ b/mkinitrd-boot.sh @@ -1,6 +1,6 @@ #!/bin/bash #%stage: softraid -#%programs: /sbin/mdadm /sbin/mdmon +#%programs: /sbin/mdadm #%modules: raid0 raid1 raid456 #%if: -n "$need_mdadm" # From 4a4d38e89abd82bf90b2bdf01e4c176a62b55b00dbc7b66079a3a54b33c85507 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Wed, 16 Dec 2009 08:01:21 +0000 Subject: [PATCH 3/5] Accepting request 26694 from home:jengelh:branches:Base:System Copy from home:jengelh:branches:Base:System/mdadm via accept of submit request 26694 revision 2. Request was accepted with message: reviewed ok. OBS-URL: https://build.opensuse.org/request/show/26694 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=8 --- mdadm.changes | 10 ++++++++++ mdadm.spec | 4 ++-- mkinitrd-boot.sh | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/mdadm.changes b/mdadm.changes index 6de6c6a..950cbb8 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Dec 15 20:26:46 CET 2009 - jengelh@medozas.de + +- enable parallel building + +------------------------------------------------------------------- +Fri Oct 30 16:49:40 CET 2009 - mmarek@suse.cz + +- mkinitrd-boot.sh: add /sbin/mdmon to the initrd (fate#306823). + ------------------------------------------------------------------- Thu Oct 1 10:51:38 CEST 2009 - mmarek@suse.cz diff --git a/mdadm.spec b/mdadm.spec index 66d01fa..10cbeee 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -20,7 +20,7 @@ Name: mdadm Version: 3.0.2 -Release: 1 +Release: 2 BuildRequires: sgmltool PreReq: %fillup_prereq %insserv_prereq Obsoletes: raidtools @@ -58,7 +58,7 @@ Authors: %build %{suse_update_config -f} -make CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-error" +make %{?jobs:-j%jobs} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-error" cd Software-RAID.HOWTO sgml2html Software-RAID.HOWTO.sgml sgml2txt Software-RAID.HOWTO.sgml diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh index ca68fdc..0e216d4 100644 --- a/mkinitrd-boot.sh +++ b/mkinitrd-boot.sh @@ -1,6 +1,6 @@ #!/bin/bash #%stage: softraid -#%programs: /sbin/mdadm +#%programs: /sbin/mdadm /sbin/mdmon #%modules: raid0 raid1 raid456 #%if: -n "$need_mdadm" # From 911e571316b09d81bd8b37278e1982c9f412994a7505dd016266ecfae7b2ff20 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 16 Dec 2009 15:59:31 +0000 Subject: [PATCH 4/5] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=9 --- mdadm.changes | 5 ----- mdadm.spec | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/mdadm.changes b/mdadm.changes index 950cbb8..d8cf938 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 15 20:26:46 CET 2009 - jengelh@medozas.de - -- enable parallel building - ------------------------------------------------------------------- Fri Oct 30 16:49:40 CET 2009 - mmarek@suse.cz diff --git a/mdadm.spec b/mdadm.spec index 10cbeee..d9cf54d 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -58,7 +58,7 @@ Authors: %build %{suse_update_config -f} -make %{?jobs:-j%jobs} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-error" +make CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-error" cd Software-RAID.HOWTO sgml2html Software-RAID.HOWTO.sgml sgml2txt Software-RAID.HOWTO.sgml From f5eef324e8f19eb3315f03446e6fc63723d732484f0278bc4124bc509858ea28 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 16 Dec 2009 15:59:32 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/mdadm revision 35.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=f2d4b0d7fb0f87869893fc82a04c4b1f --- mdadm.changes | 5 +++++ mdadm.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mdadm.changes b/mdadm.changes index d8cf938..950cbb8 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 15 20:26:46 CET 2009 - jengelh@medozas.de + +- enable parallel building + ------------------------------------------------------------------- Fri Oct 30 16:49:40 CET 2009 - mmarek@suse.cz diff --git a/mdadm.spec b/mdadm.spec index d9cf54d..dd7a4d9 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -20,13 +20,13 @@ Name: mdadm Version: 3.0.2 -Release: 2 +Release: 3 BuildRequires: sgmltool PreReq: %fillup_prereq %insserv_prereq Obsoletes: raidtools AutoReqProv: on Group: System/Base -License: GPL v2 or later +License: GPLv2+ Url: http://www.kernel.org/pub/linux/utils/raid/mdadm/ Summary: Utility for Configuring MD Setup BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,7 +58,7 @@ Authors: %build %{suse_update_config -f} -make CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-error" +make %{?jobs:-j%jobs} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-error" cd Software-RAID.HOWTO sgml2html Software-RAID.HOWTO.sgml sgml2txt Software-RAID.HOWTO.sgml