Version number fixes for RPM packaging

diff --git a/Makefile b/Makefile
index d2e912665b047559f98d25c4b01b27c3bf2a25a8..58047f368b6a6d1e2cf079c890078343d9703ece 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,19 +60,19 @@ ifeq "$(RADIUSD_VERSION)" ""
 
   # Default to an incremental version of 0 if we're not building from git
   RADIUSD_VERSION_INCRM := $(shell git status > /dev/null 2>&1 && git describe --tags --match 'branch_*' --match 'release_*' | cut -d '-' -f 2)
+endif
 
+ifeq "$(RADIUSD_VERSION_INCRM)" ""
+  RADIUSD_VERSION_INCRM := $(shell cat VERSION | cut -d '.' -f 3)
+  PKG_VERSION_SUFFIX :=
   ifeq "$(RADIUSD_VERSION_INCRM)" ""
-    RADIUSD_VERSION_INCRM := $(shell cat VERSION | cut -d '.' -f 3)
-    PKG_VERSION_SUFFIX :=
-    ifeq "$(RADIUSD_VERSION_INCRM)" ""
-      RADIUSD_VERSION_SEP :=
-    else
-      RADIUSD_VERSION_SEP := .
-    endif
+    RADIUSD_VERSION_SEP :=
   else
-    PKG_VERSION_SUFFIX := +git
-    RADIUSD_VERSION_SEP := ~
+    RADIUSD_VERSION_SEP := .
   endif
+else
+  PKG_VERSION_SUFFIX := +git
+  RADIUSD_VERSION_SEP := ~
 endif
 
 PKG_VERSION := $(RADIUSD_VERSION_MAJOR).$(RADIUSD_VERSION_MINOR)$(RADIUSD_VERSION_SEP)$(RADIUSD_VERSION_INCRM)$(PKG_VERSION_SUFFIX)
@@ -418,13 +418,12 @@ freeradius-server-$(PKG_VERSION).tar.bz2: freeradius-server-$(PKG_VERSION).tar
 # high-level targets
 .PHONY: dist-check
 dist-check: redhat/freeradius.spec debian/changelog
-       @if [ `grep ^Version: redhat/freeradius.spec | sed 's/.*://;s/ //'` != "$(PKG_VERSION)" ]; then \
-               cat redhat/freeradius.spec | sed 's/^Version: .*/Version: $(PKG_VERSION)/' > redhat/.foo; \
+       @if [ `grep '^%global _version' redhat/freeradius.spec | cut -d' ' -f3` != "$(PKG_VERSION)" ]; then \
+               sed 's/^%global _version .*/%global _version $(PKG_VERSION)/' redhat/freeradius.spec > redhat/.foo; \
                mv redhat/.foo redhat/freeradius.spec; \
-               echo redhat/freeradius.spec 'Version' needs to be updated; \
-               exit 1; \
+               echo Updated redhat/freeradius.spec '_version' to $(PKG_VERSION); \
        fi
-       @if [ `head -n 1 debian/changelog | sed 's/.*(//;s/-0).*//;s/-1).*//;s/\+.*//'`  != "$(PKG_VERSION)" ]; then \
+       @if [ `head -n 1 debian/changelog | sed 's/.*(//;s/).*//'` != "$(PKG_VERSION)" ]; then \
                echo debian/changelog needs to be updated; \
                exit 1; \
        fi
@@ -473,7 +472,7 @@ rpm: rpmbuild/SOURCES/freeradius-server-$(PKG_VERSION).tar.bz2
                cat rpmbuild/builddep.log; \
                exit 1; \
        fi
-       @cwd=`pwd` && cd redhat && QA_RPATHS=0x0003 rpmbuild --define "_topdir $$cwd/rpmbuild" -bb $(RPMBUILD_FLAGS) freeradius.spec
+       @cwd=`pwd` && cd redhat && QA_RPATHS=0x0003 rpmbuild --define "_topdir $$cwd/rpmbuild" --define "version $(PKG_VERSION)" -bb $(RPMBUILD_FLAGS) freeradius.spec
 
 # Developer checks
 .PHONY: warnings

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index b7a08973bcdd1ced69d13e804ea6e63d29f8c54c..cc94b4b6d973402f22ec1780ddee6fa44cfa2568 100644 (file)
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -4,6 +4,8 @@
 %bcond_with wbclient
 %bcond_without ldap
 
+%global _version 4.0
+
 # Many distributions have extremely old versions of OpenSSL
 # if you'd like to build with the FreeRADIUS openssl packages
 # which are installed in /opt/openssl you should pass
@@ -38,7 +40,7 @@
 
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
-Version: 4.0.0
+Version: %{?version}%{!?version:%{_version}}
 Release: %{?_release}%{!?_release:1}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons