[shotcut/f27] Update to 17.12
by Martin Gansser
Summary of changes:
1eb8a0a... Update to 17.12 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 1 month
[shotcut] Update to 17.12
by Martin Gansser
commit 1eb8a0a84d2c1a77de7aec1687466be29a2e1de9
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Fri Dec 8 14:12:19 2017 +0100
Update to 17.12
.gitignore | 1 +
shotcut-noupdatecheck.patch | 43 +++++++++++++++++++++----------------------
shotcut.spec | 20 +++++++++++++-------
sources | 2 +-
4 files changed, 36 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ce2d7c..364d3da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/shotcut-17.10.tar.gz
+/shotcut-17.12.tar.gz
diff --git a/shotcut-noupdatecheck.patch b/shotcut-noupdatecheck.patch
index fb4031d..f4e34ad 100644
--- a/shotcut-noupdatecheck.patch
+++ b/shotcut-noupdatecheck.patch
@@ -1,30 +1,29 @@
Index: src/mainwindow.cpp
===================================================================
---- src/mainwindow.cpp.orig 2017-09-27 16:35:35.513234656 +0200
-+++ src/mainwindow.cpp 2017-09-27 16:39:58.954253733 +0200
-@@ -1882,9 +1882,9 @@
- windowHandle()->installEventFilter(this);
-
- if (!Settings.noUpgrade() && !qApp->property("noupgrade").toBool()) {
-- QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0);
-- connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered()));
-- showStatusMessage(action, 10 /* seconds */);
-+ //QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0);
-+ //connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered()));
-+ //showStatusMessage(action, 10 /* seconds */);
- }
+--- src/mainwindow.cpp.orig 2017-12-08 13:38:56.944162254 +0100
++++ src/mainwindow.cpp 2017-12-08 13:42:07.385176045 +0100
+@@ -2548,9 +2548,9 @@
+
+ void MainWindow::showUpgradePrompt()
+ {
+- QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0);
+- connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered()));
+- showStatusMessage(action, 15 /* seconds */);
++ //QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0);
++ //connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered()));
++ //showStatusMessage(action, 15 /* seconds */);
}
-
-@@ -2890,7 +2890,7 @@
+
+ void MainWindow::on_actionRealtime_triggered(bool checked)
+@@ -2909,7 +2909,6 @@
void MainWindow::on_actionUpgrade_triggered()
{
showStatusMessage("Checking for upgrade...");
- m_network.get(QNetworkRequest(QUrl("http://check.shotcut.org/version.json")));
-+ m_network.get(QNetworkRequest(QUrl("file:///usr/share/shotcut/version.json")));
}
-
+
void MainWindow::on_actionOpenXML_triggered()
-@@ -3022,7 +3022,7 @@
+@@ -3041,7 +3040,7 @@
m_upgradeUrl = json.object().value("url").toString();
showStatusMessage(action, 10 /* seconds */);
} else {
@@ -35,10 +34,10 @@ Index: src/mainwindow.cpp
return;
Index: src/src.pro
===================================================================
---- src/src.pro.orig 2017-08-02 07:41:40.000000000 +0200
-+++ src/src.pro 2017-08-05 06:23:17.818576703 +0200
-@@ -324,7 +324,7 @@ debug_and_release {
- LIBS += -lLogger -lmvcp -lpthread
+--- src/src.pro.orig 2017-12-08 13:42:45.581178811 +0100
++++ src/src.pro 2017-12-08 13:44:10.984184995 +0100
+@@ -329,7 +329,7 @@
+ LIBS += -lCuteLogger -lmvcp -lpthread
isEmpty(SHOTCUT_VERSION) {
- !win32:SHOTCUT_VERSION = $$system(date "+%y.%m.%d")
diff --git a/shotcut.spec b/shotcut.spec
index f5084a0..f25d1cf 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -3,7 +3,7 @@
%define _vstring %(echo %{version} |tr -d ".")
Name: shotcut
-Version: 17.10
+Version: 17.12
Release: 1%{dist}
Summary: A free, open source, cross-platform video editor
# The entire source code is GPLv3+ except mvcp/ which is LGPLv2+
@@ -24,7 +24,7 @@ BuildRequires: desktop-file-utils
BuildRequires: doxygen
BuildRequires: libappstream-glib
BuildRequires: pkgconfig(Qt5Concurrent)
-BuildRequires: pkgconfig(Qt5Core) >= 5.9.2
+BuildRequires: pkgconfig(Qt5Core) >= 5.9.1
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5Network)
@@ -114,8 +114,8 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
# Create version.json from current version
echo "{" > version.json
-echo " \"version_number\": %{_vstring}02," >> version.json
-echo " \"version_string\": \"%{version}.02\"," >> version.json
+echo " \"version_number\": %{_vstring}04," >> version.json
+echo " \"version_string\": \"%{version}.04\"," >> version.json
echo " \"url\": \"https://shotcut.org/blog/new-release-%{_vstring}/\"" >> version.json
echo "}" >> version.json
echo "" >> version.json
@@ -124,8 +124,8 @@ echo "" >> version.json
rm -rf drmingw
%build
-export _VSTRING="%{version}.02"
-%{qmake_qt5} _VSTRING="%{version}.02" \
+export _VSTRING="%{version}.04"
+%{qmake_qt5} _VSTRING="%{version}.04" \
PREFIX=%{buildroot}%{_prefix}
%make_build
@@ -137,7 +137,7 @@ doxygen CuteLogger/Doxyfile
%install
%make_install
install -D icons/%{name}-logo-64.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png
-install -Dm644 %{S:1} %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+install -Dm644 %{name}.appdata.xml %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
install -Dm644 snap/gui/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
chmod a+x %{buildroot}/%{_datadir}/shotcut/qml/export-edl/rebuild.sh
@@ -191,6 +191,12 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a
%doc doc
%changelog
+* Fri Dec 08 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.12-1
+- Update to 17.12
+
+* Sat Nov 04 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.11-1
+- Update to 17.11
+
* Sat Oct 14 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.10-1
- Update to 17.10
- pkgconfig(Qt5Core) >= 5.9.2 is required
diff --git a/sources b/sources
index 0019d42..8625384 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5a27b2b4bfaf150aaa746d7959fc8a1 shotcut-17.10.tar.gz
+f2d1b4bacdee13bb6b21ee9d38c2e7fc shotcut-17.12.tar.gz
7 years, 1 month
[vlc] Update to rc1
by Nicolas Chauvet
Summary of changes:
7029c10... Update to rc1 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 1 month
[vlc/f27] Update to rc1
by Nicolas Chauvet
Summary of changes:
7029c10... Update to rc1 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 1 month
[vlc/f26] Update to rc1
by Nicolas Chauvet
commit 7029c105a5038b57a2612fa43df09ca0b67cefcd
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Dec 8 09:42:11 2017 +0100
Update to rc1
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index c96bd57..5697e11 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -252,7 +252,7 @@ VLC media player extras modules.
%prep
-%setup -q -n %{name}-%{version}%{?vlc_rc:-git}
+%setup -q -n %{name}-%{version}%{?vlc_rc:-rc1}
%patch0 -p1 -b .wl
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
7 years, 1 month
[vlc/f26] (4 commits) ...update
by Nicolas Chauvet
Summary of changes:
383e500... Rebuilt for live555 (*)
0796745... Rebuild against new libmfx (rhbz#1471768) (*)
de94ad5... Update snapshot (*)
dd8d9c3... update (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 1 month
[vlc/f27] (4 commits) ...update
by Nicolas Chauvet
Summary of changes:
383e500... Rebuilt for live555 (*)
0796745... Rebuild against new libmfx (rhbz#1471768) (*)
de94ad5... Update snapshot (*)
dd8d9c3... update (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 1 month
[vlc] update
by Nicolas Chauvet
commit dd8d9c3fbdc7370c8084b35b7040d890f065ae05
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Dec 8 09:12:19 2017 +0100
update
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index cd721d7..c96bd57 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,5 +1,5 @@
%global vlc_date 20171208
-%global vlc_rc -%{?vlc_date}-0233-rc1
+%global vlc_rc -%{?vlc_date}-0223-rc1
%if 0%{?vlc_rc:1}
%global vlc_url https://nightlies.videolan.org/build/source/
%else
7 years, 1 month
[vlc] Update snapshot
by Nicolas Chauvet
commit de94ad5ed1e5825596568c8892692888a4b5ab0a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Dec 8 09:08:52 2017 +0100
Update snapshot
sources | 2 +-
vlc.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 29cc2f7..ed8255a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32bec6d7e6202d8c33ce7c372c539ab8 vlc-3.0.0-20171122-0234-git.tar.xz
+a50a2e61fb12fa9960d2816198e4ad25 vlc-3.0.0-20171208-0223-rc1.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 01dff91..cd721d7 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,5 +1,5 @@
-%global vlc_date 20171122
-%global vlc_rc -%{?vlc_date}-0234-git
+%global vlc_date 20171208
+%global vlc_rc -%{?vlc_date}-0233-rc1
%if 0%{?vlc_rc:1}
%global vlc_url https://nightlies.videolan.org/build/source/
%else
@@ -39,7 +39,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.0
-Release: 0.42%{?vlc_date:.git%{vlc_date}}%{?dist}
+Release: 0.43%{?vlc_date:.git%{vlc_date}}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -554,6 +554,9 @@ fi || :
%changelog
+* Fri Dec 08 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.43.git20171208
+- Update to 20171208
+
* Fri Dec 01 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-0.42.git20171122
- Rebuild for new protobuf version
- Rebuild against new libmfx (rhbz#1471768)
7 years, 1 month
[moc] Use GPLv3+ license only
by Antonio
commit 51a7ed7882f09c3f9fb67d3f104b0a0e774c2d57
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 7 22:40:11 2017 +0100
Use GPLv3+ license only
moc.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/moc.spec b/moc.spec
index b11e41c..fc15c09 100644
--- a/moc.spec
+++ b/moc.spec
@@ -10,8 +10,8 @@
Name: moc
Summary: Music on Console - Console audio player for Linux/UNIX
Version: 2.6
-Release: 0.20.alpha3%{?dist}
-License: GPLv2+ and GPLv3+
+Release: 0.21.alpha3%{?dist}
+License: GPLv3+
URL: http://moc.daper.net
## Source archive made by using following commands
@@ -86,6 +86,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/moc/decoder_plugins/*.la
%{_libdir}/%{name}/
%changelog
+* Thu Dec 07 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 2.6-0.21.alpha3
+- Use GPLv3+ license only
+
* Tue Oct 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6-0.20.alpha3
- Rebuild for ffmpeg update
7 years, 1 month
