[openshot/f27] Dumb typo
by Frank R Dana
commit c2de9e582c159a95c04ed3e36276528cc0c5f8d4
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Tue Sep 25 05:01:45 2018 -0400
Dumb typo
openshot.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/openshot.spec b/openshot.spec
index 1f37fc9..3205a73 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -105,7 +105,7 @@ done
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt.desktop
# Move appdata file to default location and validate
-mkdir -p %{_buildroot}%{_metainfodir}
+mkdir -p %{buildroot}%{_metainfodir}
mv %{buildroot}%{_datadir}/metainfo/*.appdata.xml %{buildroot}%{_metainfodir}/
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
6 years, 1 month
[openshot/f27] Create appdata target path
by Frank R Dana
commit 8e0abbf778114879afccbb02ef1870b5fe955c11
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Tue Sep 25 04:29:16 2018 -0400
Create appdata target path
openshot.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/openshot.spec b/openshot.spec
index 788e7f2..1f37fc9 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -105,6 +105,7 @@ done
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt.desktop
# Move appdata file to default location and validate
+mkdir -p %{_buildroot}%{_metainfodir}
mv %{buildroot}%{_datadir}/metainfo/*.appdata.xml %{buildroot}%{_metainfodir}/
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
6 years, 1 month
[nautilus-dropbox] Add upstream commit to switch to python2-gpg (rfbz#5032)
by Leigh Scott
commit d0d0c98c2142c804e1075068d8d73ba3a327b369
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Sep 25 09:21:57 2018 +0100
Add upstream commit to switch to python2-gpg (rfbz#5032)
nautilus-dropbox.spec | 9 ++-
switch_to_python-gpg.patch | 139 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 146 insertions(+), 2 deletions(-)
---
diff --git a/nautilus-dropbox.spec b/nautilus-dropbox.spec
index ba817d1..a4e6546 100644
--- a/nautilus-dropbox.spec
+++ b/nautilus-dropbox.spec
@@ -1,7 +1,7 @@
Name: nautilus-dropbox
Epoch: 1
Version: 2015.10.28
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Dropbox extension for Nautilus
License: GPLv3+
URL: https://www.dropbox.com
@@ -10,6 +10,8 @@ Source: https://linux.dropbox.com/packages/%{name}-%{version}.tar.bz2
# add 10 second delay to autostart to ensure it loads on session startup
Patch0: add_startup_delay.patch
Patch1: use_python2.patch
+# Based on https://github.com/dropbox/nautilus-dropbox/commit/e9367206f9b723103362e8...
+Patch2: switch_to_python-gpg.patch
ExclusiveArch: i686 x86_64
@@ -29,7 +31,7 @@ Dropbox extension for nautilus file manager
Summary: Client for Linux
BuildArch: noarch
Requires: pygtk2
-Requires: python2-pygpgme
+Requires: python2-gpg
Requires: hicolor-icon-theme
%description -n dropbox
@@ -67,6 +69,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dropbox.desktop
%{_libdir}/nautilus/extensions-3.0/libnautilus-dropbox.so
%changelog
+* Tue Sep 25 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1:2015.10.28-9
+- Add upstream commit to switch to python2-gpg (rfbz#5032)
+
* Sun Aug 19 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:2015.10.28-8
- Rebuilt for Fedora 29 Mass Rebuild binutils issue
diff --git a/switch_to_python-gpg.patch b/switch_to_python-gpg.patch
new file mode 100644
index 0000000..5f287c2
--- /dev/null
+++ b/switch_to_python-gpg.patch
@@ -0,0 +1,139 @@
+From e9367206f9b723103362e8dd154363517e9a9841 Mon Sep 17 00:00:00 2001
+From: Samer Masterson <samer(a)dropbox.com>
+Date: Tue, 24 Jul 2018 17:46:14 -0700
+Subject: [PATCH] Use python-gpg instead of python-gpgme if it's installed
+
+I think we need to keep gpgme support because we only build a single .deb
+for all the distros we ship to.
+
+I removed python-gpgme from the "Suggests" line in the deb and replaced it
+with python-gpg because I don't think there's harm in suggesting a package
+that doesn't exist for Ubuntu 17.04 and lower.
+
+I didn't touch the rpm because I couldn't figure out if python-gpg exists
+on Fedora. It probably does, but my google-foo is failing me.
+
+Fixes #51
+---
+ dropbox.in | 44 ++++++++++++++++++++++++++++++++------------
+ generate-deb.sh | 2 +-
+ 2 files changed, 33 insertions(+), 13 deletions(-)
+
+diff --git a/dropbox.in b/dropbox.in
+index 30061f3..53e309c 100755
+--- a/dropbox.in
++++ b/dropbox.in
+@@ -40,9 +40,15 @@ import traceback
+ import urllib2
+
+ try:
+- import gpgme
+-except ImportError:
++ import gpg
+ gpgme = None
++except ImportError:
++ gpg = None
++ # Still support gpgme for now. Remove this once we only support 17.10+.
++ try:
++ import gpgme
++ except ImportError:
++ gpgme = None
+
+ from contextlib import closing, contextmanager
+ from posixpath import curdir, sep, pardir, join, abspath, commonprefix
+@@ -50,7 +56,7 @@ from posixpath import curdir, sep, pardir, join, abspath, commonprefix
+ INFO = u"Dropbox is the easiest way to share and store your files online. Want to learn more? Head to"
+ LINK = u"https://www.dropbox.com/"
+ WARNING = u"In order to use Dropbox, you must download the proprietary daemon."
+-GPG_WARNING = u"Note: python-gpgme is not installed, we will not be able to verify binary signatures."
++GPG_WARNING = u"Note: python-gpg (python-gpgme for Ubuntu 17.04 and lower) is not installed, we will not be able to verify binary signatures."
+ ERROR_CONNECTING = u"Trouble connecting to Dropbox servers. Maybe your internet connection is down, or you need to set your http_proxy environment variable."
+ ERROR_SIGNATURE = u"Downloaded binary does not match Dropbox signature, aborting install."
+
+@@ -67,7 +73,7 @@ DESKTOP_FILE = u"@DESKTOP_FILE_DIR(a)/dropbox.desktop"
+ enc = locale.getpreferredencoding()
+
+ # Available from https://linux.dropbox.com/fedora/rpm-public-key.asc
+-DROPBOX_PUBLIC_KEY = """
++DROPBOX_PUBLIC_KEY = b"""
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+ Version: SKS 1.1.0
+
+@@ -179,7 +185,7 @@ def unicode_abspath(path):
+ return os.path.abspath(path.encode(sys.getfilesystemencoding())).decode(sys.getfilesystemencoding())
+
+ @contextmanager
+-def gpgme_context(keys):
++def gpg_context(keys):
+ gpg_conf_contents = ''
+ _gpghome = tempfile.mkdtemp(prefix='tmp.gpghome')
+
+@@ -188,12 +194,20 @@ def gpgme_context(keys):
+ fp = open(os.path.join(_gpghome, 'gpg.conf'), 'wb')
+ fp.write(gpg_conf_contents)
+ fp.close()
+- ctx = gpgme.Context()
++ if gpg:
++ ctx = gpg.Context()
++ else:
++ ctx = gpgme.Context()
+
+ loaded = []
+ for key_file in keys:
+- result = ctx.import_(key_file)
+- key = ctx.get_key(result.imports[0][0])
++ if gpg:
++ ctx.op_import(key_file.read())
++ result = ctx.op_import_result()
++ key = ctx.get_key(result.imports[0].fpr)
++ else:
++ result = ctx.import_(key_file)
++ key = ctx.get_key(result.imports[0][0])
+ loaded.append(key)
+
+ ctx.signers = loaded
+@@ -207,10 +221,16 @@ class SignatureVerifyError(Exception):
+ pass
+
+ def verify_signature(key_file, sig_file, plain_file):
+- with gpgme_context([key_file]) as ctx:
++ with gpg_context([key_file]) as ctx:
++ if gpg:
++ ctx.op_verify(sig_file.read(), plain_file.read(), None)
++ result = ctx.op_verify_result()
++ return result.signatures[0].status == 0
++ # gpgme exists
+ sigs = ctx.verify(sig_file, plain_file, None)
+ return sigs[0].status == None
+
++
+ def download_file_chunk(url, buf):
+ opener = urllib2.build_opener()
+ opener.addheaders = [('User-Agent', "DropboxLinuxDownloader/@PACKAGE_VERSION@")]
+@@ -252,7 +272,7 @@ class DownloadState(object):
+ signature.seek(0)
+ self.local_file.seek(0)
+
+- if gpgme:
++ if gpg or gpgme:
+ if not verify_signature(StringIO.StringIO(DROPBOX_PUBLIC_KEY), signature, self.local_file):
+ raise SignatureVerifyError()
+
+@@ -454,7 +474,7 @@ if GUI_AVAILABLE:
+ self.progress.set_property('width-request', 300)
+
+ self.label = gtk.Label()
+- GPG_WARNING_MSG = (u"\n\n" + GPG_WARNING) if not gpgme else u""
++ GPG_WARNING_MSG = (u"\n\n" + GPG_WARNING) if not gpg and not gpgme else u""
+ self.label.set_markup('%s <span foreground="#000099" underline="single" weight="bold">%s</span>\n\n%s%s' % (INFO, LINK, WARNING, GPG_WARNING_MSG))
+ self.label.set_line_wrap(True)
+ self.label.set_property('width-request', 300)
+@@ -543,7 +563,7 @@ else:
+ write(save)
+ flush()
+ console_print(u"%s %s\n" % (INFO, LINK))
+- GPG_WARNING_MSG = (u"\n%s" % GPG_WARNING) if not gpgme else u""
++ GPG_WARNING_MSG = (u"\n%s" % GPG_WARNING) if not gpg and not gpgme else u""
+
+ if not yes_no_question("%s%s" % (WARNING, GPG_WARNING_MSG)):
+ return
6 years, 1 month
[openshot/f27] AppData files are in a different place on F27
by Frank R Dana
commit e0638f11147b806171cbe11a6cba9a7681a14976
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Tue Sep 25 04:05:40 2018 -0400
AppData files are in a different place on F27
openshot.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/openshot.spec b/openshot.spec
index e8add29..788e7f2 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -104,7 +104,8 @@ done
# Validate desktop file
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt.desktop
-# Validate appdata file
+# Move appdata file to default location and validate
+mv %{buildroot}%{_datadir}/metainfo/*.appdata.xml %{buildroot}%{_metainfodir}/
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
# Move icon files to the preferred location — fixed upstream
6 years, 1 month
[openshot/f27: 12/12] Merge branch 'master' into f27
by Frank R Dana
commit 96b1d31652dfcb038a0787f679e9ee9393498f21
Merge: 4c66e8a 7a4cd9e
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Sep 24 22:22:37 2018 -0400
Merge branch 'master' into f27
.gitignore | 1 +
openshot-2.4.3-appdata.patch | 12 ++++++++
openshot-find-lang.sh | 40 ++++++++++++++++++++++-----
openshot-rpmfusion-contact.patch | 10 +++++++
openshot.spec | 60 ++++++++++++++++++++++++++++++----------
sources | 2 +-
6 files changed, 103 insertions(+), 22 deletions(-)
---
6 years, 1 month
[openshot/f27] (12 commits) ...Merge branch 'master' into f27
by Frank R Dana
Summary of changes:
5f55a21... Update for new libopenshot (*)
5a29a65... Add appdata file. (*)
2974e55... Actually commit appdata file. (*)
28f3b0d... Add appdata to %%file. (*)
4b7b728... Correct version typo in changelog (*)
b7a439b... Update contact email in appdata (*)
1ce8138... Update appdata file per upstream (*)
7bd3dd5... small typo (*)
02581b6... Pull in find-lang changes from Fedora (*)
441777f... Update find-lang for new translation files (*)
7a4cd9e... New upstream release 2.4.3 (*)
96b1d31... Merge branch 'master' into f27
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[openshot/f28: 12/12] Merge branch 'master' into f28
by Frank R Dana
commit b8611ac3e5c890d92572fcbd483d943e6da81659
Merge: 8f6619d 7a4cd9e
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Sep 24 22:21:54 2018 -0400
Merge branch 'master' into f28
.gitignore | 1 +
openshot-2.4.3-appdata.patch | 12 ++++++++
openshot-find-lang.sh | 40 ++++++++++++++++++++++-----
openshot-rpmfusion-contact.patch | 10 +++++++
openshot.spec | 60 ++++++++++++++++++++++++++++++----------
sources | 2 +-
6 files changed, 103 insertions(+), 22 deletions(-)
---
6 years, 1 month
[openshot/f28] (12 commits) ...Merge branch 'master' into f28
by Frank R Dana
Summary of changes:
5f55a21... Update for new libopenshot (*)
5a29a65... Add appdata file. (*)
2974e55... Actually commit appdata file. (*)
28f3b0d... Add appdata to %%file. (*)
4b7b728... Correct version typo in changelog (*)
b7a439b... Update contact email in appdata (*)
1ce8138... Update appdata file per upstream (*)
7bd3dd5... small typo (*)
02581b6... Pull in find-lang changes from Fedora (*)
441777f... Update find-lang for new translation files (*)
7a4cd9e... New upstream release 2.4.3 (*)
b8611ac... Merge branch 'master' into f28
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[openshot/f29] (11 commits) ...New upstream release 2.4.3
by Frank R Dana
Summary of changes:
5f55a21... Update for new libopenshot (*)
5a29a65... Add appdata file. (*)
2974e55... Actually commit appdata file. (*)
28f3b0d... Add appdata to %%file. (*)
4b7b728... Correct version typo in changelog (*)
b7a439b... Update contact email in appdata (*)
1ce8138... Update appdata file per upstream (*)
7bd3dd5... small typo (*)
02581b6... Pull in find-lang changes from Fedora (*)
441777f... Update find-lang for new translation files (*)
7a4cd9e... New upstream release 2.4.3 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
