diff --git a/multipath-tools-0.4.9-opensuse-12.3.diff.bz2 b/multipath-tools-0.4.9-opensuse-12.3.diff.bz2 deleted file mode 100644 index 81e6f1f..0000000 --- a/multipath-tools-0.4.9-opensuse-12.3.diff.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45315c952d9405872a12d5100907855f49561b365bdaab9eea85ab893e4575a8 -size 128651 diff --git a/multipath-tools-0.4.9.tar.bz2 b/multipath-tools-0.4.9.tar.bz2 deleted file mode 100644 index 4c0f287..0000000 --- a/multipath-tools-0.4.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d44c8815144b5589cc3e604cb3fc16c76a028aef08aa1bec334ff70bf9ac712 -size 169180 diff --git a/multipath-tools-0.5.0-sles12.diff.bz2 b/multipath-tools-0.5.0-sles12.diff.bz2 new file mode 100644 index 0000000..57d4f1c --- /dev/null +++ b/multipath-tools-0.5.0-sles12.diff.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e6605ceaaf02ffb4384acefe6240cf579d8ae61968cd908e719fa8a14d0d785 +size 14123 diff --git a/multipath-tools-0.5.0.tar.bz2 b/multipath-tools-0.5.0.tar.bz2 new file mode 100644 index 0000000..a0d85ee --- /dev/null +++ b/multipath-tools-0.5.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f13cf1eb84e94e83b2019e68f7965526903c13e94246db43965d181668a0a6f9 +size 184024 diff --git a/multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch b/multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch deleted file mode 100644 index fbfdede..0000000 --- a/multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: multipath-tools-0.4.9/Makefile.inc -=================================================================== ---- multipath-tools-0.4.9.orig/Makefile.inc -+++ multipath-tools-0.4.9/Makefile.inc -@@ -21,10 +21,14 @@ ifndef LIB - endif - endif - -+ifndef SYSDPATH -+ SYSDPATH=lib -+endif -+ - prefix = - exec_prefix = $(prefix) - bindir = $(exec_prefix)/sbin --libudevdir = ${prefix}/lib/udev -+libudevdir = ${prefix}/$(SYSDPATH)/udev - multipathdir = $(TOPDIR)/libmultipath - mandir = $(prefix)/usr/share/man/man8 - man5dir = $(prefix)/usr/share/man/man5 -@@ -32,7 +36,7 @@ man3dir = $(prefix)/usr/share/man/m - rcdir = $(prefix)/etc/init.d - syslibdir = $(prefix)/$(LIB) - libdir = $(prefix)/$(LIB)/multipath --unitdir = $(prefix)/lib/systemd/system -+unitdir = $(prefix)/$(SYSDPATH)/systemd/system - mpathpersistdir = $(TOPDIR)/libmpathpersist - - GZIP = /bin/gzip -9 -c diff --git a/multipath-tools.changes b/multipath-tools.changes index e349807..84eb14c 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,7 +1,23 @@ +------------------------------------------------------------------- +Tue Jan 21 16:32:33 CET 2014 - hare@suse.de + +- Fixup build issues + +------------------------------------------------------------------- +Tue Jan 21 13:58:15 CET 2014 - hare@suse.de + +- Update to official version 0.5.0 + - remove: multipath-tools-0.4.9.tar.bz2 + - remove: multipath-tools-0.4.9-opensuse-12.3.diff.bz2 + - add: multipath-tools-0.5.0.tar.bz2 + - add: multipath-tools-0.5.0-sles12.diff.bz2 +- Merge: + - multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch + ------------------------------------------------------------------- Tue Apr 16 10:08:18 UTC 2013 - idonmez@suse.com -- Add Source URL, see https://en.opensuse.org/SourceUrls +- Add Source URL, see https://en.opensuse.org/SourceUrls - use %setup -c to support the tarball ------------------------------------------------------------------- @@ -14,7 +30,7 @@ Fri Feb 15 13:55:24 UTC 2013 - cfarrell@suse.com Fri Feb 15 12:15:09 UTC 2013 - rmilasan@suse.com - Make installation of systemd unit and udev files more flexible. - add: multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch + add: multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch ------------------------------------------------------------------- Fri Feb 1 10:29:11 CET 2013 - hare@suse.de @@ -27,7 +43,7 @@ Fri Feb 1 10:29:11 CET 2013 - hare@suse.de Sun Aug 26 02:05:37 UTC 2012 - crrodriguez@opensuse.org - Systemd: use default service type instead of forking -- Systemd: fix spec pre/post scripts. +- Systemd: fix spec pre/post scripts. ------------------------------------------------------------------- Tue Jul 17 13:21:47 UTC 2012 - rmilasan@suse.com @@ -37,7 +53,7 @@ Tue Jul 17 13:21:47 UTC 2012 - rmilasan@suse.com ------------------------------------------------------------------- Tue Jul 17 12:43:43 UTC 2012 - rmilasan@suse.com -- Fix the installation of multipath.rules file. +- Fix the installation of multipath.rules file. ------------------------------------------------------------------- Mon Jun 11 12:58:05 UTC 2012 - rmilasan@suse.com @@ -55,7 +71,7 @@ Wed May 30 17:32:10 CEST 2012 - hare@suse.de Fri Apr 20 08:35:06 UTC 2012 - rmilasan@suse.com - Run update of initrd at %post and %postun. - We need this to make sure initrd reflects the updates. + We need this to make sure initrd reflects the updates. ------------------------------------------------------------------- Fri Sep 30 15:40:21 UTC 2011 - uli@suse.com diff --git a/multipath-tools.spec b/multipath-tools.spec index f0eabf7..e0b3f0f 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ # # spec file for package multipath-tools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,12 +21,12 @@ BuildRequires: device-mapper-devel BuildRequires: libaio-devel BuildRequires: libudev-devel BuildRequires: readline-devel -BuildRequires: systemd +BuildRequires: systemd-devel Url: http://christophe.varoqui.free.fr/ Requires: device-mapper Requires: kpartx PreReq: %insserv_prereq %fillup_prereq coreutils grep -Version: 0.4.9 +Version: 0.5.0 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0 @@ -35,8 +35,7 @@ Group: System/Base %define has_systemd 1 Source: http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: %{name}-%{version}-opensuse-12.3.diff.bz2 -Patch1: multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch +Patch0: %{name}-%{version}-sles12.diff.bz2 %if %suse_version > 1220 %define _sysdir usr/lib %else @@ -94,17 +93,18 @@ Authors: Christophe Varoqui %prep -%setup -q -c -n multipath-tools-%{version} +%setup -q -n multipath-tools-%{version} %patch0 -p1 -%patch1 -p1 %build -make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} SYSDPATH=%{_sysdir} +make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %install -make DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib} SYSDPATH=%{_sysdir} install +make DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib} SYSTEMDPATH=%{_sysdir} install # Compability with older versions -mv $RPM_BUILD_ROOT/etc/udev/rules.d/kpartx.rules $RPM_BUILD_ROOT/etc/udev/rules.d/70-kpartx.rules +mkdir -p $RPM_BUILD_ROOT/%{_sysdir}/udev/rules.d +mv $RPM_BUILD_ROOT/etc/udev/rules.d/kpartx.rules $RPM_BUILD_ROOT/%{_sysdir}/udev/rules.d/70-kpartx.rules +mv $RPM_BUILD_ROOT/etc/udev/rules.d/kpartx-compat.rules $RPM_BUILD_ROOT/%{_sysdir}/udev/rules.d/71-kpartx-compat.rules mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/ rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so @@ -149,10 +149,9 @@ fi %files %defattr(-,root,root) -%doc AUTHOR COPYING README ChangeLog +%doc AUTHOR COPYING README ChangeLog %doc multipath.conf* -%dir /etc/udev -%dir /etc/udev/rules.d +%dir /%{_sysdir}/udev/rules.d /%{_lib}/libmultipath.so.0 /%{_lib}/libmpathpersist.so.0 /%{_lib}/multipath @@ -160,14 +159,9 @@ fi /sbin/multipathd /sbin/mpathpersist %attr (0700, root, root) /var/cache/multipath -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -/lib/mkinitrd/scripts/boot-multipath.sh -/lib/mkinitrd/scripts/setup-multipath.sh -/lib/mkinitrd/scripts/boot-multipathd.sh -/lib/mkinitrd/scripts/boot-killmultipathd.sh %dir /%{_sysdir}/systemd/system /%{_sysdir}/systemd/system/multipathd.service +/%{_sysdir}/systemd/system/multipathd.socket %{_mandir}/man8/multipath.8* %{_mandir}/man5/multipath.conf.5* %{_mandir}/man8/multipathd.8* @@ -180,16 +174,11 @@ fi %files -n kpartx %defattr(-,root,root) -%dir /etc/udev -%dir /etc/udev/rules.d -%config /etc/udev/rules.d/70-kpartx.rules /sbin/kpartx %dir /%{_sysdir}/udev +%config /%{_sysdir}/udev/rules.d/70-kpartx.rules +%config /%{_sysdir}/udev/rules.d/71-kpartx-compat.rules /%{_sysdir}/udev/kpartx_id -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -/lib/mkinitrd/scripts/boot-kpartx.sh -/lib/mkinitrd/scripts/setup-kpartx.sh %{_mandir}/man8/kpartx.8* %changelog