From 45fbf43802826f321ca56f264e084760c29e217924586f2bdb042144f5574792 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 14 Jun 2016 12:45:24 +0000 Subject: [PATCH 1/4] Accepting request 400641 from openSUSE:Leap:42.2:SLE-workarounds - fix service file to not pretend that this is the upstream version. Now labeled 0.6.1+suse20160603.9b920e3 - Fix BuildRequire to get systemd.pc from correct package (bsc#983167) - point rcmultipathd to /usr/sbin/service to avoid dangling symlink warning OBS-URL: https://build.opensuse.org/request/show/400641 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=95 --- _service | 4 +++- _servicedata | 4 ++++ multipath-tools-0.6.1+suse20160603.9b920e3.tar.xz | 3 +++ multipath-tools-0.6.1.tar.xz | 4 ++-- multipath-tools.changes | 8 ++++++++ multipath-tools.spec | 11 ++++++++--- 6 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 _servicedata create mode 100644 multipath-tools-0.6.1+suse20160603.9b920e3.tar.xz diff --git a/_service b/_service index 878309a..ba58a3f 100644 --- a/_service +++ b/_service @@ -4,11 +4,13 @@ https://github.com/hreinecke/multipath-tools.git multipath-tools - 0.6.1 + 0.6.1+suse%cd.%h sles12-sp2 + enable *multipath-tools*.tar xz + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..d5462fb --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/hreinecke/multipath-tools.git + 9b920e38172d58e3a4f2ced1b594940d92a58b45 \ No newline at end of file diff --git a/multipath-tools-0.6.1+suse20160603.9b920e3.tar.xz b/multipath-tools-0.6.1+suse20160603.9b920e3.tar.xz new file mode 100644 index 0000000..610528a --- /dev/null +++ b/multipath-tools-0.6.1+suse20160603.9b920e3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b594785cdabf921c6d3ca515e3556455f072d68c690f3143f65734566245e97c +size 191552 diff --git a/multipath-tools-0.6.1.tar.xz b/multipath-tools-0.6.1.tar.xz index 2141a60..e2148ef 100644 --- a/multipath-tools-0.6.1.tar.xz +++ b/multipath-tools-0.6.1.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f15d080565165861e5cfffed25ed58fa9fe500579aa692a8b844e9d9ee66afa -size 190924 +oid sha256:6945f4f0ca49254dbdaf12986911a69ffa2cfa605a1d81798e80abec69ceaa09 +size 190936 diff --git a/multipath-tools.changes b/multipath-tools.changes index 79f0194..b2ffd89 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 8 08:33:48 UTC 2016 - lnussel@suse.de + +- fix service file to not pretend that this is the upstream version. + Now labeled 0.6.1+suse20160603.9b920e3 +- Fix BuildRequire to get systemd.pc from correct package (bsc#983167) +- point rcmultipathd to /usr/sbin/service to avoid dangling symlink warning + ------------------------------------------------------------------- Fri Jun 3 08:58:52 CEST 2016 - hare@suse.de diff --git a/multipath-tools.spec b/multipath-tools.spec index 2e8f277..77814c2 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -16,24 +16,29 @@ # +%define version_unconverted 0.6.1+suse20160603.9b920e3 + Name: multipath-tools BuildRequires: device-mapper-devel BuildRequires: libaio-devel BuildRequires: libudev-devel BuildRequires: readline-devel -BuildRequires: systemd-devel BuildRequires: udev +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(systemd) Url: http://christophe.varoqui.free.fr/ Requires: device-mapper >= 1.2.78 Requires: kpartx PreReq: %insserv_prereq %fillup_prereq coreutils grep -Version: 0.6.1 +Version: 0.6.1+suse20160603.9b920e3 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0 Group: System/Base %{?systemd_requires} %define has_systemd 1 +#FIXME: https://github.com/hreinecke/multipath-tools.git needs to +#be moved to SUSE namespace Source: multipath-tools-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1220 @@ -104,7 +109,7 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/ rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so rm $RPM_BUILD_ROOT/%_lib/libmpathcmd.so mkdir -p $RPM_BUILD_ROOT/usr/sbin -ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcmultipathd +ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcmultipathd %clean rm -rf $RPM_BUILD_ROOT; From c95b3d38fc79310f5d1a39725c858947fea697bc42df038f5c81e0d8eef41d1d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 4 Jul 2016 08:20:41 +0000 Subject: [PATCH 2/4] Accepting request 406265 from home:hreinecke:branches:Base:System - Revert 'move filter_devnode under vector lock' - Revert the rework patch - Move config accesses to use user-space RCU - Update tarball to 0.6.1+suse20160704.6e52398 - Drop AUTHOR file OBS-URL: https://build.opensuse.org/request/show/406265 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=96 --- _servicedata | 2 +- multipath-tools-0.6.1+suse20160603.9b920e3.tar.xz | 3 --- multipath-tools-0.6.1+suse20160704.6e52398.tar.xz | 3 +++ multipath-tools-0.6.1.tar.xz | 3 --- multipath-tools.changes | 9 +++++++++ multipath-tools.spec | 7 ++++--- 6 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 multipath-tools-0.6.1+suse20160603.9b920e3.tar.xz create mode 100644 multipath-tools-0.6.1+suse20160704.6e52398.tar.xz delete mode 100644 multipath-tools-0.6.1.tar.xz diff --git a/_servicedata b/_servicedata index d5462fb..74b5401 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/hreinecke/multipath-tools.git - 9b920e38172d58e3a4f2ced1b594940d92a58b45 \ No newline at end of file + 6e5239869eabaad4dced2152488f5a865509e1d1 diff --git a/multipath-tools-0.6.1+suse20160603.9b920e3.tar.xz b/multipath-tools-0.6.1+suse20160603.9b920e3.tar.xz deleted file mode 100644 index 610528a..0000000 --- a/multipath-tools-0.6.1+suse20160603.9b920e3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b594785cdabf921c6d3ca515e3556455f072d68c690f3143f65734566245e97c -size 191552 diff --git a/multipath-tools-0.6.1+suse20160704.6e52398.tar.xz b/multipath-tools-0.6.1+suse20160704.6e52398.tar.xz new file mode 100644 index 0000000..d5ef863 --- /dev/null +++ b/multipath-tools-0.6.1+suse20160704.6e52398.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba15bb1400d7f4609c688e0aa3ec074e4b6a79973f6e9a5ed0db1d5ba438da40 +size 188320 diff --git a/multipath-tools-0.6.1.tar.xz b/multipath-tools-0.6.1.tar.xz deleted file mode 100644 index e2148ef..0000000 --- a/multipath-tools-0.6.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6945f4f0ca49254dbdaf12986911a69ffa2cfa605a1d81798e80abec69ceaa09 -size 190936 diff --git a/multipath-tools.changes b/multipath-tools.changes index b2ffd89..5a62459 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jul 4 09:47:21 CEST 2016 - hare@suse.de + +- Revert 'move filter_devnode under vector lock' +- Revert the rework patch +- Move config accesses to use user-space RCU +- Update tarball to 0.6.1+suse20160704.6e52398 +- Drop AUTHOR file + ------------------------------------------------------------------- Wed Jun 8 08:33:48 UTC 2016 - lnussel@suse.de diff --git a/multipath-tools.spec b/multipath-tools.spec index 77814c2..d30e41b 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -16,12 +16,13 @@ # -%define version_unconverted 0.6.1+suse20160603.9b920e3 +%define version_unconverted 0.6.1+suse20160704.6e52398 Name: multipath-tools BuildRequires: device-mapper-devel BuildRequires: libaio-devel BuildRequires: libudev-devel +BuildRequires: liburcu-devel BuildRequires: readline-devel BuildRequires: udev BuildRequires: pkgconfig(libsystemd) @@ -30,7 +31,7 @@ Url: http://christophe.varoqui.free.fr/ Requires: device-mapper >= 1.2.78 Requires: kpartx PreReq: %insserv_prereq %fillup_prereq coreutils grep -Version: 0.6.1+suse20160603.9b920e3 +Version: 0.6.1+suse20160704.6e52398 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0 @@ -147,7 +148,7 @@ exit 0 %files %defattr(-,root,root) -%doc AUTHOR COPYING README ChangeLog +%doc COPYING README ChangeLog %{_udevrulesdir}/11-dm-mpath.rules %{_udevrulesdir}/56-multipath.rules /%{_lib}/libmultipath.so.0 From 033744e963b5f8c1681b12b32a20b800c97db661f43e5463176dedafbbe04eeb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 5 Jul 2016 08:48:57 +0000 Subject: [PATCH 3/4] Accepting request 406324 from home:hreinecke:branches:Base:System - Move config accesses to use user-space RCU (bsc#987526) * Revert 'move filter_devnode under vector lock' * Revert the rework patch - Include patches from upstream: * Update hardware tables * Update kpartx manpage * Whitespace fixes * Include coverity fixes * Drop AUTHOR file OBS-URL: https://build.opensuse.org/request/show/406324 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=97 --- multipath-tools.changes | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/multipath-tools.changes b/multipath-tools.changes index 5a62459..00241f9 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,11 +1,16 @@ ------------------------------------------------------------------- Mon Jul 4 09:47:21 CEST 2016 - hare@suse.de -- Revert 'move filter_devnode under vector lock' -- Revert the rework patch -- Move config accesses to use user-space RCU +- Move config accesses to use user-space RCU (bsc#987526) + * Revert 'move filter_devnode under vector lock' + * Revert the rework patch +- Include patches from upstream: + * Update hardware tables + * Update kpartx manpage + * Whitespace fixes + * Include coverity fixes + * Drop AUTHOR file - Update tarball to 0.6.1+suse20160704.6e52398 -- Drop AUTHOR file ------------------------------------------------------------------- Wed Jun 8 08:33:48 UTC 2016 - lnussel@suse.de From 3dd54be22fe8e4d40b0a18b8f0a40210b89d641806261f7b1cd1dd7ce25558f0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 6 Jul 2016 16:38:01 +0000 Subject: [PATCH 4/4] Accepting request 406622 from home:jengelh:branches:Base:System - Remove obsoletes spec sections OBS-URL: https://build.opensuse.org/request/show/406622 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=98 --- multipath-tools.changes | 5 +++++ multipath-tools.spec | 20 -------------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/multipath-tools.changes b/multipath-tools.changes index 00241f9..d8dd31a 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 4 22:30:43 UTC 2016 - jengelh@inai.de + +- Remove obsoletes spec sections + ------------------------------------------------------------------- Mon Jul 4 09:47:21 CEST 2016 - hare@suse.de diff --git a/multipath-tools.spec b/multipath-tools.spec index d30e41b..9de8fec 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -63,12 +63,6 @@ are: - kpartx: maps linear devmaps to device partitions, which makes multipath maps partionable - - -Authors: --------- - Christophe Varoqui - %package -n kpartx Summary: Manages partition tables on device-mapper devices Group: System/Base @@ -78,12 +72,6 @@ Requires: device-mapper The kpartx program maps linear devmaps to device partitions, which makes multipath maps partionable. - - -Authors: --------- - Christophe Varoqui - %package devel Summary: Development libraries for multipath-tools Group: Development/Libraries/Other @@ -93,11 +81,6 @@ Requires: device-mapper This package contains the development libraries for multipath-tools and libmpath_persist. - -Authors: --------- - Christophe Varoqui - %prep %setup -q -n multipath-tools-%{version} @@ -112,9 +95,6 @@ rm $RPM_BUILD_ROOT/%_lib/libmpathcmd.so mkdir -p $RPM_BUILD_ROOT/usr/sbin ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcmultipathd -%clean -rm -rf $RPM_BUILD_ROOT; - %pre [ -f /.buildenv ] && exit 0 if [ -f /etc/init.d/multipathd ] && dmsetup --target multipath table | grep -q multipath ; then