[mixxx] Update build requirements and options
by Uwe Klotz
commit 4d28d096cb1060dbb3b8674aa0a64ef623cc0b0a
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Apr 11 14:28:45 2018 +0200
Update build requirements and options
Switch from debug to release build
Enable USB HID and bulk support
Remove obsolete/redundant/unused build requirements
Remove obsolete lower version boundaries from build requirements
mixxx.spec | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 file changed, 34 insertions(+), 25 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 88ac66c..545cba1 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -15,30 +15,30 @@
%global snapinfo %{?gitcommit:%{?gitcommitdate}git%{?gitcommit:%(c=%{gitcommit}; echo ${c:0:7})}}
%endif
-%bcond_with libgpod
-
Name: mixxx
Version: 2.1.0
-Release: 0.5%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 0.6%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.mixxx.org
Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{name}-%{s...
-#Build tools
+# Build Tools
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: protobuf-compiler
BuildRequires: python2-scons
-#Mandatory Requirements
-BuildRequires: alsa-lib-devel >= 1.0.10
+# Build Requirements
BuildRequires: faad2-devel
-BuildRequires: ffmpeg-devel
+# 2018-04-11 uklotzde: FFmpeg support has been disabled temporarily
+# due to incompatibilities causing build errors in rawhide/f29
+# See below: SCons build option ffmpeg=0/1
+#BuildRequires: ffmpeg-devel
BuildRequires: fftw-devel
BuildRequires: flac-devel
-#BuildRequires: jack-audio-connection-kit-devel >= 0.61.0 #jack seems deprecated to portaudio
+BuildRequires: hidapi-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libchromaprint-devel
@@ -48,34 +48,28 @@ BuildRequires: libmodplug-devel
BuildRequires: libmp4v2-devel
BuildRequires: libshout-devel
BuildRequires: libsndfile-devel
-BuildRequires: libusb1-devel
+BuildRequires: libusbx-devel
BuildRequires: libvorbis-devel
BuildRequires: opus-devel
BuildRequires: opusfile-devel
BuildRequires: portaudio-devel
BuildRequires: portmidi-devel
BuildRequires: protobuf-devel
-BuildRequires: qt4-devel >= 4.3
+BuildRequires: qt4-devel
BuildRequires: rubberband-devel
BuildRequires: sqlite-devel
BuildRequires: taglib-devel
BuildRequires: upower-devel
BuildRequires: wavpack-devel
-#Bundled Requirements
+# Bundled Requirements
+# The following essential libraries for audio processing are
+# currently bundled and statically linked to avoid unexpected
+# behavior due to version differences.
#BuildRequires: libebur128-devel
#BuildRequires: soundtouch-devel
#BuildRequires: vamp-plugin-sdk-devel
-#Optional Requirements
-#BuildRequires: python-devel
-#BuildRequires: lua-devel, tolua++-devel
-%{?with_libgpod:BuildRequires: libgpod-devel}
-
-# workaround to use phonon-backend-gstreamer instead of phonon-backend-vlc since phonon-backend-vlc
-# is broken in rpmfusion currently
-BuildRequires: phonon-backend-gstreamer
-
%description
Mixxx is open source software for DJ'ing. You can use
@@ -88,9 +82,14 @@ MIDI and HID devices.
%prep
%autosetup -p1 -n %{name}-%{sources}
-
-# TODO remove bundle libs?
-#rm -rf lib/libebur128* lib/soundtouch* lib/vamp lib/xwax lib/gmock* lib/gtest*
+# TODO: Remove bundled libs before build?
+#rm -rf \
+# lib/gmock* \
+# lib/gtest* \
+# lib/libebur128* \
+# lib/soundtouch* \
+# lib/vamp \
+# lib/xwax \
%build
@@ -100,9 +99,13 @@ export LIBDIR=%{_libdir}
scons %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt4_prefix} \
+ build=release \
optimize=portable \
+ qdebug=1 \
+ bulk=1 \
faad=1 \
ffmpeg=0 \
+ hid=1 \
modplug=1 \
opus=1 \
shoutcast=1 \
@@ -114,9 +117,8 @@ export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
scons %{?_smp_mflags} \
- install_root=$RPM_BUILD_ROOT%{_prefix} \
- qtdir=%{_qt4_prefix} \
prefix=%{_prefix} \
+ install_root=$RPM_BUILD_ROOT%{_prefix} \
install
# Install udev rule
@@ -151,6 +153,13 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Wed Apr 11 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.0-0.6.rc1
+- Update build requirements and options
+- Switch from debug to release build
+- Enable USB HID and bulk support
+- Remove obsolete/redundant/unused build requirements
+- Remove obsolete lower version boundaries from build requirements
+
* Tue Apr 10 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.0-0.5.rc1
- Update to 2.1.0-rc1 pre-release version
6 years, 7 months
[rpmfusion-free-obsolete-packages] Add gmediafinder (rfbz #4862)
by Leigh Scott
commit f6389af173e18df6205b3d81a7c8bc109c1db140
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Apr 11 07:19:06 2018 +0100
Add gmediafinder (rfbz #4862)
rpmfusion-free-obsolete-packages.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/rpmfusion-free-obsolete-packages.spec b/rpmfusion-free-obsolete-packages.spec
index 0589d06..599ab2f 100644
--- a/rpmfusion-free-obsolete-packages.spec
+++ b/rpmfusion-free-obsolete-packages.spec
@@ -1,6 +1,6 @@
Name: rpmfusion-free-obsolete-packages
Version: 28
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A package to obsolete retired packages from rpmfusion-free
License: MIT
@@ -35,6 +35,9 @@ Obsoletes: m2vmp2cut < 0.86-9
# Last build subtitleripper-0.3-11.fc28
Provides: subtitleripper = 0.3-12
Obsoletes: subtitleripper < 0.3-12
+# Last build gmediafinder-1.5.1-10.694694c.fc28
+Provides: gmediafinder = 1.5.1-11.694694c
+Obsoletes: gmediafinder < 1.5.1-11.694694c
%description
This package exists only to obsolete other packages which need to be removed
@@ -54,6 +57,9 @@ cp -p %{SOURCE0} .
%doc README
%changelog
+* Wed Apr 11 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 28-4
+- Add gmediafinder (rfbz #4862)
+
* Mon Apr 09 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 28-3
- Add transcode, DVDAuthorWizard, DVDRipOMatic, m2vmp2cut and subtitleripper
6 years, 7 months
[gmediafinder] The maintainer has made no effect to fix or retire broken package
by Leigh Scott
commit 23b2d9c09b979ba2b26093053e674074d93482ca
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Apr 11 07:12:30 2018 +0100
The maintainer has made no effect to fix or retire broken package
.gitignore | 1 -
dead.package | 1 +
gmediafinder.spec | 174 ------------------------------------------------------
sources | 1 -
4 files changed, 1 insertion(+), 176 deletions(-)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..7fb1fd2
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+The maintainer has made no effect to fix or retire broken package
6 years, 7 months
[HandBrake] Update to 1.1.0
by Dominik Mierzejewski
Summary of changes:
5f25756... Update to 1.1.0 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[HandBrake/f28] Update to 1.1.0
by Dominik Mierzejewski
commit 5f2575602c5a8990ac5db5cd289e51d6201a2534
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Apr 10 19:31:33 2018 +0200
Update to 1.1.0
Update source and signature URLs
Drop obsolete patches
Bump FFmpeg version requirement to 3.5+ due to AV_PKT_FLAG_DISPOSABLE API use
.gitignore | 2 +
HandBrake-add_ppc64le.patch | 16 ---
HandBrake-system-OpenCL.patch | 36 ------
HandBrake.spec | 28 +++--
ffmpeg35_buildfix.patch | 260 ------------------------------------------
sources | 4 +-
6 files changed, 17 insertions(+), 329 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e1739f..2ea11bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/HandBrake-1.0.3.tar.bz2
/HandBrake-1.0.7.tar.bz2
/HandBrake-1.0.7.tar.bz2.sig
+/HandBrake-1.1.0-source.tar.bz2
+/HandBrake-1.1.0-source.tar.bz2.sig
diff --git a/HandBrake-system-OpenCL.patch b/HandBrake-system-OpenCL.patch
index 47ff9b1..23e17b4 100644
--- a/HandBrake-system-OpenCL.patch
+++ b/HandBrake-system-OpenCL.patch
@@ -10,39 +10,3 @@ diff -up HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/internal.h.cl
#ifdef USE_QSV
#include "qsv_libav.h"
#endif
-diff -up HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/opencl.h.cl HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/opencl.h
---- HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/opencl.h.cl 2017-01-19 15:01:20.000000000 +0100
-+++ HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/opencl.h 2017-01-20 11:51:28.511218948 +0100
-@@ -10,7 +10,7 @@
- #ifndef HB_OPENCL_H
- #define HB_OPENCL_H
-
--#include "extras/cl.h"
-+#include <CL/cl.h>
- #include "openclwrapper.h"
-
- // we only support OpenCL 1.1 or later
-diff -up HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.c.cl HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.c
---- HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.c.cl 2017-01-19 15:01:20.000000000 +0100
-+++ HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.c 2017-01-20 11:51:28.511218948 +0100
-@@ -13,7 +13,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "extras/cl.h"
-+#include <CL/cl.h>
- #include "opencl.h"
- #include "openclwrapper.h"
- #include "openclkernels.h"
-diff -up HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.h.cl HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.h
---- HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.h.cl 2017-01-19 15:01:20.000000000 +0100
-+++ HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.h 2017-01-20 11:51:28.511218948 +0100
-@@ -15,7 +15,7 @@
- #define HB_OPENCL_WRAPPER_H
-
- #include "common.h"
--#include "extras/cl.h"
-+#include <CL/cl.h>
-
- //support AMD opencl
- #define CL_QUEUE_THREAD_HANDLE_AMD 0x403E
diff --git a/HandBrake.spec b/HandBrake.spec
index b0d03f1..ff0a628 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -1,5 +1,5 @@
-%global commit0 91ed34ff38d46f389e841c46fe27b7cbfed8467c
-%global date 20170409
+%global commit0 b463d33a4ed4c9da5fb6432e7fb7e08422fc1aad
+%global date 20180405
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global tag %{version}
@@ -16,15 +16,15 @@
%global desktop_id fr.handbrake.ghb
Name: HandBrake
-Version: 1.0.7
-Release: 14%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
+Version: 1.1.0
+Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: http://handbrake.fr/
%if 0%{?tag:1}
-Source0: https://handbrake.fr/mirror/%{name}-%{version}.tar.bz2
-Source1: https://github.com/HandBrake/HandBrake/releases/download/%{version}/%{nam...
+Source0: https://download2.handbrake.fr/%{version}/%{name}-%{version}-source.tar.bz2
+Source1: https://github.com/HandBrake/HandBrake/releases/download/%{version}/%{nam...
# import from https://handbrake.fr/openpgp.php or https://github.com/HandBrake/HandBrake/wiki/OpenPGP
# gpg2 --export --export-options export-minimal 1629C061B3DDE7EB4AE34B81021DB8B44E4A8645 > gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg
Source2: gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg
@@ -35,8 +35,6 @@ Source0: https://github.com/%{name}/%{name}/archive/%{commit0}.tar.gz#/%{
%{?_without_ffmpeg:Source10: https://libav.org/releases/libav-12.tar.gz}
-# add ppc64le to configure.guess
-Patch0: %{name}-add_ppc64le.patch
# Build with unpatched libbluray (https://github.com/HandBrake/HandBrake/pull/458)
# can be dropped with libbluray-1.0.0
Patch1: %{name}-no_clip_id.patch
@@ -48,16 +46,12 @@ Patch3: %{name}-nostrip.patch
Patch4: %{name}-no-libva.patch
# Fix SubRip subtitle issue when built with FFmpeg
Patch5: https://trac.ffmpeg.org/raw-attachment/ticket/6304/handbrake_subrip.patch
-# ffmpeg35_buildfix.patch is taken from these upstream commits
-# https://github.com/HandBrake/HandBrake/commit/532f067cca2113ea289282ea57e...
-# https://github.com/HandBrake/HandBrake/commit/f002cf7ad405b93c5bc52e3f12c...
-Patch6: ffmpeg35_buildfix.patch
BuildRequires: a52dec-devel >= 0.7.4
BuildRequires: cmake
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
-%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel >= 2.6}
+%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel >= 3.5}
# Should be >= 2.6:
BuildRequires: freetype-devel >= 2.4.11
# Should be >= 0.19.7:
@@ -133,7 +127,6 @@ This package contains the main program with a graphical interface.
gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%endif
%setup -q %{!?tag:-n %{name}-%{commit0}}
-%patch0 -p1
%if 0%{?fedora} <= 25
%patch1 -p1
%endif
@@ -141,7 +134,6 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%patch3 -p1
%patch4 -p1
%{!?_without_ffmpeg:%patch5 -p1}
-%patch6 -p1
mkdir -p download
%{?_without_ffmpeg:cp -p %{SOURCE10} download}
@@ -239,6 +231,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/HandBrakeCLI
%changelog
+* Mon Apr 09 2018 Dominik Mierzejewski <rpm(a)greysector.net> - 1.1.0-1
+- Update to 1.1.0
+- Update source and signature URLs
+- Drop obsolete patches
+- Bump FFmpeg version requirement to 3.5+ due to AV_PKT_FLAG_DISPOSABLE API use
+
* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.0.7-14
- Rebuilt for new ffmpeg snapshot
diff --git a/sources b/sources
index 893693d..97970ec 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bf39fcc56a82ccca32a9faac8fa633f5 HandBrake-1.0.7.tar.bz2
-116cb450ac21b8ff6ccf55a72160ae35 HandBrake-1.0.7.tar.bz2.sig
+5d77fd9207623da1d9068f4026cd91f3 HandBrake-1.1.0-source.tar.bz2
+32f3ac2f2b433190ed595e98928e7e6f HandBrake-1.1.0-source.tar.bz2.sig
6 years, 7 months
[mixxx/f28] (5 commits) ...Update to 2.1.0-rc1 pre-release version
by Uwe Klotz
Summary of changes:
61c3c47... Update to 2.1 snapshot (*)
0c28438... Disable FFmpeg (*)
fa5d31b... Re-add missing dist macro (*)
38a8b52... Update to (inofficial) 2.1.0-rc1 snapshot (*)
9b3db1d... Update to 2.1.0-rc1 pre-release version (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[mixxx] Update to 2.1.0-rc1 pre-release version
by Uwe Klotz
commit 9b3db1d0d2ba95b1ee2a42748ac9aa26ea36f070
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Tue Apr 10 16:05:35 2018 +0200
Update to 2.1.0-rc1 pre-release version
.gitignore | 1 +
mixxx.spec | 13 ++++++++-----
sources | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c2442a..dd21b3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ mixxx-1.11.0-src.tar.gz
/mixxx-22f78d299961a1b3910b80f161391a181b18265a.tar.gz
/mixxx-f77cf966288ee481fb7f17cc56bed830b7137f54.tar.gz
/mixxx-66028ddb1a16722285fcc999c2e7170c446b7c03.tar.gz
+/mixxx-release-2.1.0-rc1.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index a4c9173..88ac66c 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -1,10 +1,10 @@
# Optional: Package version suffix for pre-releases, e.g. "beta1", "beta2", "rc1", ...
-#global extraver rc1
+%global extraver rc1
-# Optional: Only for untagged snapshot versions
-%global gitcommit 66028ddb1a16722285fcc999c2e7170c446b7c03
+# Optional: Only used for untagged snapshot versions
+#global gitcommit 66028ddb1a16722285fcc999c2e7170c446b7c03
# Format: <yyyymmdd>
-%global gitcommitdate 20180407
+#global gitcommitdate 20180407
%if "%{?gitcommit}" == ""
# (Pre-)Releases
@@ -19,7 +19,7 @@
Name: mixxx
Version: 2.1.0
-Release: 0.4%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 0.5%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
@@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Tue Apr 10 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.0-0.5.rc1
+- Update to 2.1.0-rc1 pre-release version
+
* Tue Apr 10 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.0-0.4.20180407git66028dd
- Update to (inofficial) 2.1.0-rc1 snapshot
- Remove pkgrel macro
diff --git a/sources b/sources
index 85e14f8..73d8120 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d157cdf8a4cf019f3b6028e449224bc mixxx-66028ddb1a16722285fcc999c2e7170c446b7c03.tar.gz
+ea196f49e7637c85c1c3b0938639b19f mixxx-release-2.1.0-rc1.tar.gz
6 years, 7 months
[mixxx] Update to (inofficial) 2.1.0-rc1 snapshot
by Uwe Klotz
commit 38a8b5239256e2b9abaa9ce24c68a059b42fd919
Author: Uwe Klotz <uklotz(a)mixxx.org>
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> - 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> - 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
6 years, 7 months