[wireguard-kmod/el7: 2/2] Merge branch 'master' into el7
by Leigh Scott
commit e5cd98130a44256f49587263613f939cf2e5e4b0
Merge: 09d2b78 a9cfa49
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Feb 4 15:13:43 2020 +0000
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
wireguard-kmod.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
4 years, 3 months
[shotcut] Update to 20.02.02-0.1.beta1
by Martin Gansser
commit 81cd3e67ee5b40a6de8ce15b019de5c2063eab96
Author: Martin Gansser <mgansser(a)online.de>
Date: Tue Feb 4 12:42:43 2020 +0100
Update to 20.02.02-0.1.beta1
.gitignore | 1 +
shotcut-noupdatecheck.patch | 11 -----------
shotcut.spec | 24 +++++++++---------------
sources | 2 +-
4 files changed, 11 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ae103bd..1736aa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
/shotcut-19.12.08.tar.gz
/shotcut-19.12.16.tar.gz
/shotcut-19.12.31.tar.gz
+/shotcut-20.02.02.tar.gz
diff --git a/shotcut-noupdatecheck.patch b/shotcut-noupdatecheck.patch
index d3d7472..17c30b2 100644
--- a/shotcut-noupdatecheck.patch
+++ b/shotcut-noupdatecheck.patch
@@ -22,14 +22,3 @@
}
reply->deleteLater();
return;
---- src/src.pro.orig 2018-10-02 13:52:58.638721580 +0200
-+++ src/src.pro 2018-10-02 13:53:27.064761829 +0200
-@@ -300,7 +300,7 @@
- LIBS += -lCuteLogger
-
- isEmpty(SHOTCUT_VERSION) {
-- !win32:SHOTCUT_VERSION = $$system(date "+%y.%m.%d")
-+ !win32:SHOTCUT_VERSION = $$_VSTRING
- win32:SHOTCUT_VERSION = adhoc
- }
- DEFINES += SHOTCUT_VERSION=\\\"$$SHOTCUT_VERSION\\\"
diff --git a/shotcut.spec b/shotcut.spec
index 4f444ca..e9fe85b 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -3,9 +3,9 @@
%define _vstring %(echo %{version} |tr -d ".")
Name: shotcut
-Version: 19.12.31
-Release: 1%{dist}
-#Release: 0.1.beta1%%{dist}
+Version: 20.02.02
+#Release: 1%%{dist}
+Release: 0.1.beta1%{dist}
Summary: A free, open source, cross-platform video editor
# The entire source code is GPLv3+ except mvcp/ which is LGPLv2+
License: GPLv3+ and LGPLv2+
@@ -82,6 +82,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
%files langpack-%{1}\
%{_datadir}/%{name}/translations/%{name}_%{1}*.qm
+%lang_subpkg ar Arabic
%lang_subpkg ca Catalan
%lang_subpkg cs Czech
%lang_subpkg da Danish
@@ -120,21 +121,11 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
%prep
%autosetup -p0
-# Create version.json from current version
-echo "{" > version.json
-echo " \"version_number\": %{_vstring}02," >> version.json
-echo " \"version_string\": \"%{version}.02\"," >> version.json
-echo " \"url\": \"https://shotcut.org/blog/new-release-%{_vstring}/\"" >> version.json
-echo "}" >> version.json
-echo "" >> version.json
-
# Postmortem debugging tools for MinGW.
rm -rf drmingw
%build
-export _VSTRING="%{version}.02"
-%{qmake_qt5} _VSTRING="%{version}.02" \
- PREFIX=%{buildroot}%{_prefix}
+%{qmake_qt5} PREFIX=%{buildroot}%{_prefix}
%make_build
# update Doxyfile
@@ -165,7 +156,7 @@ pushd $basedir
echo "%lang($lang) $langdir/$qm" >>"$langlist"
done
popd
-cp -v version.json %{buildroot}%{_datadir}/%{name}
+#cp -v version.json %{buildroot}%{_datadir}/%{name}
# fixes E: script-without-shebang
chmod a-x %{buildroot}%{_datadir}/%{name}/qml/filters/webvfx_ruttetraizer/ruttetraizer.html
@@ -193,6 +184,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.%{name}.S
%doc doc
%changelog
+* Tue Feb 04 2020 Martin Gansser <martinkg(a)fedoraproject.org> - 20.02.02-0.1.beta1
+- Update to 20.02.02-0.1.beta1
+
* Wed Jan 01 2020 Martin Gansser <martinkg(a)fedoraproject.org> - 19.12.31-1
- Update to 19.12.31
diff --git a/sources b/sources
index 57a7a05..5a7bbeb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (shotcut-19.12.31.tar.gz) = 714d5b3e184e9d0786bc64635e51fd61570e0404c0ebf0fa5c8a12cb85c9091c75ac61e4963bd400b5722f310ae590b2c2d83aa4cd7acbcb53545f224f0ca766
+SHA512 (shotcut-20.02.02.tar.gz) = 71f6cd11157f2ebaef1a0c0b125640e728337deb3601fe8767679e2ba0e244f3120c4d100fa793a7256e332ce9ce502437380e5b4fff14318d0d8d008946d75e
4 years, 3 months
[nvidia-kmod/el8: 5/5] Merge branch 'master' into el8
by Leigh Scott
commit e46dc58adb0d0d871dc5919633d144c6ac2df227
Merge: 971b165 69cddd0
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Feb 3 17:38:04 2020 +0000
Merge branch 'master' into el8
nvidia-kmod.spec | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
---
4 years, 3 months
[nvidia-kmod/el8] (5 commits) ...Merge branch 'master' into el8
by Leigh Scott
Summary of changes:
ff138cc... Patch for 5.5rc kernel (*)
a95363f... Add patch for kernel-5.4 prime issue (*)
79db484... Backport kernel 5.4 and 5.5 changes from vulkan development (*)
69cddd0... Update to 440.59 release (*)
e46dc58... Merge branch 'master' into el8
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
