9:51 a.m.
commit 3bb3e8fc84c87724d5dcedfc9f2f76d8a4594f89
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Mon Jan 25 22:19:40 2021 +0100
New upstream snapshot 2.3.0-0.17.beta.20210126gitf009e06
mixxx.spec | 42 ++++++++++++++++++++++--------------------
sources | 4 ++--
2 files changed, 24 insertions(+), 22 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 4d48d06..0715853 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -10,12 +10,12 @@
%global extraver beta
# Optional: Only used for untagged snapshot versions
-%global gitcommit 18f698dffece85b0897c62f65020704ef2c2aeef
+%global gitcommit f009e06ece3ce55b570a015b17dfb0bb78048453
# Format: <yyyymmdd>
-%global gitcommitdate 20201211
+%global gitcommitdate 20210126
# Additional sources
-%global libkeyfinder_archive v2.2.3.zip
+%global libkeyfinder_archive v2.2.4.zip
%if "%{?gitcommit}" == ""
# (Pre-)Releases
@@ -28,13 +28,13 @@
Name: mixxx
Version: 2.3.0
-Release: 0.16%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 0.17%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
Source0:
https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{sources}....
-# Temporarily rename the libKeyFinder archive for disambiguation while downloading
sources
-Source1:
https://github.com/mixxxdj/libKeyFinder/archive/%{libkeyfinder_archive}#/...
+# Temporarily rename the libkeyfinder archive for disambiguation while downloading
sources
+Source1:
https://github.com/mixxxdj/libkeyfinder/archive/%{libkeyfinder_archive}#/...
# Build Tools
BuildRequires: desktop-file-utils
@@ -108,12 +108,12 @@ echo "#pragma once" > src/build.h
echo "#define BUILD_REV \"%{snapinfo}\"" >> src/build.h
%endif
-# Copy the libKeyFinder archive from the sources folder into the
+# Copy the libkeyfinder archive from the sources folder into the
# dedicated download folder of the build directory. Thereby rename
# the archive back into the original name as expected by the CMake
# build.
-mkdir -p %{__cmake_builddir}/download/libKeyFinder
-cp %{SOURCE1} %{__cmake_builddir}/download/libKeyFinder/%{libkeyfinder_archive}
+mkdir -p %{__cmake_builddir}/download/libkeyfinder
+cp %{SOURCE1} %{__cmake_builddir}/download/libkeyfinder/%{libkeyfinder_archive}
%build
@@ -121,6 +121,7 @@ cp %{SOURCE1}
%{__cmake_builddir}/download/libKeyFinder/%{libkeyfinder_archive}
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DOPTIMIZE=portable \
+ -DINSTALL_USER_UDEV_RULES=ON \
-DWARNINGS_FATAL=ON \
-DBATTERY=ON \
-DBROADCAST=ON \
@@ -152,19 +153,17 @@ desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
res/linux/%{name}.desktop
-# Install custom USB HID permissions
-# - Relocate .rules file
-# - Order custom rules before 70-uaccess.rules
-install -d \
- %{buildroot}%{_udevrulesdir}/
-mv \
- %{buildroot}%{_prefix}%{_sysconfdir}/udev/rules.d/%{name}-usb-uaccess.rules \
+# Install custom USB HID permissions before 70-uaccess.rules
+install -DT \
+ %{buildroot}%{_datadir}/%{name}/udev/rules.d/%{name}-usb-uaccess.rules \
%{buildroot}%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
-# Delete unpackaged files
+
+# Delete unpackaged/unused files and directories
rm -rf \
%{buildroot}%{_prefix}%{_sysconfdir}/ \
- %{buildroot}%{_datadir}/doc/mixxx/
+ %{buildroot}%{_datadir}/doc/ \
+ %{buildroot}%{_datadir}/%{name}/udev/
%check
@@ -178,7 +177,7 @@ rm -rf \
appstream-util \
validate-relax \
--nonet \
- %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+ %{buildroot}%{_metainfodir}/%{name}.metainfo.xml
%files
@@ -188,11 +187,14 @@ appstream-util \
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}_icon.svg
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_metainfodir}/%{name}.metainfo.xml
%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
%changelog
+* Tue Jan 26 2021 Uwe Klotz <uklotz(a)mixxx.org> -
2.3.0-0.17.beta.20210126gitf009e06
+- New upstream snapshot 2.3.0-beta
+
* Fri Jan 1 2021 Leigh Scott <leigh123linux(a)gmail.com> -
2.3.0-0.16.beta.20201211git18f698d
- Rebuilt for new ffmpeg snapshot
diff --git a/sources b/sources
index 6eb1c18..cf69ed8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libKeyFinder_v2.2.3.zip) =
d5eb1c1f00af07689279dd337ec8f2f738eff8658dd7883395275558493784d70ec25924dee35ceae660d9651878fd3e703b02e879f818e6427ecf0f303e15ee
-SHA512 (mixxx-18f698dffece85b0897c62f65020704ef2c2aeef.tar.gz) =
876d272b1b4771528281a918d650bcd781b0a2cd2fdc572b260ec68c6bb6ffe235c2062977fee06f0ac5c5f69819ecae7320f9059eaed18ee4baed3b508f341f
+SHA512 (libkeyfinder_v2.2.4.zip) =
fcdd2a645d2770b62d30d2ee552fcfdd688692754779a1e13a9fd36e705a987a46ff388a094ec6dc4fdb5e58f4fc40efff0492e5ee820ec4962ed96fbb4b5c67
+SHA512 (mixxx-f009e06ece3ce55b570a015b17dfb0bb78048453.tar.gz) =
ac6f9e73bdb9470130f603020b984d275c0653a775d6cbd32ffbc6d384aaf65165cad09f030001b2715b944991429e4173ab4cea26037dcbaea1c0c17299fa55