diff --git a/lvm2-2_02_92-add-with-systemdsystemunitdir-config.patch b/lvm2-2_02_92-add-with-systemdsystemunitdir-config.patch new file mode 100644 index 0000000..369f606 --- /dev/null +++ b/lvm2-2_02_92-add-with-systemdsystemunitdir-config.patch @@ -0,0 +1,117 @@ +diff -purN LVM2.2.02.91.orig/configure LVM2.2.02.91.new/configure +--- LVM2.2.02.91.orig/configure 2012-01-31 22:21:53.000000000 +0100 ++++ LVM2.2.02.91.new/configure 2012-02-13 13:49:27.339271246 +0100 +@@ -596,6 +596,7 @@ ac_default_prefix=/usr + ac_subst_vars='LTLIBOBJS + usrsbindir + usrlibdir ++systemdsystemunitdir + udevdir + udev_prefix + tmpdir +@@ -840,6 +841,7 @@ with_usrlibdir + with_usrsbindir + with_udev_prefix + with_udevdir ++with_systemdsystemunitdir + with_dmeventd_pidfile + with_dmeventd_path + with_default_run_dir +@@ -1580,6 +1582,8 @@ Optional Packages: + --with-udev-prefix=UPREFIX + install udev rule files in UPREFIX [[EPREFIX]] + --with-udevdir=DIR udev rules in DIR [[UPREFIX/lib/udev/rules.d]] ++ --with-systemdsystemunitdir=DIR ++ systemd service files in DIR + --with-dmeventd-pidfile=PATH + dmeventd pidfile [[/var/run/dmeventd.pid]] + --with-dmeventd-path=PATH +@@ -9695,6 +9699,23 @@ fi + + + ################################################################################ ++ ++# Check whether --with-systemdsystemunitdir was given. ++if test "${with_systemdsystemunitdir+set}" = set; then : ++ withval=$with_systemdsystemunitdir; systemdsystemunitdir=$withval ++else ++ pkg_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) ++fi ++ ++ ++if test -n "$pkg_systemdsystemunitdir"; then ++ systemdsystemunitdir=$pkg_systemdsystemunitdir; ++fi ++ ++if test -z "$systemdsystemunitdir"; then ++ systemdsystemunitdir='/lib/systemd/system'; ++fi ++################################################################################ + if test x$READLINE = xyes; then + for ac_header in readline/readline.h readline/history.h + do : +@@ -10233,6 +10254,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' + + + ++ + + + +diff -purN LVM2.2.02.91.orig/configure.in LVM2.2.02.91.new/configure.in +--- LVM2.2.02.91.orig/configure.in 2012-01-31 22:21:54.000000000 +0100 ++++ LVM2.2.02.91.new/configure.in 2012-02-13 13:49:27.339271246 +0100 +@@ -1159,6 +1159,22 @@ AC_ARG_WITH(udevdir, + udevdir=$withval, udevdir='${udev_prefix}/lib/udev/rules.d') + + ################################################################################ ++dnl -- Get the systemd system unit dir value from pkg_config automatically if value not given explicitly. ++dnl -- This follows the recommendation for systemd integration best practices mentioned in daemon(7) manpage. ++AC_ARG_WITH(systemdsystemunitdir, ++ AC_HELP_STRING([--with-systemdsystemunitdir=DIR], ++ [systemd service files in DIR]), ++ systemdsystemunitdir=$withval, ++ pkg_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)) ++ ++if test -n "$pkg_systemdsystemunitdir"; then ++ systemdsystemunitdir=$pkg_systemdsystemunitdir; ++fi ++ ++if test -z "$systemdsystemunitdir"; then ++ systemdsystemunitdir='/lib/systemd/system'; ++fi ++################################################################################ + dnl -- Ensure additional headers required + if test x$READLINE = xyes; then + AC_CHECK_HEADERS(readline/readline.h readline/history.h,,AC_MSG_ERROR(bailing out)) +@@ -1426,6 +1442,7 @@ AC_SUBST(kernelvsn) + AC_SUBST(tmpdir) + AC_SUBST(udev_prefix) + AC_SUBST(udevdir) ++AC_SUBST(systemdsystemunitdir) + AC_SUBST(usrlibdir) + AC_SUBST(usrsbindir) + +diff -purN LVM2.2.02.91.orig/make.tmpl.in LVM2.2.02.91.new/make.tmpl.in +--- LVM2.2.02.91.orig/make.tmpl.in 2011-11-23 13:19:23.000000000 +0100 ++++ LVM2.2.02.91.new/make.tmpl.in 2012-02-13 13:49:27.340271242 +0100 +@@ -66,7 +66,7 @@ staticdir = $(DESTDIR)@STATICDIR@ + udevdir = $(DESTDIR)@udevdir@ + pkgconfigdir = $(usrlibdir)/pkgconfig + initdir = $(DESTDIR)@sysconfdir@/rc.d/init.d +-systemd_dir = $(DESTDIR)/lib/systemd/system ++systemd_dir = $(DESTDIR)/@systemdsystemunitdir@ + ocf_scriptdir = $(DESTDIR)@OCFDIR@ + + USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \ +diff -purN LVM2.2.02.91.orig/WHATS_NEW LVM2.2.02.91.new/WHATS_NEW +--- LVM2.2.02.91.orig/WHATS_NEW 2012-02-13 00:02:52.000000000 +0100 ++++ LVM2.2.02.91.new/WHATS_NEW 2012-02-13 13:51:04.104940437 +0100 +@@ -1,3 +1,7 @@ ++Version 2.02.92 - ++==================================== ++ Add configure --with-systemdsystemunitdir. ++ + Version 2.02.91 - 12th February 2012 + ==================================== + Remove PV-based format instances (which are no longer needed). diff --git a/lvm2.spec b/lvm2.spec index 1aa98b5..3c92621 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -66,7 +66,7 @@ Summary: Userland logical volume management tools Name: lvm2 Version: 2.02.91 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -75,6 +75,7 @@ Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz Source1: %{name}-tmpfiles.conf %endif Patch0: lvm2-set-default-preferred_names.patch +Patch1: lvm2-2_02_92-add-with-systemdsystemunitdir-config.patch BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel BuildRequires: ncurses-devel @@ -118,6 +119,7 @@ or more physical volumes and creating one or more logical volumes %prep %setup -q -n LVM2.%{version} %patch0 -p1 -b preferred_names +%patch1 -p1 -b systemd_dir %build %define _exec_prefix "" @@ -631,6 +633,9 @@ the device-mapper event library. /usr%{_libdir}/pkgconfig/devmapper-event.pc %changelog +* Mon Feb 13 2012 Peter Rajnoha - 2.02.91-2 +- Add configure --with-systemdsystemunitdir. + * Sun Feb 12 2012 Alasdair Kergon - 2.02.91-1 - New upstream with trivial fixes and refactoring of some lvmcache and orphan code.