Merge pull request #5450 from daniviga/rpm-fix-epoch

Fix 'epoch' management in rpm spec

rpm/buildrpms.sh

@@ -90,7 +90,7 @@ then
     let relver+=1
     echo "relver=$relver" > version.cfg
   fi
-  timestamp=1
+  timestamp=0
 else
   relver="git$(git rev-parse --short HEAD)"
   timestamp=$(date +'%s')

rpm/qgis.spec.template

@@ -6,6 +6,12 @@
 # - _relver
 # - _timestamp (optional)
 
+%if %{_timestamp} > 0
+%define builddate %(date -d @%{_timestamp} '+%a %b %d %Y')
+%else
+%define builddate %(date '+%a %b %d %Y')
+%endif
+
 Name:           qgis
 Version:        %{_version}
 Release:        %{_relver}%{?dist}
@@ -15,7 +21,7 @@ Group:          Applications/Engineering
 License:        GPLv3+ with exceptions
 URL:            http://www.qgis.org
 
-# Epoch is used when building packages from master, otherwise is set to 1
+# Epoch is used when building packages from master, otherwise is set to 0
 Epoch: %{_timestamp}
 
 Source0:        http://qgis.org/downloads/%{name}-%{version}.tar.bz2
@@ -113,15 +119,15 @@ and USGS ASCII DEM.
 %package devel
 Summary:        Development Libraries for the QGIS
 Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description devel
 Development packages for QGIS including the C header files.
 
 %package grass
 Summary:        GRASS Support Libraries for QGIS
 Group:          Applications/Engineering
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 
 # The plug-in requires more than just the grass-libs.
 # This questions the sense of the libs package.
@@ -141,7 +147,7 @@ Provides: %{name}-python%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-python < %{version}-%{release}
 Summary:        Python integration and plug-ins for QGIS
 Group:          Applications/Engineering
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: gdal-python3
 Requires: python3-future
 Requires: python3-jinja2
@@ -160,7 +166,7 @@ Python integration and plug-ins for QGIS.
 %package server
 Summary:        FCGI-based OGC web map server
 Group:          Applications/Engineering
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:       mod_fcgid
 Provides: mapserver = %{version}-%{release}
 Obsoletes: mapserver < 2.8.1-1
@@ -366,5 +372,5 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
-* %(date -d @%{_timestamp} '+%a %b %d %Y') Daniele Viganò <daniele@vigano.me> %{_version}-%{_relver}
+* %{builddate} Daniele Viganò <daniele@vigano.me> %{_version}-%{_relver}
 - Automatic build