Hello community, here is the log from the commit of package dmraid for openSUSE:Factory checked in at 2013-09-26 07:03:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dmraid (Old) and /work/SRC/openSUSE:Factory/.dmraid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dmraid" Changes: -------- --- /work/SRC/openSUSE:Factory/dmraid/dmraid.changes 2013-07-24 23:37:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dmraid.new/dmraid.changes 2013-09-26 07:03:54.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Sep 13 20:04:57 UTC 2013 - crrodrig...@opensuse.org + +- Fix Makefiles so they support DESTDIR + Added: dmraid-destdir.patch +- add tmpfiles.d so runtime directories are properly created +- Remove sysvinit support and replace it for native systemd support. + Added: dmraid-activation.service + Removed: boot.dmraid + +------------------------------------------------------------------- Old: ---- boot.dmraid New: ---- dmraid-activation.service dmraid-destdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmraid.spec ++++++ --- /var/tmp/diff_new_pack.8jqHQe/_old 2013-09-26 07:03:55.000000000 +0200 +++ /var/tmp/diff_new_pack.8jqHQe/_new 2013-09-26 07:03:55.000000000 +0200 @@ -21,6 +21,7 @@ BuildRequires: automake BuildRequires: device-mapper-devel BuildRequires: libselinux-devel +BuildRequires: systemd-rpm-macros BuildRequires: zlib-devel Requires: aaa_base Requires: kpartx @@ -32,10 +33,10 @@ Release: 0 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2 Source1: sysconfig.dmraid -Source2: boot.dmraid Source3: README.SuSE Source4: mkinitrd-setup.sh Source5: mkinitrd-boot.sh +Source6: dmraid-activation.service Patch1: dmraid-1.0.0.rc16-cvs-2010-02-02.patch Patch2: dmraid-1.0.0.rc13-geometry.patch Patch3: lib-install.patch @@ -44,8 +45,10 @@ Patch6: rebuild.fix Patch7: ddf-erase Patch8: dmraid-move-var-lock-to-run-lock.patch +Patch9: dmraid-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq +%{systemd_requires} %description This software discovers, activates, deactivates, and displays @@ -83,21 +86,16 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 cp %{SOURCE3} . %build #rm -f aclocal.m4 autoreconf -fi rm -r autom4te.cache -# Update config.{guess,sub} -%{?suse_update_config} -export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=$RPM_BUILD_ROOT%{_prefix} \ - --infodir=$RPM_BUILD_ROOT%{_infodir} \ - --libdir=$RPM_BUILD_ROOT/%_lib \ - --mandir=$RPM_BUILD_ROOT%{_mandir} \ - --includedir=$RPM_BUILD_ROOT%{_includedir} \ - --sbindir=$RPM_BUILD_ROOT/sbin \ +%configure \ + --libdir=/%_lib \ + --sbindir=/sbin \ --with-user=`id -nu` --with-group=`id -ng` \ --enable-libselinux --enable-libsepol make @@ -110,26 +108,27 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dmraid mkdir -p $RPM_BUILD_ROOT/etc/init.d -install -m744 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d/boot.dmraid install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts install -m 755 %{S:4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-dmraid.sh install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-dmraid.sh +install -D -m 0644 %{S:6} %{buildroot}%{_unitdir}/dmraid-activation.service +install -d %{buildroot}%{_tmpfilesdir} +echo 'd /run/lock/dmraid 0700 root root -' > %{buildroot}%{_tmpfilesdir}/dmraid.conf + +%preun +%service_del_preun dmraid-activation.service %post +/sbin/ldconfig +%service_add_post dmraid-activation.service [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup %{fillup_only} %postun +/sbin/ldconfig [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup %{insserv_cleanup} -%preun -%stop_on_removal - -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \ - && rm -rf $RPM_BUILD_ROOT - %files %defattr(-, root, root) /sbin/dmraid @@ -137,12 +136,13 @@ %{_mandir}/man8/* %doc LICENSE LICENSE_GPL LICENSE_LGPL README README.SuSE TODO doc/* /var/adm/fillup-templates/sysconfig.dmraid -/etc/init.d/boot.dmraid %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-dmraid.sh /lib/mkinitrd/scripts/boot-dmraid.sh /%{_lib}/libdmraid-events-isw.so /%{_lib}/libdmraid.so.1.0.0.rc16-3 +%{_tmpfilesdir}/dmraid.conf +%{_unitdir}/dmraid-activation.service %changelog ++++++ dmraid-activation.service ++++++ [Unit] Description=Activation of DM RAID sets DefaultDependencies=no Conflicts=shutdown.target After=systemd-udev-settle.service Before=lvm2-activation-early.service cryptsetup.target local-fs.target shutdown.target Wants=systemd-udev-settle.service [Service] EnvironmentFile=-/etc/sysconfig/dmraid ExecStart=/sbin/dmraid -ay -p $DMRAID_START_OPTIONS Type=oneshot [Install] WantedBy=sysinit.target ++++++ dmraid-destdir.patch ++++++ --- 1.0.0.rc16.orig/include/Makefile.in +++ 1.0.0.rc16/include/Makefile.in @@ -17,8 +17,8 @@ include $(top_srcdir)/make.tmpl install_dmraid_headers: $(HEADERS) @echo "Installing $(HEADERS) in $(includedir)/dmraid" - mkdir -p $(includedir)/dmraid - $(INSTALL) $(STRIP) $(HEADERS) $(includedir)/dmraid + mkdir -p $(DESTDIR)$(includedir)/dmraid + $(INSTALL) $(STRIP) $(HEADERS) $(DESTDIR)$(includedir)/dmraid install: install_dmraid_headers --- 1.0.0.rc16.orig/lib/Makefile.in +++ 1.0.0.rc16/lib/Makefile.in @@ -78,16 +78,16 @@ $(LIB_EVENTS_SHARED): install_dmraid_libs: $(INSTALL_TARGETS) @echo "Installing $(INSTALL_TARGETS) in $(libdir)"; \ - mkdir -p $(libdir); \ + mkdir -p $(DESTDIR)$(libdir); \ for f in $(INSTALL_TARGETS); \ do \ n=$$(basename $${f}) ; \ if [[ "$$n" =~ .so$$ && ! "$$n" =~ libdmraid-events-.* ]]; then \ $(INSTALL) -m 555 $(STRIP) \ - $$f $(libdir)/$${n}.@DMRAID_LIB_VERSION@; \ - $(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(libdir)/$${n}; \ + $$f $(DESTDIR)$(libdir)/$${n}.@DMRAID_LIB_VERSION@; \ + $(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(DESTDIR)$(libdir)/$${n}; \ else \ - $(INSTALL) -m 555 $(STRIP) $$f $(libdir)/$${n}; \ + $(INSTALL) -m 555 $(STRIP) $$f $(DESTDIR)$(libdir)/$${n}; \ fi \ done --- 1.0.0.rc16.orig/tools/Makefile.in +++ 1.0.0.rc16/tools/Makefile.in @@ -80,8 +80,8 @@ dmevent_tool: $(top_srcdir)/lib/libdmrai install_dmraid_tools: $(TARGETS) @echo "Installing $(TARGETS) in $(sbindir)"; \ - mkdir -p $(sbindir); \ - $(INSTALL) $(STRIP) $(TARGETS) $(sbindir) + mkdir -p $(DESTDIR)$(sbindir); \ + $(INSTALL) $(STRIP) $(TARGETS) $(DESTDIR)$(sbindir) install: install_dmraid_tools --- 1.0.0.rc16.orig/man/Makefile.in +++ 1.0.0.rc16/man/Makefile.in @@ -17,11 +17,11 @@ include $(top_srcdir)/make.tmpl install_dmraid_man: @echo "Installing $(MAN8) in $(MAN8DIR)"; \ - mkdir -p $(MAN8DIR); \ + mkdir -p $(DESTDIR)$(MAN8DIR); \ for f in $(MAN8); \ do \ $(RM) $(MAN8DIR)/$$f; \ - @INSTALL@ -D -m 444 $$f $(MAN8DIR)/$$f; \ + @INSTALL@ -D -m 444 $$f $(DESTDIR)$(MAN8DIR)/$$f; \ done install: install_dmraid_man -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
