Accepting request 155540 from Base:System

license update: GPL-2.0
Substantial number of GPL-2.0 files in the package (forwarded request 155532 from babelworx)

OBS-URL: https://build.opensuse.org/request/show/155540
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/multipath-tools?expand=0&rev=53

0002-fix-installation-of-multipath-rule.patch

@@ -1,21 +0,0 @@
-Index: multipath-tools-0.4.9/multipath/Makefile
-===================================================================
---- multipath-tools-0.4.9.orig/multipath/Makefile
-+++ multipath-tools-0.4.9/multipath/Makefile
-@@ -22,6 +22,7 @@ install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir)
- 	$(INSTALL_PROGRAM) -m 755 multipath.init.suse $(DESTDIR)$(rcdir)/boot.multipath
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
-+	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/71-multipath.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mkinitrddir)
- 	$(INSTALL_PROGRAM) -m 755 boot-multipath.sh $(DESTDIR)$(mkinitrddir)
- 	$(INSTALL_PROGRAM) -m 755 setup-multipath.sh $(DESTDIR)$(mkinitrddir)
-@@ -31,7 +32,7 @@ install:
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
- 
- uninstall:
--	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
-+	rm $(DESTDIR)/etc/udev/rules.d/71-multipath.rules
- 	rm $(DESTDIR)$(bindir)/$(EXEC)
- 	rm $(DESTDIR)$(mandir)/$(EXEC).8
- 	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5

mpath-tools-service.patch

@@ -1,13 +0,0 @@
---- multipathd/multipathd.service.orig
-+++ multipathd/multipathd.service
-@@ -4,9 +4,7 @@ Before=iscsi.service iscsid.service
- After=syslog.target
- 
- [Service]
--Type=forking
--PIDFile=/var/run/multipathd.pid
--ExecStart=/sbin/multipathd
-+ExecStart=/sbin/multipathd -d
- ExecReload=/sbin/multipathd reconfigure
- #ExecStop=/path/to/scrip delete-me if not necessary
- 

multipath-tools-0.4.9-opensuse-12.2.diff.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa89bdebfe991be0add95b90e8e84dc0bed2ad259b96f3e61e2ce8d574614ffd
-size 111263

multipath-tools-0.4.9-opensuse-12.3.diff.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:45315c952d9405872a12d5100907855f49561b365bdaab9eea85ab893e4575a8
+size 128651

multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch

@@ -0,0 +1,29 @@
+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

multipath-tools.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+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)
+
 -------------------------------------------------------------------
 Sun Aug 26 02:05:37 UTC 2012 - crrodriguez@opensuse.org
 
@@ -314,7 +333,6 @@ Mon Jul 13 12:24:34 CEST 2009 - hare@suse.de
 - Merge feature string in assemble_map (bnc#507793)
 
  -------------------------------------------------------------------
--------------------------------------------------------------------
 Fri Jun 19 10:35:46 CEST 2009 - coolo@novell.com
 
 - disable as-needed for this package as it fails to build with it
@@ -1007,3 +1025,4 @@ Tue May 25 10:43:15 CEST 2004 - fehr@suse.de
 - created initial version of a SuSE package from version 0.2.0 of
   multipath tools
 
+-------------------------------------------------------------------

multipath-tools.spec

@@ -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
@@ -72,6 +75,20 @@ makes multipath maps partionable.
 
 
 
+Authors:
+--------
+    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>
@@ -80,14 +97,15 @@ Authors:
 %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 @@ rm -rf $RPM_BUILD_ROOT;
 [ -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
-%service_add_pre multipathd.service
-%endif
 fi
 
 %post
 [ -f /.buildenv ] && exit 0
+%{run_ldconfig}
 if dmsetup --target multipath table | grep -q multipath ; then
-    /etc/init.d/multipathd start
+  %service_add_post multipathd.service
-%if 0%{?has_systemd}
-%service_add_post multipathd.service
-%endif
 fi
 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
 if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then
@@ -119,14 +133,8 @@ elif [ -x /sbin/mkinitrd ]; then
 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 @@ if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then
 elif [ -x /sbin/mkinitrd ]; then
   /sbin/mkinitrd
 fi
-
-%if 0%{?has_systemd}
 %service_del_postun multipathd.service
-%endif
+%{run_ldconfig}
-
-%{insserv_cleanup}
 
 %files
 %defattr(-,root,root)
@@ -149,9 +153,6 @@ fi
 %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 @@ fi
 /lib/mkinitrd/scripts/setup-multipath.sh
 /lib/mkinitrd/scripts/boot-multipathd.sh
 /lib/mkinitrd/scripts/boot-killmultipathd.sh
-%dir /lib/systemd/system
+%dir /%{_sysdir}/systemd/system
-/lib/systemd/system/multipathd.service
+/%{_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 @@ fi
 %dir /etc/udev/rules.d
 %config /etc/udev/rules.d/70-kpartx.rules
 /sbin/kpartx
-%dir /lib/udev
+%dir /%{_sysdir}/udev
-/lib/udev/kpartx_id
+/%{_sysdir}/udev/kpartx_id
 %dir /lib/mkinitrd
 %dir /lib/mkinitrd/scripts
 /lib/mkinitrd/scripts/boot-kpartx.sh