[ffmpeg] Apply path conditionally
by Nicolas Chauvet
commit efbf2d7bcac45a7d823998dc5138afcbab81fe48
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Nov 10 13:36:24 2018 +0100
Apply path conditionally
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 2de14bb..2769497 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -323,7 +323,7 @@ mkdir -p _doc/examples
cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%build
-export PATH=${PATH}:%{_cuda_bindir}
+%{?_with_cuda:export PATH=${PATH}:%{_cuda_bindir}}
%{ff_configure}\
--shlibdir=%{_libdir} \
%if 0%{?_without_tools:1}
6 years
[VirtualBox-kmod] Update VBox to 5.2.22
by Sérgio M. Basto
commit 4dae1e414dd6f6664ea0af15745cf2c86b1bf80e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Nov 10 12:15:50 2018 +0000
Update VBox to 5.2.22
VirtualBox-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index c69fa4e..5a4fe49 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -39,7 +39,7 @@
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 5.2.20
+Version: 5.2.22
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Release: 1%{?dist}
@@ -140,6 +140,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Sat Nov 10 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.22-1
+- Update VBox to 5.2.22
+
* Fri Oct 19 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.20-1
- Update VBox to 5.2.20
6 years
[mixxx/f29] (3 commits) ...Rename plugin directories
by Uwe Klotz
Summary of changes:
f2bd1bd... Fix typos in changelog (*)
987a537... Upstream release candidate snapshot for 2.2.0 (*)
9278a36... Rename plugin directories (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[mixxx] Rename plugin directories
by Uwe Klotz
commit 9278a36222b9ef3ea41e35fabc408e449f87ecdd
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sat Nov 10 11:03:55 2018 +0100
Rename plugin directories
mixxx.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index c1cabda..f779e6f 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -143,9 +143,9 @@ appstream-util \
# Workaround: Manually strip RPATH from installed binaries
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/vamp/libmixxxminimal.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsource/libsoundsourcem4a.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsource/libsoundsourcewv.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/vampqt5/libmixxxminimal.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcem4a.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcewv.so
# Remove docdir
rm -rf $RPM_BUILD_ROOT%{_docdir}
@@ -166,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
* Sat Nov 10 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.0-0.4.rc.20181106gitfaf1a67
- Upstream release candidate snapshot for 2.2.0
+- Rename plugin directories
* Sun Oct 28 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.0-0.3.beta.20181027git96f139d
- 3rd upstream beta snapshot for 2.2.0
6 years
[mixxx] Upstream release candidate snapshot for 2.2.0
by Uwe Klotz
commit 987a53768209f5009fc36a9535190e964e388dbc
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sat Nov 10 11:03:38 2018 +0100
Upstream release candidate snapshot for 2.2.0
.gitignore | 16 +---------------
mixxx.spec | 13 ++++++++-----
sources | 2 +-
3 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5700a2b..8243330 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1 @@
-mixxx-1.11.0-20130517bzr.tar.bz2
-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
-/mixxx-release-2.1.0-rc1.tar.gz
-/mixxx-release-2.1.0.tar.gz
-/mixxx-release-2.1.1.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-33e0cc33ee840d0b6c24ffa8f753b2b3e8ae5c34.tar.gz
-/mixxx-b48824650738f43ccaceeca3f686e202d12e2be5.tar.gz
-/mixxx-96f139d8fe70b209eddf249230e88d35d16a70e6.tar.gz
+/mixxx-faf1a67bf1c39510b3dfa2840e98280cf38572eb.tar.gz
\ No newline at end of file
diff --git a/mixxx.spec b/mixxx.spec
index f8018bb..c1cabda 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 beta
+# Optional: Package version suffix for pre-releases, e.g. "beta" or "rc"
+%global extraver rc
# Optional: Only used for untagged snapshot versions
-%global gitcommit 96f139d8fe70b209eddf249230e88d35d16a70e6
+%global gitcommit faf1a67bf1c39510b3dfa2840e98280cf38572eb
# Format: <yyyymmdd>
-%global gitcommitdate 20181027
+%global gitcommitdate 20181106
%if "%{?gitcommit}" == ""
# (Pre-)Releases
@@ -17,7 +17,7 @@
Name: mixxx
Version: 2.2.0
-Release: 0.3%{?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+
@@ -164,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Sat Nov 10 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.0-0.4.rc.20181106gitfaf1a67
+- Upstream release candidate snapshot for 2.2.0
+
* Sun Oct 28 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.0-0.3.beta.20181027git96f139d
- 3rd upstream beta snapshot for 2.2.0
diff --git a/sources b/sources
index 790ea81..c8af2a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7224b4f5dd7adad1b5c4ea7b24e18eb3 mixxx-96f139d8fe70b209eddf249230e88d35d16a70e6.tar.gz
+e9a378fd4a4393de47376f1960765ef3 mixxx-faf1a67bf1c39510b3dfa2840e98280cf38572eb.tar.gz
6 years
[mixxx] Fix typos in changelog
by Uwe Klotz
commit f2bd1bd6a313a722d11a9973b434fa7c0de0de77
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Oct 31 13:07:48 2018 +0100
Fix typos in changelog
mixxx.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 6656672..f8018bb 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -165,10 +165,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
* Sun Oct 28 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.0-0.3.beta.20181027git96f139d
-- 3rd upsteam beta snapshot for 2.2.0
+- 3rd upstream beta snapshot for 2.2.0
* Tue Oct 09 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.0-0.2.beta.20181009gitb488246
-- 2nd upsteam beta snapshot for 2.2.0
+- 2nd upstream beta snapshot for 2.2.0
* Mon Sep 24 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.0-0.1.beta.20180924git33e0cc3
- 1st upstream beta test release for 2.2.0
6 years
