[telegram-desktop/f28: 2/2] Merge branch 'master' into f28
by Vitaly Zaitsev
commit 62ca8d4bab1647788cbde9c26e920611d3044cd0
Merge: dce9d41 5b2e13b
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Feb 12 18:20:52 2019 +0500
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 | 4 ++--
telegram-desktop.spec | 5 ++++-
6 files changed, 12 insertions(+), 8 deletions(-)
---
5 years, 2 months
[telegram-desktop/f28: 1/2] Updated to version 1.5.13.
by Vitaly Zaitsev
commit 5b2e13bd1409466a37df7841778c926bcdc55dca
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Feb 12 14:20:36 2019 +0100
Updated to version 1.5.13.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 6 +++---
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 4 ++--
telegram-desktop.spec | 5 ++++-
6 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83a2667..5be60b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@
/tdesktop-1.5.11.tar.gz
/crl-40063ab.tar.gz
/tdesktop-1.5.12.tar.gz
+/tdesktop-1.5.13.tar.gz
diff --git a/sources b/sources
index 154c66b..4f17d42 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
b38cf6bd3d30a3b9a9602e2e7ab2efea crl-40063ab.tar.gz
-e03e33c623beae434f987cfab68541c0 tdesktop-1.5.12.tar.gz
+de130dc22add2c422022546550408126 tdesktop-1.5.13.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index c538625..99e89b1 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 0174a10e3bf553539bb07ad068250105e04b259b Mon Sep 17 00:00:00 2001
+From f5828ee88b15e379fa3b9b57c9e1c25ec8ebc86b 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,11 +774,11 @@ 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 09e216394..e292f82ca 100644
+index 57519d64f..090134d31 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
@@ -828,7 +828,7 @@
- <(src_loc)/mediaview.h
+ <(src_loc)/mainwindow.h
<(src_loc)/observer_peer.cpp
<(src_loc)/observer_peer.h
-<(src_loc)/qt_static_plugins.cpp
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 9ff868e..e52c12d 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 25b99255c19cf31895734ead8e3c7e58d9b66125 Mon Sep 17 00:00:00 2001
+From af1baf471d77e60e5427ea36632d141c17be6a14 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 78b95fe..4f19858 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From 5df0ad653d929b6e441965b72e34e80254e014aa Mon Sep 17 00:00:00 2001
+From 377e1806e56709257a3655948536ef35a4cf96bb 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,7 +50,7 @@ index 9bc686d44..806374202 100644
'lzma',
'xxhash',
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index e292f82ca..21d0706dd 100644
+index 090134d31..9de94f749 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
@@ -835,13 +835,6 @@
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 743f446..2e8329f 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -12,7 +12,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.5.12
+Version: 1.5.13
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -157,6 +157,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Tue Feb 12 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.13-1
+- Updated to 1.5.13.
+
* Sun Feb 10 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.12-1
- Updated to 1.5.12.
5 years, 2 months
[nautilus-dropbox] Updated to 2019.01.31
by Leigh Scott
commit c2c10fcbdd11def7478e8b5452462cb724f4d20f
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Feb 12 09:09:57 2019 +0000
Updated to 2019.01.31
fix_nautilus_includes.patch | 39 +++
nautilus-dropbox.spec | 22 +-
...ox_0002-Use-GIR-bindings-instead-of-pygtk.patch | 278 ---------------------
python3-docutils_fix.patch | 20 ++
sources | 2 +-
use_python2.patch | 58 -----
6 files changed, 73 insertions(+), 346 deletions(-)
---
diff --git a/fix_nautilus_includes.patch b/fix_nautilus_includes.patch
new file mode 100644
index 0000000..7623eb7
--- /dev/null
+++ b/fix_nautilus_includes.patch
@@ -0,0 +1,39 @@
+diff -uNrp a/src/dropbox-command-client.h b/src/dropbox-command-client.h
+--- a/src/dropbox-command-client.h 2019-01-10 01:12:50.000000000 +0000
++++ b/src/dropbox-command-client.h 2019-02-12 08:52:27.443189961 +0000
+@@ -24,8 +24,7 @@
+ #ifndef DROPBOX_COMMAND_CLIENT_H
+ #define DROPBOX_COMMAND_CLIENT_H
+
+-#include <libnautilus-extension/nautilus-info-provider.h>
+-#include <libnautilus-extension/nautilus-file-info.h>
++#include <nautilus-extension.h>
+
+ G_BEGIN_DECLS
+
+diff -uNrp a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c
+--- a/src/nautilus-dropbox.c 2019-01-10 01:12:50.000000000 +0000
++++ b/src/nautilus-dropbox.c 2019-02-12 08:51:10.385813888 +0000
+@@ -37,9 +37,7 @@
+ #include <glib-object.h>
+ #include <gtk/gtk.h>
+
+-#include <libnautilus-extension/nautilus-extension-types.h>
+-#include <libnautilus-extension/nautilus-menu-provider.h>
+-#include <libnautilus-extension/nautilus-info-provider.h>
++#include <nautilus-extension.h>
+
+ #include "g-util.h"
+ #include "dropbox-command-client.h"
+diff -uNrp a/src/nautilus-dropbox.h b/src/nautilus-dropbox.h
+--- a/src/nautilus-dropbox.h 2019-01-10 01:12:50.000000000 +0000
++++ b/src/nautilus-dropbox.h 2019-02-12 08:51:57.680430947 +0000
+@@ -27,7 +27,7 @@
+ #include <glib.h>
+ #include <glib-object.h>
+
+-#include <libnautilus-extension/nautilus-info-provider.h>
++#include <nautilus-extension.h>
+
+ #include "dropbox-command-client.h"
+ #include "nautilus-dropbox-hooks.h"
diff --git a/nautilus-dropbox.spec b/nautilus-dropbox.spec
index a54bcb4..a7eae6a 100644
--- a/nautilus-dropbox.spec
+++ b/nautilus-dropbox.spec
@@ -1,7 +1,7 @@
Name: nautilus-dropbox
Epoch: 1
-Version: 2018.11.28
-Release: 2%{?dist}
+Version: 2019.01.31
+Release: 1%{?dist}
Summary: Dropbox extension for Nautilus
License: GPLv3+
URL: https://www.dropbox.com
@@ -9,9 +9,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
-# https://github.com/dropbox/nautilus-dropbox/pull/57
-Patch2: nautilus-dropbox_0002-Use-GIR-bindings-instead-of-pygtk.patch
+Patch1: python3-docutils_fix.patch
+Patch2: fix_nautilus_includes.patch
ExclusiveArch: i686 x86_64
@@ -20,8 +19,8 @@ BuildRequires: desktop-file-utils
BuildRequires: libtool
BuildRequires: gcc
BuildRequires: nautilus-devel
-BuildRequires: python2-docutils
-BuildRequires: pygobject3-devel
+BuildRequires: python3-docutils
+BuildRequires: python3-gobject
Requires: dropbox >= %{?epoch}:%{version}-%{release}
%description
@@ -30,8 +29,8 @@ Dropbox extension for nautilus file manager
%package -n dropbox
Summary: Client for Linux
BuildArch: noarch
-Requires: python2-gobject
-Requires: python2-gpg
+Requires: python3-gobject
+Requires: python3-gpg
%description -n dropbox
Dropbox allows you to sync your files online and across
@@ -68,6 +67,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dropbox.desktop
%changelog
+* Tue Feb 12 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1:2019.01.31-1
+- Updated to 2019.01.31
+- Fix nautilus includes
+- Fix python3-docutils
+
* Sun Jan 06 2019 Wolfgang Ulbrich <fedora(a)raveit.de> - 1:2018.11.28-2
- add upstream patch, port pygtk2 to pygobject-introspection
diff --git a/python3-docutils_fix.patch b/python3-docutils_fix.patch
new file mode 100644
index 0000000..bd442fa
--- /dev/null
+++ b/python3-docutils_fix.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,14 +32,14 @@
+ AC_PATH_PROG([PYTHON], [python])
+ AC_PATH_PROG([PYTHON3], [python3])
+
+-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
++AC_PATH_PROG([RST2MAN], [rst2man], [python3 rst2man.py])
+ AC_SUBST(RST2MAN)
+
+ # define module checking macro
+ AC_DEFUN([PYTHON_CHECK_MODULE], [
+ AC_MSG_CHECKING([for $1])
+
+-cat <<EOF | python
++cat <<EOF | python3
+ try:
+ import $2
+ except:
+
diff --git a/sources b/sources
index 81eab39..3eb41ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2812bc21e5dbfd8cb854ac68fb556c77 nautilus-dropbox-2018.11.28.tar.bz2
+61a53264bf92b3b96f6a28cd616c68d6 nautilus-dropbox-2019.01.31.tar.bz2
5 years, 2 months
[unrar/f28] (3 commits) ...Update to 5.7.1
by Leigh Scott
Summary of changes:
46d09ed... Add BuildRequires: gcc-c++ (*)
9de328c... Update to 5.6.8 (*)
1db7b79... Update to 5.7.1 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 2 months
[unrar/f29] Update to 5.7.1
by Leigh Scott
Summary of changes:
1db7b79... Update to 5.7.1 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 2 months
[unrar] Update to 5.7.1
by Leigh Scott
commit 1db7b793a04e00da39d3276dc59fe7e8f09bedef
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Mon Feb 11 16:47:05 2019 +0000
Update to 5.7.1
.gitignore | 1 +
sources | 2 +-
unrar.spec | 13 ++++++++-----
3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4428473..2f565dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ unrarsrc-5.2.3.tar.gz
/unrarsrc-5.6.3.tar.gz
/unrarsrc-5.6.6.tar.gz
/unrarsrc-5.6.8.tar.gz
+/unrarsrc-5.7.1.tar.gz
diff --git a/sources b/sources
index 06cf85e..44addfd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-def579782da17dc85940cda559b92287 unrarsrc-5.6.8.tar.gz
+1695c966688dd26f7ba34f6f9f279d0c unrarsrc-5.7.1.tar.gz
diff --git a/unrar.spec b/unrar.spec
index ce15bea..9bbfea5 100644
--- a/unrar.spec
+++ b/unrar.spec
@@ -1,9 +1,9 @@
Name: unrar
-Version: 5.6.8
+Version: 5.7.1
Release: 1%{?dist}
Summary: Utility for extracting, testing and viewing RAR archives
License: Freeware with further limitations
-URL: http://www.rarlab.com/rar_add.htm
+URL: https://www.rarlab.com/rar_add.htm
Source0: https://www.rarlab.com/rar/unrarsrc-%{version}.tar.gz
# Man page from Debian
Source1: unrar-nonfree.1
@@ -46,16 +46,15 @@ cp -p %SOURCE1 .
%build
make %{?_smp_mflags} -f makefile \
- CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" LDFLAGS="$RPM_LD_FLAGS -pthread" \
+ CXX="%{__cxx}" CXXFLAGS="%{optflags} -fPIC -DPIC" LDFLAGS="%{?__global_ldflags} -pthread" \
STRIP=: RANLIB=ranlib
make %{?_smp_mflags} -f makefile clean
make %{?_smp_mflags} -f makefile lib \
- CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" LDFLAGS="$RPM_LD_FLAGS -pthread" \
+ CXX="%{__cxx}" CXXFLAGS="%{optflags} -fPIC -DPIC" LDFLAGS="%{?__global_ldflags} -pthread" \
STRIP=: RANLIB=ranlib
%install
-rm -rf %{buildroot}
install -Dpm 755 unrar %{buildroot}%{_bindir}/unrar-nonfree
install -Dpm 644 unrar-nonfree.1 %{buildroot}%{_mandir}/man1/unrar-nonfree.1
install -Dpm 755 libunrar.so %{buildroot}%{_libdir}/libunrar.so
@@ -111,6 +110,10 @@ fi
%changelog
+* Mon Feb 11 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 5.7.1-1
+- Update to 5.7.1
+-
+
* Wed Jan 02 2019 Sérgio Basto <sergio(a)serjux.com> - 5.6.8-1
- Update to 5.6.8
5 years, 2 months