[mixxx] Fix package build and update snapshot

commit 46d35c00e8e011f170ebf54bd2d18871cf6df35f Author: Uwe Klotz <uklotz(a)mixxx.org&gt; Date: Mon Sep 24 00:21:25 2018 +0200 Fix package build and update snapshot .gitignore | 2 +- mixxx.spec | 20 ++++++++++---------- sources | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) --- diff --git a/.gitignore b/.gitignore index 0a24db4..735d94b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ mixxx-1.11.0-src.tar.gz /mixxx-release-2.1.2.0.tar.gz /mixxx-release-2.1.3.tar.gz /mixxx-release-2.1.4.tar.gz -/mixxx-637ed7635a36872393fc9cbe183a98c39ab2fc2a.tar.gz +/mixxx-33e0cc33ee840d0b6c24ffa8f753b2b3e8ae5c34.tar.gz diff --git a/mixxx.spec b/mixxx.spec index e224313..07882ad 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -2,9 +2,9 @@ %global extraver beta # Optional: Only used for untagged snapshot versions -%global gitcommit 637ed7635a36872393fc9cbe183a98c39ab2fc2a +%global gitcommit 33e0cc33ee840d0b6c24ffa8f753b2b3e8ae5c34 # Format: <yyyymmdd> -%global gitcommitdate 20180923 +%global gitcommitdate 20180924 %if "%{?gitcommit}" == "" # (Pre-)Releases @@ -126,8 +126,8 @@ scons %{?_smp_mflags} \ install # Install udev rule -install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir} -install -p -m 0644 res/linux/mixxx.usb.rules ${RPM_BUILD_ROOT}/%{_udevrulesdir}/90-mixxx.usb.rules +install -d ${RPM_BUILD_ROOT}%{_udevrulesdir} +install -p -m 0644 res/linux/mixxx.usb.rules ${RPM_BUILD_ROOT}%{_udevrulesdir}/90-mixxx.usb.rules desktop-file-install \ --vendor "" \ @@ -138,7 +138,7 @@ desktop-file-install \ appstream-util \ validate-relax \ --nonet \ - $RPM_BUILD_ROOT/%{_datadir}/appdata/%{name}.appdata.xml + $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml # Remove docdir rm -rf $RPM_BUILD_ROOT%{_docdir} @@ -148,18 +148,18 @@ rm -rf $RPM_BUILD_ROOT%{_docdir} %license COPYING LICENSE %doc Mixxx-Manual.pdf README README.md %{_bindir}/%{name} -%{_datadir}/%{name}/ -%{_udevrulesdir}/90-mixxx.usb.rules %{_libdir}/%{name}/ +%{_datadir}/%{name}/ %{_datadir}/applications/mixxx.desktop -%{_datadir}/pixmaps/mixxx-icon.png +%{_datadir}/pixmaps/mixxx_icon.svg %{_datadir}/appdata/%{name}.appdata.xml +%{_udevrulesdir}/90-mixxx.usb.rules %changelog -* Sun Sep 23 2018 Uwe Klotz <uklotz(a)mixxx.org&gt; - 2.2.0-0.1.beta.20180923git637ed76 +* Mon Sep 24 2018 Uwe Klotz <uklotz(a)mixxx.org&gt; - 2.2.0-0.1.beta.20180924git33e0cc3 - 1st upstream beta test release for 2.2.0 -- Update dependencies from Qt 4 to Qt 5 +- Update build and dependencies from Qt 4 to Qt 5 - Add support for QtKeychain to store broadcasting credentials * Thu Sep 06 2018 Uwe Klotz <uklotz(a)mixxx.org&gt; - 2.1.4-1 diff --git a/sources b/sources index 9e5d538..e8c95e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1609d7825e6884c6e2915131b6195d77 mixxx-637ed7635a36872393fc9cbe183a98c39ab2fc2a.tar.gz +90a736116c1e3a44c69f22dac08b1d05 mixxx-33e0cc33ee840d0b6c24ffa8f753b2b3e8ae5c34.tar.gz