sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix epoch management in rpm spec 'Requires'

Browse Source
This commit is contained in:
Daniele Viganò 2017-10-25 08:39:42 +02:00
parent ceb31fa45b
commit fac6543458
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpm/buildrpms.sh
View File

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

10
rpm/qgis.spec.template
View File

@ -15,7 +15,7 @@ Group: Applications/Engineering
License: GPLv3+ with exceptions License: GPLv3+ with exceptions
URL: http://www.qgis.org 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} Epoch: %{_timestamp}
Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2
@ -113,7 +113,7 @@ and USGS ASCII DEM.
%package devel %package devel
Summary: Development Libraries for the QGIS Summary: Development Libraries for the QGIS
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
%description devel %description devel
Development packages for QGIS including the C header files. Development packages for QGIS including the C header files.
@ -121,7 +121,7 @@ Development packages for QGIS including the C header files.
%package grass %package grass
Summary: GRASS Support Libraries for QGIS Summary: GRASS Support Libraries for QGIS
Group: Applications/Engineering Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
# The plug-in requires more than just the grass-libs. # The plug-in requires more than just the grass-libs.
# This questions the sense of the libs package. # This questions the sense of the libs package.
@ -141,7 +141,7 @@ Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release}
Summary: Python integration and plug-ins for QGIS Summary: Python integration and plug-ins for QGIS
Group: Applications/Engineering Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Requires: gdal-python3 Requires: gdal-python3
Requires: python3-future Requires: python3-future
Requires: python3-jinja2 Requires: python3-jinja2
@ -160,7 +160,7 @@ Python integration and plug-ins for QGIS.
%package server %package server
Summary: FCGI-based OGC web map server Summary: FCGI-based OGC web map server
Group: Applications/Engineering Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Requires: mod_fcgid Requires: mod_fcgid
Provides: mapserver = %{version}-%{release} Provides: mapserver = %{version}-%{release}
Obsoletes: mapserver < 2.8.1-1 Obsoletes: mapserver < 2.8.1-1