commit 38a8b5239256e2b9abaa9ce24c68a059b42fd919 Author: Uwe Klotz <uklotz(a)mixxx.org&gt; Date: Tue Apr 10 14:06:23 2018 +0200 Update to (inofficial) 2.1.0-rc1 snapshot - Remove pkgrel macro - Fix distinction between snapshots and releases .gitignore | 1 + mixxx.spec | 32 ++++++++++++++++++-------------- sources | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) --- diff --git a/.gitignore b/.gitignore index e9f05fa..8c2442a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ mixxx-1.11.0-src.tar.gz /mixxx-2.0.0-src.tar.gz /mixxx-22f78d299961a1b3910b80f161391a181b18265a.tar.gz /mixxx-f77cf966288ee481fb7f17cc56bed830b7137f54.tar.gz +/mixxx-66028ddb1a16722285fcc999c2e7170c446b7c03.tar.gz diff --git a/mixxx.spec b/mixxx.spec index e9e51b2..a4c9173 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -1,26 +1,25 @@ -# Manually modified with every package release -%global pkgrel 0.3 +# Optional: Package version suffix for pre-releases, e.g. "beta1", "beta2", "rc1", ... +#global extraver rc1 -# Package version suffix: <undefined>, beta1, beta2, rc1, ... -#global extraver +# Optional: Only for untagged snapshot versions +%global gitcommit 66028ddb1a16722285fcc999c2e7170c446b7c03 +# Format: <yyyymmdd> +%global gitcommitdate 20180407 -# Only for untagged snapshot versions -%global gitcommit f77cf966288ee481fb7f17cc56bed830b7137f54 -# <yyyymmdd> -%global gitcommitdate 20180404 - -%if %{gitcommit} -%global snapinfo %{?gitcommit:%{gitcommitdate}git%{?gitcommit:%(c=%{gitcommit}; echo ${c:0:7})}} -%global sources %{gitcommit} +%if "%{?gitcommit}" == "" +# (Pre-)Releases +%global sources release-%{version}%{?extraver:-%{extraver}} %else -%global sources release-%{version}%{?extraver:-%{extraver}}} +# Snapshots +%global sources %{gitcommit} +%global snapinfo %{?gitcommit:%{?gitcommitdate}git%{?gitcommit:%(c=%{gitcommit}; echo ${c:0:7})}} %endif %bcond_with libgpod Name: mixxx Version: 2.1.0 -Release: %{pkgrel}%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist} +Release: 0.4%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist} Summary: Mixxx is open source software for DJ'ing Group: Applications/Multimedia License: GPLv2+ @@ -152,6 +151,11 @@ rm -rf $RPM_BUILD_ROOT%{_docdir} %changelog +* Tue Apr 10 2018 Uwe Klotz <uklotz(a)mixxx.org&gt; - 2.1.0-0.4.20180407git66028dd +- Update to (inofficial) 2.1.0-rc1 snapshot +- Remove pkgrel macro +- Fix distinction between snapshots and releases + * Wed Apr 04 2018 Uwe Klotz <uklotz(a)mixxx.org&gt; - 2.1.0-0.3.20180404gitf77cf96 - Update to 2.1 snapshot - Add support for Opus, WavPack, and Mod tracker files diff --git a/sources b/sources index 0db623f..85e14f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -642b84524728f80bd16015a8f5ddc7af mixxx-f77cf966288ee481fb7f17cc56bed830b7137f54.tar.gz +2d157cdf8a4cf019f3b6028e449224bc mixxx-66028ddb1a16722285fcc999c2e7170c446b7c03.tar.gz