[openshot/f28: 3/3] Merge branch 'master' into f28
by Frank R Dana
commit 7c697fe07907bfacdd90d56f6849a64f41424b1a
Merge: 9d8058a 3023c58
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Mar 25 03:31:50 2019 -0400
Merge branch 'master' into f28
.gitignore | 1 +
openshot.spec | 34 +++++++++++-----------------------
sources | 2 +-
3 files changed, 13 insertions(+), 24 deletions(-)
---
5 years, 8 months
[rpmfusion-packager] Revert the sources format to tar.gz, to avoid possible confusion in the future.
by Sérgio M. Basto
commit 67c1de085c2759edb0a5dcb6604eead59dc8b8d0
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Mar 25 06:44:03 2019 +0000
Revert the sources format to tar.gz, to avoid possible confusion in the future.
.gitignore | 1 +
rpmfusion-packager.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 43dfee8..4895443 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ rpmfusion-packager-0.4.tar.bz2
/rpmfusion-packager-0.6.1.tar.gz
/rpmfusion-packager-0.6.2.tar.gz
/rpmfusion-packager-0.6.3.tar.bz2
+/rpmfusion-packager-0.6.3.tar.gz
diff --git a/rpmfusion-packager.spec b/rpmfusion-packager.spec
index 5b8f2ad..9ee93fe 100644
--- a/rpmfusion-packager.spec
+++ b/rpmfusion-packager.spec
@@ -7,12 +7,12 @@
Name: rpmfusion-packager
Version: 0.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Tools for setting up a rpmfusion maintainer environment
License: GPLv2+
URL: https://github.com/rpmfusion-infra/rpmfusion-packager
-Source0: %url/releases/download/v%{version}/rpmfusion-packager-%{version}.tar.bz2
+Source0: %url/archive/v%{version}/rpmfusion-packager-%{version}.tar.gz
BuildArch: noarch
@@ -109,6 +109,9 @@ autoreconf -i
%endif
%changelog
+* Mon Mar 25 2019 Sérgio Basto <sergio(a)serjux.com> - 0.6.3-2
+- Revert the sources format to tar.gz, to avoid possible confusion in the future.
+
* Sun Dec 09 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.6.3-1
- Port to python3
diff --git a/sources b/sources
index 5d57c33..574ed71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73e16d759d5fc6c3dcb09092310e5242 rpmfusion-packager-0.6.3.tar.bz2
+b13e58df8c16c7fe9dcebdea5011f2e7 rpmfusion-packager-0.6.3.tar.gz
5 years, 8 months
[rpmfusion-packager] Port to python3
by Sérgio M. Basto
commit 0811f6f592846e8f71d6e50a84ab73a72c47adb2
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Mar 25 06:26:49 2019 +0000
Port to python3
.gitignore | 1 +
rpmfusion-packager.spec | 66 ++++++++++++++++++++++++++++++++++++-------------
sources | 2 +-
3 files changed, 51 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a51afc3..43dfee8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ rpmfusion-packager-0.4.tar.bz2
/rpmfusion-packager-0.6.0.tar.gz
/rpmfusion-packager-0.6.1.tar.gz
/rpmfusion-packager-0.6.2.tar.gz
+/rpmfusion-packager-0.6.3.tar.bz2
diff --git a/rpmfusion-packager.spec b/rpmfusion-packager.spec
index cb2b3e2..5b8f2ad 100644
--- a/rpmfusion-packager.spec
+++ b/rpmfusion-packager.spec
@@ -1,15 +1,29 @@
+# rpmfusion-packager switched to python3 on Fedora 30 and RHEL > 7:
+%if 0%{?fedora} > 29 || 0%{?rhel} > 7
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
+
Name: rpmfusion-packager
-Version: 0.6.2
-Release: 3%{?dist}
+Version: 0.6.3
+Release: 1%{?dist}
Summary: Tools for setting up a rpmfusion maintainer environment
License: GPLv2+
URL: https://github.com/rpmfusion-infra/rpmfusion-packager
-Source0: %url/archive/v%{version}/rpmfusion-packager-%{version}.tar.gz
+Source0: %url/releases/download/v%{version}/rpmfusion-packager-%{version}.tar.bz2
+
+BuildArch: noarch
BuildRequires: autoconf
BuildRequires: automake
+%if %{with python3}
+BuildRequires: python3-devel
+%else
BuildRequires: python2-devel
+%endif
+
# Packager tools
Requires: rpm-build
Requires: rpmdevtools
@@ -21,37 +35,41 @@ Requires: libabigail
Requires: mock-rpmfusion-free
# Tools required by the scripts included
-%if 0%{?fedora}
-Requires: python2-pycurl
+%if %{with python3}
+Requires: python3-pycurl
%else
Requires: python-pycurl
%endif
-# See FIXME in rpmfusion-cvs
-#Requires: pyOpenSSL
-
-BuildArch: noarch
-
%description
rpmfusion-packager provides a set of utilities designed to help a RPM Fusion
packager in setting up their environment and access the RPM Fusion
infrastructure.
-%package -n rpmfusion-cert
+%if %{with python3}
+%package -n python3-rpmfusion-cert
Summary: Fedora certificate tool and python library
-Group: Applications/Databases
-%if 0%{?fedora}
-Requires: python2-pyOpenSSL
+Requires: python3-pyOpenSSL
+Requires: python3-requests
+Requires: python3-fedora
+Requires: python3-six
+
+%description -n python3-rpmfusion-cert
+Provides rpmfusion-cert and the rpmfusion_cert python3 library
%else
+%package -n rpmfusion-cert
+Summary: Fedora certificate tool and python library
Requires: pyOpenSSL
-%endif
Requires: python2-requests
Requires: python2-fedora
Requires: python2-six
%description -n rpmfusion-cert
Provides rpmfusion-cert and the rpmfusion_cert python library
+%endif
+
+
%prep
%setup -q
@@ -59,11 +77,15 @@ autoreconf -i
%build
-%configure
+%if %{with python3}
+%configure --with-python3
+%else
+%configure --with-python2
+%endif
%make_build
%install
-%make_install INSTALL="install -p"
+%make_install
%files
@@ -74,12 +96,22 @@ autoreconf -i
%{_bindir}/rpmfusion-packager-setup
%{_bindir}/koji-rpmfusion
+%if %{with python3}
+%files -n python3-rpmfusion-cert
+%license COPYING
+%{_bindir}/rpmfusion-cert
+%{python3_sitelib}/rpmfusion_cert
+%else
%files -n rpmfusion-cert
%license COPYING
%{_bindir}/rpmfusion-cert
%{python2_sitelib}/rpmfusion_cert
+%endif
%changelog
+* Sun Dec 09 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.6.3-1
+- Port to python3
+
* Sun Sep 02 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.6.2-3
- Fix python deps for el7
diff --git a/sources b/sources
index fe642af..5d57c33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15ba5d946b61878b242c9bfe383b0cec rpmfusion-packager-0.6.2.tar.gz
+73e16d759d5fc6c3dcb09092310e5242 rpmfusion-packager-0.6.3.tar.bz2
5 years, 8 months
[telegram-desktop/f28: 2/2] Merge branch 'master' into f28
by Vitaly Zaitsev
commit 1b715e3aa5d31203e8cfbc27b7a1d9646d303b25
Merge: ad7a144 b0003c1
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Mar 24 21:12:02 2019 +0100
Merge branch 'master' into f28
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 6 +++---
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 6 +++---
telegram-desktop.spec | 5 ++++-
6 files changed, 13 insertions(+), 9 deletions(-)
---
5 years, 8 months
[telegram-desktop/f28: 1/2] Updated to version 1.6.2.
by Vitaly Zaitsev
commit b0003c16754f3919106f7c957c09441736bc361d
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Mar 24 21:11:49 2019 +0100
Updated to version 1.6.2.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 6 +++---
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 6 +++---
telegram-desktop.spec | 5 ++++-
6 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 171f1cf..5c95034 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@
/crl-84072fb.tar.gz
/tdesktop-1.6.0.tar.gz
/tdesktop-1.6.1.tar.gz
+/tdesktop-1.6.2.tar.gz
diff --git a/sources b/sources
index 788b844..674df1d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ae7f024486ddce3b598477bf40a86c79 crl-84072fb.tar.gz
-20e911bcbe859e6452a94dbe1c7fdba6 tdesktop-1.6.1.tar.gz
+07dfc750edd0431cb9f0dacf444338a3 tdesktop-1.6.2.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 634c604..901851d 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From d3ce618457aaba716ba73afbbbe41489ead42165 Mon Sep 17 00:00:00 2001
+From 2cee07d451f2d51f9af8977d25dfda869668f6b8 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
@@ -774,10 +774,10 @@ index ffe0e5a96..9bc686d44 100644
],
}], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 8d21ef0c5..9d21a054f 100644
+index 1632a0c49..7ab4cfb74 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -848,7 +848,7 @@
+@@ -850,7 +850,7 @@
<(src_loc)/mainwindow.h
<(src_loc)/observer_peer.cpp
<(src_loc)/observer_peer.h
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 8deff54..7756346 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 9fa7543843f219b7ae8e4e1f682d998bb7ce4f1b Mon Sep 17 00:00:00 2001
+From 626d85b8c2177eea0a2a36252f631a7c28aad8a3 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun, 24 Jun 2018 22:59:34 +0200
Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer
diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch
index f00910b..3c4b73b 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From 8c38418c06056f7c9f9b46aadd829bb65d912735 Mon Sep 17 00:00:00 2001
+From ea45ebc48e5d72640ad253ce28910ccf78586ce1 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed, 17 Oct 2018 17:57:59 +0200
Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29.
@@ -50,10 +50,10 @@ index 9bc686d44..806374202 100644
'lzma',
'xxhash',
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 9d21a054f..54305eb60 100644
+index 7ab4cfb74..2a174c3df 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -855,13 +855,6 @@
+@@ -857,13 +857,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 8e560f1..5e11c08 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -15,7 +15,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.6.1
+Version: 1.6.2
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -167,6 +167,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Sun Mar 24 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.6.2-1
+- Updated to 1.6.2.
+
* Wed Mar 20 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.6.1-1
- Updated to 1.6.1.
5 years, 8 months
