diff --git a/harbour-fernschreiber.pro b/harbour-fernschreiber.pro index 79af618..d2a4e00 100644 --- a/harbour-fernschreiber.pro +++ b/harbour-fernschreiber.pro @@ -140,7 +140,6 @@ DISTFILES += qml/harbour-fernschreiber.qml \ qml/pages/VideoPage.qml \ rpm/harbour-fernschreiber.changes \ rpm/harbour-fernschreiber.spec \ - rpm/harbour-fernschreiber.yaml \ translations/*.ts \ harbour-fernschreiber.desktop diff --git a/qml/js/emoji/1f6dd.svg b/qml/js/emoji/1f6dd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1f6de.svg b/qml/js/emoji/1f6de.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1f6df.svg b/qml/js/emoji/1f6df.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1f7f0.svg b/qml/js/emoji/1f7f0.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1f91d-1f3fb.svg b/qml/js/emoji/1f91d-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1f91d-1f3fc.svg b/qml/js/emoji/1f91d-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1f91d-1f3fd.svg b/qml/js/emoji/1f91d-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1f91d-1f3fe.svg b/qml/js/emoji/1f91d-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1f91d-1f3ff.svg b/qml/js/emoji/1f91d-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1f979.svg b/qml/js/emoji/1f979.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1f9cc.svg b/qml/js/emoji/1f9cc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fa7b.svg b/qml/js/emoji/1fa7b.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fa7c.svg b/qml/js/emoji/1fa7c.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faa9.svg b/qml/js/emoji/1faa9.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faaa.svg b/qml/js/emoji/1faaa.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faab.svg b/qml/js/emoji/1faab.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faac.svg b/qml/js/emoji/1faac.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fab7.svg b/qml/js/emoji/1fab7.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fab8.svg b/qml/js/emoji/1fab8.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fab9.svg b/qml/js/emoji/1fab9.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faba.svg b/qml/js/emoji/1faba.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac3-1f3fb.svg b/qml/js/emoji/1fac3-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac3-1f3fc.svg b/qml/js/emoji/1fac3-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac3-1f3fd.svg b/qml/js/emoji/1fac3-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac3-1f3fe.svg b/qml/js/emoji/1fac3-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac3-1f3ff.svg b/qml/js/emoji/1fac3-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac3.svg b/qml/js/emoji/1fac3.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac4-1f3fb.svg b/qml/js/emoji/1fac4-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac4-1f3fc.svg b/qml/js/emoji/1fac4-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac4-1f3fd.svg b/qml/js/emoji/1fac4-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac4-1f3fe.svg b/qml/js/emoji/1fac4-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac4-1f3ff.svg b/qml/js/emoji/1fac4-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac4.svg b/qml/js/emoji/1fac4.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac5-1f3fb.svg b/qml/js/emoji/1fac5-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac5-1f3fc.svg b/qml/js/emoji/1fac5-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac5-1f3fd.svg b/qml/js/emoji/1fac5-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac5-1f3fe.svg b/qml/js/emoji/1fac5-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac5-1f3ff.svg b/qml/js/emoji/1fac5-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fac5.svg b/qml/js/emoji/1fac5.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fad7.svg b/qml/js/emoji/1fad7.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fad8.svg b/qml/js/emoji/1fad8.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fad9.svg b/qml/js/emoji/1fad9.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fae0.svg b/qml/js/emoji/1fae0.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fae1.svg b/qml/js/emoji/1fae1.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fae2.svg b/qml/js/emoji/1fae2.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fae3.svg b/qml/js/emoji/1fae3.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fae4.svg b/qml/js/emoji/1fae4.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fae5.svg b/qml/js/emoji/1fae5.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fae6.svg b/qml/js/emoji/1fae6.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1fae7.svg b/qml/js/emoji/1fae7.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf0-1f3fb.svg b/qml/js/emoji/1faf0-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf0-1f3fc.svg b/qml/js/emoji/1faf0-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf0-1f3fd.svg b/qml/js/emoji/1faf0-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf0-1f3fe.svg b/qml/js/emoji/1faf0-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf0-1f3ff.svg b/qml/js/emoji/1faf0-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf0.svg b/qml/js/emoji/1faf0.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fb-200d-1faf2-1f3fc.svg b/qml/js/emoji/1faf1-1f3fb-200d-1faf2-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fb-200d-1faf2-1f3fd.svg b/qml/js/emoji/1faf1-1f3fb-200d-1faf2-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fb-200d-1faf2-1f3fe.svg b/qml/js/emoji/1faf1-1f3fb-200d-1faf2-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fb-200d-1faf2-1f3ff.svg b/qml/js/emoji/1faf1-1f3fb-200d-1faf2-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fb.svg b/qml/js/emoji/1faf1-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fc-200d-1faf2-1f3fb.svg b/qml/js/emoji/1faf1-1f3fc-200d-1faf2-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fc-200d-1faf2-1f3fd.svg b/qml/js/emoji/1faf1-1f3fc-200d-1faf2-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fc-200d-1faf2-1f3fe.svg b/qml/js/emoji/1faf1-1f3fc-200d-1faf2-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fc-200d-1faf2-1f3ff.svg b/qml/js/emoji/1faf1-1f3fc-200d-1faf2-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fc.svg b/qml/js/emoji/1faf1-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fd-200d-1faf2-1f3fb.svg b/qml/js/emoji/1faf1-1f3fd-200d-1faf2-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fd-200d-1faf2-1f3fc.svg b/qml/js/emoji/1faf1-1f3fd-200d-1faf2-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fd-200d-1faf2-1f3fe.svg b/qml/js/emoji/1faf1-1f3fd-200d-1faf2-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fd-200d-1faf2-1f3ff.svg b/qml/js/emoji/1faf1-1f3fd-200d-1faf2-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fd.svg b/qml/js/emoji/1faf1-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fe-200d-1faf2-1f3fb.svg b/qml/js/emoji/1faf1-1f3fe-200d-1faf2-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fe-200d-1faf2-1f3fc.svg b/qml/js/emoji/1faf1-1f3fe-200d-1faf2-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fe-200d-1faf2-1f3fd.svg b/qml/js/emoji/1faf1-1f3fe-200d-1faf2-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fe-200d-1faf2-1f3ff.svg b/qml/js/emoji/1faf1-1f3fe-200d-1faf2-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3fe.svg b/qml/js/emoji/1faf1-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3ff-200d-1faf2-1f3fb.svg b/qml/js/emoji/1faf1-1f3ff-200d-1faf2-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3ff-200d-1faf2-1f3fc.svg b/qml/js/emoji/1faf1-1f3ff-200d-1faf2-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3ff-200d-1faf2-1f3fd.svg b/qml/js/emoji/1faf1-1f3ff-200d-1faf2-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3ff-200d-1faf2-1f3fe.svg b/qml/js/emoji/1faf1-1f3ff-200d-1faf2-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1-1f3ff.svg b/qml/js/emoji/1faf1-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf1.svg b/qml/js/emoji/1faf1.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf2-1f3fb.svg b/qml/js/emoji/1faf2-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf2-1f3fc.svg b/qml/js/emoji/1faf2-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf2-1f3fd.svg b/qml/js/emoji/1faf2-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf2-1f3fe.svg b/qml/js/emoji/1faf2-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf2-1f3ff.svg b/qml/js/emoji/1faf2-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf2.svg b/qml/js/emoji/1faf2.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf3-1f3fb.svg b/qml/js/emoji/1faf3-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf3-1f3fc.svg b/qml/js/emoji/1faf3-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf3-1f3fd.svg b/qml/js/emoji/1faf3-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf3-1f3fe.svg b/qml/js/emoji/1faf3-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf3-1f3ff.svg b/qml/js/emoji/1faf3-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf3.svg b/qml/js/emoji/1faf3.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf4-1f3fb.svg b/qml/js/emoji/1faf4-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf4-1f3fc.svg b/qml/js/emoji/1faf4-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf4-1f3fd.svg b/qml/js/emoji/1faf4-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf4-1f3fe.svg b/qml/js/emoji/1faf4-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf4-1f3ff.svg b/qml/js/emoji/1faf4-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf4.svg b/qml/js/emoji/1faf4.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf5-1f3fb.svg b/qml/js/emoji/1faf5-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf5-1f3fc.svg b/qml/js/emoji/1faf5-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf5-1f3fd.svg b/qml/js/emoji/1faf5-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf5-1f3fe.svg b/qml/js/emoji/1faf5-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf5-1f3ff.svg b/qml/js/emoji/1faf5-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf5.svg b/qml/js/emoji/1faf5.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf6-1f3fb.svg b/qml/js/emoji/1faf6-1f3fb.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf6-1f3fc.svg b/qml/js/emoji/1faf6-1f3fc.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf6-1f3fd.svg b/qml/js/emoji/1faf6-1f3fd.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf6-1f3fe.svg b/qml/js/emoji/1faf6-1f3fe.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf6-1f3ff.svg b/qml/js/emoji/1faf6-1f3ff.svg old mode 100755 new mode 100644 diff --git a/qml/js/emoji/1faf6.svg b/qml/js/emoji/1faf6.svg old mode 100755 new mode 100644 diff --git a/rpm/harbour-fernschreiber.spec b/rpm/harbour-fernschreiber.spec index c482b80..e8833bb 100644 --- a/rpm/harbour-fernschreiber.spec +++ b/rpm/harbour-fernschreiber.spec @@ -7,7 +7,7 @@ Name: harbour-fernschreiber # >> macros %define __provides_exclude_from ^%{_datadir}/.*$ -%define __requires_exclude ^libtdjson.*$ +%define __requires_exclude ^lib(tdjson|ssl|crypto).*$ # << macros Summary: Fernschreiber is a Telegram client for Sailfish OS @@ -29,7 +29,7 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5Positioning) BuildRequires: pkgconfig(nemonotifications-qt5) -BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(openssl) >= 1.1.1k BuildRequires: gperf BuildRequires: desktop-file-utils @@ -58,7 +58,8 @@ make %{?_smp_mflags} rm -rf %{buildroot} # >> install pre # << install pre -%qmake5_install +#%qmake5_install +make INSTALL_ROOT=%{buildroot} install # >> install post # << install post diff --git a/rpm/harbour-fernschreiber.yaml b/rpm/harbour-fernschreiber.yaml deleted file mode 100644 index 9a4782a..0000000 --- a/rpm/harbour-fernschreiber.yaml +++ /dev/null @@ -1,50 +0,0 @@ -Name: harbour-fernschreiber -Summary: Fernschreiber is a Telegram client for Sailfish OS -Version: 0.17 -Release: 1 -# The contents of the Group field should be one of the groups listed here: -# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS -Group: Qt/Qt -URL: http://werkwolf.eu/ -License: LICENSE -# This must be generated before uploading a package to a remote build service. -# Usually this line does not need to be modified. -Sources: -- '%{name}-%{version}.tar.bz2' -Description: | - Fernschreiber is a Telegram client for Sailfish OS -Configure: none -Builder: qmake5 - -# This section specifies build dependencies that are resolved using pkgconfig. -# This is the preferred way of specifying build dependencies for your package. -PkgConfigBR: - - sailfishapp >= 1.0.2 - - Qt5Core - - Qt5Qml - - Qt5Quick - - Qt5DBus - - Qt5Sql - - Qt5Multimedia - - Qt5Positioning - - nemonotifications-qt5 - - openssl - -# Build dependencies without a pkgconfig setup can be listed here -PkgBR: - - gperf - -# Runtime dependencies which are not automatically detected -Requires: - - sailfishsilica-qt5 >= 0.10.9 - - nemo-qml-plugin-contacts-qt5 - -# All installed files -Files: - - '%{_bindir}' - - '%{_datadir}/%{name}' - - '%{_datadir}/applications/%{name}.desktop' - - '%{_datadir}/icons/hicolor/*/apps/%{name}.png' - -# For more information about yaml and what's supported in Sailfish OS -# build system, please see https://wiki.merproject.org/wiki/Spectacle