update to 1.4.5.1

Author: Bart Sjerps

asmdisks.spec

@@ -1,7 +1,7 @@
 Name:		asmdisks
 Summary:	Replacement for Oracle ASMLib using UDEV
-Version:	1.4.5
-Release:	1%{?prerel:.~%prerel}
+Version:	1.4.5.1
+Release:	1%{?dtap}
 BuildArch:	noarch
 License:	GPLv3+
 Group:		Outrun/Extras
@@ -17,23 +17,26 @@ It is an alternative to Oracle ASMLib.
 You can use a combination of entire disks, partitions or mapper
 (including multipath) devices to configure as block devices for
 Oracle ASM (or other purposes such as destructive IOPS performance testing)
-Also supports EMC Powerpath and EMC DSSD volumes.
+Also supports DellEMC Powerpath (emcpower) and DellEMC ScaleIO (scini) volumes.
+
 %prep
 %setup -q -n %{name}
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
 
 %make_install
 
+install -m 0755 -d %{buildroot}/usr/bin
+
+install -m 0755 -pt %{buildroot}/usr/bin bin/*
+
 %files
 %defattr(0444,root,root)
-%doc /usr/share/doc/%{name}/COPYING
-%doc /usr/share/doc/%{name}/README
+%doc /usr/share/doc/%{name}/*
 %defattr(0644,root,root)
 /etc/bash_completion.d/asm.bash
-/usr/share/man/man1/*.gz
+/usr/share/man/man1/*
 %defattr(0755,root,root)
 /usr/bin/asm
 /usr/bin/asmstat

src/CHANGELOG

@@ -0,0 +1,38 @@
+* Wed Nov 07 Bart Sjerps <bart@outrun.nl> 1.4.5.1
+- List of changes to asm:
+
+2018-11-07 : Change rpmbuild process, added docs
+2018-08-20 : Embedded manpage, removed DSSD support
+2018-04-06 : Add $PATH to support remote and scripted execution
+2017-12-14 : Bugfix for import function
+2017-10-04 : Bugfix for SCSI id's with whitespace (Linux TGTD)
+2017-09-13 : AWK Bugfix for SCSI id's starting with '0'
+2017-03-14 : ScaleIO support
+2017-01-30 : bugfix for rename
+2016-11-09 : DSSD udev bugfix
+2016-10-19 : Overhaul, many fixes and improvements
+2016-09-11 : EL7 support, bootdisk detection & tempdir usage
+2016-08-18 : Added EMC DSSD support, output for larger volume sizes
+2015-03-10 : Support for EMC Powerpath
+2015-03-05 : Rewrite of listdisks & create, added multi option
+2015-02-24 : Added TAB separator option for scripting, small bugfix
+2014-11-06 : Added import, rename and -h/-? option
+2014-10-22 : Created
+
+- List of changes to asmstat:
+2018-11-07 : Change man pages, build process
+2016-10-20 : Minor update
+2015-03-08 : Fixed alignment
+2014-10-24 : Updated template
+2014-05-02 : Created
+
+- List of changes to diskheader:
+2018-11-07 : Change man pages, build process
+2017-02-01 : First version
+
+- List of changes to wipedisk:
+2018-11-07 : Change man pages, build process
+2016-10-20 : Update
+2014-10-27 : Bugfix, added nowait
+2014-10-22 : Created
+

src/doc/COPYING renamed to src/COPYING

@@ -1,40 +1,43 @@
-#============================================================================
-# Title       : Makefile
-# Description : Makefile for asmdisks
-# Author      : Bart Sjerps <bart@outrun.nl>
-# License     : GPLv3+
-# ---------------------------------------------------------------------------
+# Makefile for Outrun RPM packages - called by rpmbuild %make_install
+# It installs doc files, man pages and the file/dir structure under ./files
+
 NAME      := $(RPM_PACKAGE_NAME)
-VERSION    = $(shell rpm -q --qf '%{version}\n' --specfile ../$(NAME).spec)
-SRCDIR     = $(shell rpm --eval %_sourcedir)
+VERSION   := $(shell rpm -q --qf '%{version}\n' --specfile ../$(NAME).spec)
+SRCDIR    := $(shell rpm --eval %_sourcedir)
 
 files     := $(shell find files/ -type f | cut -d/ -f2-)
 dirs      := $(shell find files/ -type d | cut -d/ -f2-)
 
-man1       = $(wildcard bin/*)
-man8       = $(wildcard sbin/*)
+man1dir   := $(DESTDIR)/usr/share/man/man1
+man5dir   := $(DESTDIR)/usr/share/man/man5
+man7dir   := $(DESTDIR)/usr/share/man/man7
+man8dir   := $(DESTDIR)/usr/share/man/man8
 
-man1dir    = $(DESTDIR)/usr/share/man/man1
-man8dir    = $(DESTDIR)/usr/share/man/man8
+.PHONY: all doc man files
 
-.PHONY: all install man
+default: all
 
-all:
+doc:
+	install -m 0755 -d $(DESTDIR)/usr/share/doc/$(NAME)
+	test -f COPYING   && install -m 0644 -pt $(DESTDIR)/usr/share/doc/$(NAME) COPYING   || true
+	test -f CHANGELOG && install -m 0644 -pt $(DESTDIR)/usr/share/doc/$(NAME) CHANGELOG || true
+	test -f README    && install -m 0644 -pt $(DESTDIR)/usr/share/doc/$(NAME) README    || true
 
 man:
-	install -m 0755 -d $(man1dir)
-	install -m 0755 -d $(man8dir)
-	$(foreach exe,$(man1),$(exe) --mandump > $(man1dir)/$(notdir $(exe)).1 ;echo mandump $(exe);)
-	$(foreach exe,$(man8),$(exe) --mandump > $(man8dir)/$(notdir $(exe)).8 ;echo mandump $(exe);)
-	find $(man1dir) $(man8dir) -type f | xargs -L1 gzip
-
-install: man
-	install -d 0755 $(DESTDIR)/usr/bin
-	install -d 0755 $(DESTDIR)/usr/share/doc/asmdisks
-	
-	install -m 0755 -pt $(DESTDIR)/usr/bin bin/*
-	install -m 0755 -pt $(DESTDIR)/usr/share/doc/asmdisks doc/*
+	install -m 0755 -d $(man1dir) $(man5dir) $(man7dir) $(man8dir)
 
+	test -d man1 && find man1 -type f | xargs install -m 0644 -pt $(man1dir) || true
+	test -d man5 && find man5 -type f | xargs install -m 0644 -pt $(man5dir) || true
+	test -d man7 && find man7 -type f | xargs install -m 0644 -pt $(man7dir) || true
+	test -d man8 && find man8 -type f | xargs install -m 0644 -pt $(man8dir) || true
+
+	find $(DESTDIR)/usr/share/man -type f ! -name "*.gz" | xargs -I% gzip %
+
+all:
+
+files:
 	for d in $(dirs); do install -m 0755 -d $(DESTDIR)/$$d ; done
 	for f in $(files); do install -m 0644 -pt $(DESTDIR)/$$(dirname $$f)/ files/$$f ; done
 
+install: man doc files
+