Provide rpm build target

Makes creating an RPM package easy.

Signed-off-by: Keith Busch <keith.busch@intel.com>

diff --git a/Makefile b/Makefile
index bbb65ab3b47535eceed240f0d0ee0882278dc5d0..b89ad7fd1d124d468c34aa4668d8f493ec4f6217 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,11 @@ DESTDIR =
 PREFIX := /usr/local
 SBINDIR = $(PREFIX)/sbin
 LIBUDEV:=$(shell ld -ludev > /dev/null 2>&1 ; echo $$?)
+
+RPMBUILD = rpmbuild
+TAR = tar
+RM = rm -f
+
 ifeq ($(LIBUDEV),0)
        LDFLAGS += -ludev
        CFLAGS  += -DLIBUDEV_EXISTS
@@ -44,7 +49,7 @@ doc: $(NVME)
 all: doc
 
 clean:
-       rm -f $(NVME) *.o *~ a.out NVME-VERSION-FILE
+       rm -f $(NVME) *.o *~ a.out NVME-VERSION-FILE *.tar* nvme.spec version
        $(MAKE) -C Documentation clean
 
 clobber: clean
@@ -59,4 +64,17 @@ install-bin: default
 
 install: install-bin install-man
 
-.PHONY: default all doc clean clobber install install-bin install-man FORCE
+nvme.spec: nvme.spec.in NVME-VERSION-FILE
+       sed -e 's/@@VERSION@@/$(NVME_VERSION)/g' < $< > $@+
+       mv $@+ $@
+
+dist: nvme.spec
+       git archive --format=tar --prefix=nvme-$(NVME_VERSION)/ HEAD > nvme-$(NVME_VERSION).tar
+       @echo $(NVME_VERSION) > version
+       $(TAR) rf  nvme-$(NVME_VERSION).tar nvme.spec version
+       gzip -f -9 nvme-$(NVME_VERSION).tar
+
+rpm: dist
+       $(RPMBUILD) -ta nvme-$(NVME_VERSION).tar.gz
+
+.PHONY: default all doc clean clobber install install-bin install-man rpm FORCE

diff --git a/NVME-VERSION-GEN b/NVME-VERSION-GEN
index dd97433c1e249999abab094321efaf91e580cf1a..adaa1f47cdcc665e022cf7f8764bbbc20f4bf3b7 100755 (executable)
--- a/NVME-VERSION-GEN
+++ b/NVME-VERSION-GEN
@@ -21,7 +21,7 @@ elif test -d .git -o -f .git &&
                VN="$VN-dirty" ;;
        esac
 then
-       VN=$VN
+       VN=$(echo "$VN" | sed -e 's/-/./g');
 else
        VN="$DEF_VER"
 fi

diff --git a/nvme.spec.in b/nvme.spec.in
new file mode 100644 (file)
index 0000000..3a4f488
--- /dev/null
+++ b/nvme.spec.in
@@ -0,0 +1,37 @@
+Name:          nvme
+Version:       @@VERSION@@
+Release:       1%{?dist}
+Summary:       Core nvme tools
+License:       GPL
+Group:                 Development/Tools
+URL:           https://github.com/linux-nvme/nvme-cli/
+Source:        nvme-@@VERSION@@.tar.gz
+Provides:      nvme
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+
+%description
+NVMe is a fast, scalable, direct attached storage interface. The nvme
+cli rpm installs core management tools with minimal dependencies.
+
+%prep
+%setup
+
+%build
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install PREFIX=%{buildroot}/usr
+
+%files
+%defattr(-,root,root)
+%doc Documentation/nvme*.1
+%{_sbindir}/nvme
+%{_mandir}/man1/nvme*.1*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Thu Oct 15 2015 Keith Busch <keith.busch@intel.com>
+- Initial RPM spec