From 2c1469a2d757461bb616052e8addfdaefcd93d8c Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 19 Nov 2013 17:07:27 +0000 Subject: [PATCH] scstadmin: Make it possible to rebuild the RPM git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5129 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/Makefile | 8 ++++---- scstadmin/{scstadmin.spec => scstadmin.spec.in} | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) rename scstadmin/{scstadmin.spec => scstadmin.spec.in} (96%) diff --git a/scstadmin/Makefile b/scstadmin/Makefile index 89e4d19c7..93903c936 100644 --- a/scstadmin/Makefile +++ b/scstadmin/Makefile @@ -139,10 +139,10 @@ rpm: mkdir -p $${rpmtopdir}/$$d; \ done && \ cp $${name}-$(VERSION).tar.bz2 $${rpmtopdir}/SOURCES && \ - rpmbuild --define="%_topdir $${rpmtopdir}" \ - --define="%rpm_version $(VERSION)" \ - --define="%make $(MAKE)" \ - -ba $${name}.spec && \ + sed "s/@rpm_version@/$(VERSION)/g" \ + <$${name}.spec.in >$${name}.spec && \ + MAKE="$(MAKE)" \ + rpmbuild --define="%_topdir $${rpmtopdir}" -ba $${name}.spec && \ rm -f $${name}-$(VERSION).tar.bz2 clean: diff --git a/scstadmin/scstadmin.spec b/scstadmin/scstadmin.spec.in similarity index 96% rename from scstadmin/scstadmin.spec rename to scstadmin/scstadmin.spec.in index 3ad55cf85..aa0d14045 100644 --- a/scstadmin/scstadmin.spec +++ b/scstadmin/scstadmin.spec.in @@ -1,3 +1,6 @@ +%define rpm_version @rpm_version@ +%define make %{expand:%%(echo ${MAKE:-make})} + Name: scstadmin Version: %{rpm_version} Release: 1 @@ -6,7 +9,6 @@ Group: Productivity/Networking/Other License: GPLv2 Vendor: http://scst.sourceforge.net/ URL: http://scst.sourceforge.net/ -BuildRequires: make perl Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build