commit multipath-tools for openSUSE:12.3

17 Feb 2013

Hello community,

here is the log from the commit of package multipath-tools for openSUSE:12.3 checked in at 2013-02-17 17:07:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/multipath-tools (Old)
 and      /work/SRC/openSUSE:12.3/.multipath-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "multipath-tools", Maintainer is "hare@suse.com"

Changes:
--------

--- /work/SRC/openSUSE:12.3/multipath-tools/multipath-tools.changes	2013-01-31 01:27:37.000000000 +0100
+++ /work/SRC/openSUSE:12.3/.multipath-tools.new/multipath-tools.changes	2013-02-17 17:07:17.000000000 +0100
@@ -1,0 +2,19 @@
+Fri Feb 15 13:55:24 UTC 2013 - cfarrell@suse.com
+
+- license update: GPL-2.0
+  Substantial number of GPL-2.0 files in the package
+
+-------------------------------------------------------------------
+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 
+
+-------------------------------------------------------------------
+Fri Feb  1 10:29:11 CET 2013 - hare@suse.de
+
+- Update to latest mainline git version
+- Merge systemd fixes
+- Generate persistent device names for kpartx (bnc#799274)
+
+-------------------------------------------------------------------
@@ -317 +335,0 @@
--------------------------------------------------------------------
@@ -1009,0 +1028 @@
+-------------------------------------------------------------------

Old:
----
  0002-fix-installation-of-multipath-rule.patch
  mpath-tools-service.patch
  multipath-tools-0.4.9-opensuse-12.2.diff.bz2

New:
----
  multipath-tools-0.4.9-opensuse-12.3.diff.bz2
  multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ multipath-tools.spec ++++++
--- /var/tmp/diff_new_pack.aRWZyV/_old	2013-02-17 17:07:19.000000000 +0100
+++ /var/tmp/diff_new_pack.aRWZyV/_new	2013-02-17 17:07:19.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package multipath-tools
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -19,25 +19,28 @@
 Name:           multipath-tools
 BuildRequires:  device-mapper-devel
 BuildRequires:  libaio-devel
+BuildRequires:  libudev-devel
 BuildRequires:  readline-devel
+BuildRequires:  systemd
 Url:            http://christophe.varoqui.free.fr/
 Requires:       device-mapper
 Requires:       kpartx
-PreReq:         %insserv_prereq %fillup_prereq coreutils grep /sbin/mkinitrd
+PreReq:         %insserv_prereq %fillup_prereq coreutils grep
 Version:        0.4.9
 Release:        0
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
-License:        BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain ; MIT
+License:        GPL-2.0
 Group:          System/Base
-Source:         multipath-tools-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Patch0:         %{name}-%{version}-opensuse-12.2.diff.bz2
-Patch1:         0002-fix-installation-of-multipath-rule.patch
-Patch2:         mpath-tools-service.patch
-%if 0%{?suse_version} >= 1210
-BuildRequires:  systemd
 %{?systemd_requires}
 %define has_systemd 1
+Source:         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
+%if %suse_version > 1220
+%define         _sysdir usr/lib
+%else
+%define         _sysdir lib
 %endif
 
 %description
@@ -76,18 +79,33 @@
 --------
     Christophe Varoqui <christophe.varoqui@free.fr>
 
+%package devel
+Summary:        Development libraries for multipath-tools
+Group:          Development/Libraries/Other
+Requires:       device-mapper
+
+%description devel
+This package contains the development libraries for multipath-tools
+and libmpath_persist.
+
+
+Authors:
+--------
+    Christophe Varoqui <christophe.varoqui@free.fr>
+
 %prep
 %setup -q -n multipath-tools-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2
+
 %build
-make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%_lib
+make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} SYSDPATH=%{_sysdir}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT LIB=%_lib install
+make DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib} SYSDPATH=%{_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/var/cache/multipath/
-rm $RPM_BUILD_ROOT/usr/include/mpath_persist.h
 rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so
 
 %clean
@@ -97,18 +115,14 @@
 [ -f /.buildenv ] && exit 0
 if [ -f /etc/init.d/multipathd ] && dmsetup --target multipath table | grep -q multipath ; then
     /etc/init.d/multipathd stop
-%if 0%{?has_systemd}
-%service_add_pre multipathd.service
-%endif
+  %service_add_pre multipathd.service
 fi
 
 %post
 [ -f /.buildenv ] && exit 0
+%{run_ldconfig}
 if dmsetup --target multipath table | grep -q multipath ; then
-    /etc/init.d/multipathd start
-%if 0%{?has_systemd}
-%service_add_post multipathd.service
-%endif
+  %service_add_post multipathd.service
 fi
 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
 if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then
@@ -119,14 +133,8 @@
 fi
 exit 0
 
-#{insserv /etc/init.d/multipathd}
-#{fillup_and_insserv boot.multipath}
-
 %preun
-%stop_on_removal multipathd
-%if 0%{?has_systemd}
 %service_del_preun multipathd.service
-%endif
 
 %postun
 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
@@ -136,12 +144,8 @@
 elif [ -x /sbin/mkinitrd ]; then
   /sbin/mkinitrd
 fi
-
-%if 0%{?has_systemd}
 %service_del_postun multipathd.service
-%endif
-
-%{insserv_cleanup}
+%{run_ldconfig}
 
 %files
 %defattr(-,root,root)
@@ -149,9 +153,6 @@
 %doc multipath.conf*
 %dir /etc/udev
 %dir /etc/udev/rules.d
-%config /etc/init.d/multipathd
-%config /etc/init.d/boot.multipath
-%config /etc/udev/rules.d/71-multipath.rules
 /%{_lib}/libmultipath.so.0
 /%{_lib}/libmpathpersist.so.0
 /%{_lib}/multipath
@@ -165,12 +166,16 @@
 /lib/mkinitrd/scripts/setup-multipath.sh
 /lib/mkinitrd/scripts/boot-multipathd.sh
 /lib/mkinitrd/scripts/boot-killmultipathd.sh
-%dir /lib/systemd/system
-/lib/systemd/system/multipathd.service
+%dir /%{_sysdir}/systemd/system
+/%{_sysdir}/systemd/system/multipathd.service
 %{_mandir}/man8/multipath.8*
 %{_mandir}/man5/multipath.conf.5*
 %{_mandir}/man8/multipathd.8*
 %{_mandir}/man8/mpathpersist.8*
+
+%files devel
+%defattr(-,root,root)
+/usr/include/mpath_persist.h
 %{_mandir}/man3/mpath_persistent_*
 
 %files -n kpartx
@@ -179,8 +184,8 @@
 %dir /etc/udev/rules.d
 %config /etc/udev/rules.d/70-kpartx.rules
 /sbin/kpartx
-%dir /lib/udev
-/lib/udev/kpartx_id
+%dir /%{_sysdir}/udev
+/%{_sysdir}/udev/kpartx_id
 %dir /lib/mkinitrd
 %dir /lib/mkinitrd/scripts
 /lib/mkinitrd/scripts/boot-kpartx.sh

++++++ multipath-tools-0.4.9-opensuse-12.2.diff.bz2 -> multipath-tools-0.4.9-opensuse-12.3.diff.bz2 ++++++
Files /work/SRC/openSUSE:12.3/multipath-tools/multipath-tools-0.4.9-opensuse-12.2.diff.bz2 and /work/SRC/openSUSE:12.3/.multipath-tools.new/multipath-tools-0.4.9-opensuse-12.3.diff.bz2 differ

++++++ multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch ++++++
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
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit multipath-tools for openSUSE:12.3

root＠hilbert.suse.de