[obs-studio/f26] Updated to 20.1.3
by Leigh Scott
Summary of changes:
50971b0... Updated to 20.1.3 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[obs-studio/f27] Updated to 20.1.3
by Leigh Scott
Summary of changes:
50971b0... Updated to 20.1.3 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[obs-studio] Updated to 20.1.3
by Leigh Scott
commit 50971b0494aeba57797ba959e1d25ae2107dcb48
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Dec 8 21:10:24 2017 +0000
Updated to 20.1.3
obs-studio.spec | 10 +++++-----
sources | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 903c41a..e7203b2 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,5 +1,5 @@
Name: obs-studio
-Version: 20.0.1
+Version: 20.1.3
Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
@@ -65,8 +65,7 @@ that use %{name}.
%prep
-%setup -q
-%patch0 -p0
+%autosetup -p0
# rpmlint reports E: hardcoded-library-path
# replace OBS_MULTIARCH_SUFFIX by LIB_SUFFIX
@@ -92,11 +91,9 @@ mv -f %{buildroot}/%{_datadir}/obs/obs-plugins/obs-ffmpeg/ffmpeg-mux \
%post libs -p /sbin/ldconfig
%post
-/usr/bin/update-desktop-database >&/dev/null || :
/usr/bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
%postun
-/usr/bin/update-desktop-database >&/dev/null || :
if [ $1 -eq 0 ]; then
/usr/bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
@@ -131,6 +128,9 @@ fi
%changelog
+* Fri Dec 08 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 20.1.3-1
+- Updated to 20.1.3
+
* Tue Oct 17 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 20.0.1-1
- Updated to 20.0.1
diff --git a/sources b/sources
index 418d9cc..c893cc4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe12017a573ad0f0b9f90b1d8f631ce6 obs-studio-20.0.1.tar.gz
+4f62a84786c3d0072a0e943657e9dfe9 obs-studio-20.1.3.tar.gz
6 years, 4 months
[shotcut/f26: 4/4] Update to 17.12
by Martin Gansser
commit 8390aa7ff9a972c8937ea8d6efb08d80c27b9cf9
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Fri Dec 8 15:43:03 2017 +0100
Update to 17.12
.gitignore | 7 -------
1 file changed, 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e38eaf..1975fd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,3 @@
/shotcut-17.10.tar.gz
-<<<<<<< HEAD
-<<<<<<< HEAD
/shotcut-17.11.tar.gz
-=======
-=======
-/shotcut-17.11.tar.gz
->>>>>>> master
/shotcut-17.12.tar.gz
->>>>>>> master
6 years, 4 months
[shotcut/f26: 3/4] Update to 17.12
by Martin Gansser
commit 1f77e9339244ee918b2fe75037d36f10516fb2f8
Merge: 6b1bde9 d8ea6e3
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Fri Dec 8 15:42:36 2017 +0100
Update to 17.12
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
---
diff --cc .gitignore
index 4025d64,1975fd2..9e38eaf
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,3 +1,10 @@@
/shotcut-17.10.tar.gz
+<<<<<<< HEAD
++<<<<<<< HEAD
/shotcut-17.11.tar.gz
+=======
++=======
++/shotcut-17.11.tar.gz
++>>>>>>> master
/shotcut-17.12.tar.gz
+>>>>>>> master
6 years, 4 months
[shotcut/f26] (4 commits) ...Update to 17.12
by Martin Gansser
Summary of changes:
e32cfc0... Update to 7.12 (*)
d8ea6e3... Update to 17.12 (*)
1f77e93... Update to 17.12
8390aa7... Update to 17.12
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[shotcut] Update to 17.12
by Martin Gansser
commit d8ea6e3516710ee0fb6823ed0aa33bf36baa376e
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Fri Dec 8 15:41:14 2017 +0100
Update to 17.12
clog | 1 -
1 file changed, 1 deletion(-)
6 years, 4 months
[shotcut] Update to 7.12
by Martin Gansser
commit e32cfc04a312655d74482d3d7c7a0a73439b368b
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Fri Dec 8 15:39:32 2017 +0100
Update to 7.12
.gitignore | 1 +
clog | 1 +
2 files changed, 2 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index 364d3da..1975fd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/shotcut-17.10.tar.gz
+/shotcut-17.11.tar.gz
/shotcut-17.12.tar.gz
diff --git a/clog b/clog
new file mode 100644
index 0000000..ac2d3e5
--- /dev/null
+++ b/clog
@@ -0,0 +1 @@
+Update to 17.12
6 years, 4 months
[shotcut/f26: 2/2] Update to 7.12
by Martin Gansser
commit 6b1bde98f8e5985d58646aac956ab51c26704ccc
Merge: a87aa50 1eb8a0a
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Fri Dec 8 15:34:51 2017 +0100
Update to 7.12
.gitignore | 4 ++++
shotcut-noupdatecheck.patch | 28 +++++++++++++++++++++++++++-
shotcut.spec | 5 ++++-
sources | 4 ++++
4 files changed, 39 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 5858a60,364d3da..4025d64
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,2 +1,6 @@@
/shotcut-17.10.tar.gz
++<<<<<<< HEAD
+/shotcut-17.11.tar.gz
++=======
+ /shotcut-17.12.tar.gz
++>>>>>>> master
diff --cc shotcut-noupdatecheck.patch
index c06a704,f4e34ad..e5ae26c
--- a/shotcut-noupdatecheck.patch
+++ b/shotcut-noupdatecheck.patch
@@@ -1,21 -1,21 +1,38 @@@
Index: src/mainwindow.cpp
===================================================================
++<<<<<<< HEAD
+--- src/mainwindow.cpp.orig 2017-11-04 16:11:25.163538614 +0100
++++ src/mainwindow.cpp 2017-11-04 16:17:17.798846928 +0100
+@@ -2547,9 +2547,9 @@
++=======
+ --- 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 @@
++>>>>>>> master
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()));
++<<<<<<< HEAD
+- showStatusMessage(action, 30 /* 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, 30 /* seconds */);
+ }
+
+ void MainWindow::on_actionRealtime_triggered(bool checked)
+@@ -2908,7 +2908,7 @@
++=======
+ - 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 */);
+ }
+
+ void MainWindow::on_actionRealtime_triggered(bool checked)
+ @@ -2909,7 +2909,6 @@
++>>>>>>> master
void MainWindow::on_actionUpgrade_triggered()
{
showStatusMessage("Checking for upgrade...");
@@@ -23,8 -23,7 +40,11 @@@
}
void MainWindow::on_actionOpenXML_triggered()
++<<<<<<< HEAD
+@@ -3040,7 +3040,8 @@
++=======
+ @@ -3041,7 +3040,7 @@
++>>>>>>> master
m_upgradeUrl = json.object().value("url").toString();
showStatusMessage(action, 10 /* seconds */);
} else {
@@@ -36,9 -34,9 +56,15 @@@
return;
Index: src/src.pro
===================================================================
++<<<<<<< HEAD
+--- src/src.pro.orig 2017-11-04 16:22:22.359946204 +0100
++++ src/src.pro 2017-11-04 16:25:41.796318201 +0100
+@@ -326,7 +326,7 @@
++=======
+ --- 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 @@
++>>>>>>> master
LIBS += -lCuteLogger -lmvcp -lpthread
isEmpty(SHOTCUT_VERSION) {
diff --cc sources
index d2f6174,8625384..1de741a
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+9cb3b6a9a534dd7d616698748b75cac8 shotcut-17.11.tar.gz
++=======
+ f2d1b4bacdee13bb6b21ee9d38c2e7fc shotcut-17.12.tar.gz
++>>>>>>> master
6 years, 4 months