Merge pull request #1660 from DeadMozay/develop

Updating the location of localization files

build-systems/aur/PKGBUILD

@@ -40,6 +40,6 @@ package() {
     install -D -m644 "images/icons/scalable/apps/QOwnNotes.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/QOwnNotes.svg"
 
     # install languages
-    install -d "${pkgdir}/usr/share/QOwnNotes/languages/"
-    install -D -m644 languages/*.qm "${pkgdir}/usr/share/QOwnNotes/languages/"
+    install -d "${pkgdir}/usr/share/qt5/translations/"
+    install -D -m644 languages/*.qm "${pkgdir}/usr/share/qt5/translations/"
 }

build-systems/gentoo/qownnotes.ebuild

@@ -47,8 +47,8 @@ src_install() {
 	emake
 	dobin QOwnNotes
 
-	dodir /usr/share/QOwnNotes/languages
-	insinto /usr/share/QOwnNotes/languages
+	dodir /usr/share/qt5/translations
+	insinto /usr/share/qt5/translations
 
 	doins languages/*.qm
 

obs/PKGBUILD

@@ -37,6 +37,6 @@ package() {
     install -D -m644 "images/icons/scalable/apps/QOwnNotes.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/QOwnNotes.svg"
 
     # install languages
-    install -d "${pkgdir}/usr/share/QOwnNotes/languages/"
-    install -D -m644 languages/*.qm "${pkgdir}/usr/share/QOwnNotes/languages/"
+    install -d "${pkgdir}/usr/share/qt5/translations/"
+    install -D -m644 languages/*.qm "${pkgdir}/usr/share/qt5/translations/"
 }

obs/qownnotes.spec

@@ -5,30 +5,28 @@
 # https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto
 #
 
-
+%global lrelease_qt5 /usr/bin/lrelease-qt5
 Name:           qownnotes
-BuildRequires:  gcc gcc-c++ fdupes
+BuildRequires:  gcc-c++ fdupes
+BuildRequires:  pkgconfig(Qt5Svg)
+BuildRequires:  pkgconfig(Qt5Qml)
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Concurrent)
+BuildRequires:  pkgconfig(Qt5XmlPatterns)
+BuildRequires:  pkgconfig(Qt5WebSockets)
 
 # This is for all Fedora CentOS 7
 %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?centos} >= 7
 
-BuildRequires:  qt5-qtbase
-BuildRequires:  qt5-qtbase-devel
-BuildRequires:  qt5-qtbase-gui
-#BuildRequires:  qt5-qtwebkit-devel
-BuildRequires:  qt5-qttools qt5-qttools-devel
-BuildRequires:  qt5-qtsvg-devel
-BuildRequires:  qt5-qtdeclarative-devel
-BuildRequires:  qt5-qtxmlpatterns-devel
-BuildRequires:  qt5-qtwebsockets-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  aspell-devel
+BuildRequires:  qt5-linguist
 Requires:       qt5-qtsvg qt5-qtxmlpatterns qt5-qtwebsockets
 
 %else
 # This is for all SUSE
 
-BuildRequires:  libqt5-qtbase-devel libqt5-qtdeclarative-devel libQt5Svg-devel libQt5XmlPatterns-devel libqt5-qtwebsockets-devel
+BuildRequires:  libqt5-qtbase-devel libqt5-qtdeclarative-devel libQt5Svg-devel libQt5XmlPatterns-devel libqt5-qtwebsockets-devel libqt5-linguist
 
 # no aspell for SLE
 %if 0%{?sle_version} == 150000 || 0%{?sle_version} == 150100 && !0%{?is_backports}
@@ -48,6 +46,9 @@ Requires:   libQtQuick5
 #Requires:   libQt5Declarative5
 #%endif
 
+%endif
+%if 0%{?suse_version}
+Recommends:     %{name}-lang
 %endif
 
 License:        GPL-2.0
@@ -56,7 +57,6 @@ Summary:        Note-taking app and todo list manager with ownCloud/Nextcloud in
 Url:            https://www.qownnotes.org/
 Version:        VERSION-STRING
 Release:        1%{?dist}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.xz
 
 
@@ -75,6 +75,9 @@ Author
 ======
 Patrizio Bekerle <patrizio@bekerle.com>
 
+%if 0%{?suse_version}
+%lang_package
+%endif
 
 # Fedora 27 and above wasn't able to create debug packages
 %if 0%{?fedora} >= 27
@@ -86,9 +89,14 @@ Patrizio Bekerle <patrizio@bekerle.com>
 
 %prep
 %setup -q
+
 mkdir build
 pushd build
-qmake-qt5 ..
+%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?centos} >= 7
+%qmake_qt5 ..
+%else
+%qmake5 ..
+%endif
 popd
 
 %build
@@ -97,6 +105,7 @@ echo rhel_version   0%{?rhel_version}
 echo fedora 0%{?fedora}
 echo suse_version   0%{?suse_version}
 
+%{lrelease_qt5} QOwnNotes.pro
 pushd build
 CFLAGS=$RPM_OPT_FLAGS CCFLAGS=$CFLAGS
 
@@ -114,88 +123,15 @@ popd
 
 %install
 pushd build
-install -D -m 0755 QOwnNotes $RPM_BUILD_ROOT/%{_prefix}/bin/QOwnNotes
+export INSTALL_ROOT=%{buildroot}
+%make_install
 popd
 
-# manually install desktop file for Fedora and CentOS 7
-%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?centos} >= 7
-install -D -m 0644 PBE.QOwnNotes.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/PBE.QOwnNotes.desktop
-%endif
-
-install -D -m 0644 images/icons/128x128/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/QOwnNotes.png
-install -D -m 0644 images/icons/16x16/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/QOwnNotes.png
-install -D -m 0644 images/icons/24x24/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/24x24/apps/QOwnNotes.png
-install -D -m 0644 images/icons/32x32/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/QOwnNotes.png
-install -D -m 0644 images/icons/48x48/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/QOwnNotes.png
-install -D -m 0644 images/icons/64x64/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/64x64/apps/QOwnNotes.png
-install -D -m 0644 images/icons/96x96/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/96x96/apps/QOwnNotes.png
-install -D -m 0644 images/icons/128x128/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/128x128/apps/QOwnNotes.png
-install -D -m 0644 images/icons/256x256/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/256x256/apps/QOwnNotes.png
-install -D -m 0644 images/icons/512x512/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/512x512/apps/QOwnNotes.png
-install -D -m 0644 languages/QOwnNotes_en.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_en.qm
-install -D -m 0644 languages/QOwnNotes_de.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_de.qm
-install -D -m 0644 languages/QOwnNotes_fr.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_fr.qm
-install -D -m 0644 languages/QOwnNotes_pl.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_pl.qm
-install -D -m 0644 languages/QOwnNotes_zh_CN.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_zh_CN.qm
-install -D -m 0644 languages/QOwnNotes_zh_TW.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_zh_TW.qm
-install -D -m 0644 languages/QOwnNotes_ru.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ru.qm
-install -D -m 0644 languages/QOwnNotes_pt_BR.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_pt_BR.qm
-install -D -m 0644 languages/QOwnNotes_pt_PT.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_pt_PT.qm
-install -D -m 0644 languages/QOwnNotes_es.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_es.qm
-install -D -m 0644 languages/QOwnNotes_nl.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_nl.qm
-install -D -m 0644 languages/QOwnNotes_hu.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_hu.qm
-install -D -m 0644 languages/QOwnNotes_ja.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ja.qm
-install -D -m 0644 languages/QOwnNotes_it.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_it.qm
-install -D -m 0644 languages/QOwnNotes_ar.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ar.qm
-install -D -m 0644 languages/QOwnNotes_uk.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_uk.qm
-install -D -m 0644 languages/QOwnNotes_cs.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_cs.qm
-install -D -m 0644 languages/QOwnNotes_hr.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_hr.qm
-install -D -m 0644 languages/QOwnNotes_ca.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ca.qm
-install -D -m 0644 languages/QOwnNotes_sv.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_sv.qm
-install -D -m 0644 languages/QOwnNotes_id.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_id.qm
-install -D -m 0644 languages/QOwnNotes_bn.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_bn.qm
-install -D -m 0644 languages/QOwnNotes_tr.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_tr.qm
-install -D -m 0644 languages/QOwnNotes_tl.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_tl.qm
-install -D -m 0644 languages/QOwnNotes_fil.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_fil.qm
-install -D -m 0644 languages/QOwnNotes_ceb.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ceb.qm
-install -D -m 0644 languages/QOwnNotes_hi.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_hi.qm
-install -D -m 0644 languages/QOwnNotes_hil.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_hil.qm
-install -D -m 0644 languages/QOwnNotes_ur.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ur.qm
-install -D -m 0644 languages/QOwnNotes_fi.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_fi.qm
-install -D -m 0644 languages/QOwnNotes_el.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_el.qm
-install -D -m 0644 languages/QOwnNotes_gl.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_gl.qm
-install -D -m 0644 languages/QOwnNotes_no.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_no.qm
-install -D -m 0644 languages/QOwnNotes_da.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_da.qm
-install -D -m 0644 languages/QOwnNotes_ro.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ro.qm
-install -D -m 0644 languages/QOwnNotes_sl.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_sl.qm
-install -D -m 0644 languages/QOwnNotes_sk.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_sk.qm
-install -D -m 0644 languages/QOwnNotes_eu.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_eu.qm
-install -D -m 0644 languages/QOwnNotes_sr.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_sr.qm
-install -D -m 0644 languages/QOwnNotes_fa.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_fa.qm
-install -D -m 0644 languages/QOwnNotes_ha.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ha.qm
-install -D -m 0644 languages/QOwnNotes_bg.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_bg.qm
-install -D -m 0644 languages/QOwnNotes_is.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_is.qm
-install -D -m 0644 languages/QOwnNotes_pa.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_pa.qm
-install -D -m 0644 languages/QOwnNotes_sq.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_sq.qm
-install -D -m 0644 languages/QOwnNotes_he.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_he.qm
-install -D -m 0644 languages/QOwnNotes_xh.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_xh.qm
-install -D -m 0644 languages/QOwnNotes_ms.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ms.qm
-install -D -m 0644 languages/QOwnNotes_mi.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_mi.qm
-install -D -m 0644 languages/QOwnNotes_ga.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ga.qm
-install -D -m 0644 languages/QOwnNotes_uz.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_uz.qm
-install -D -m 0644 languages/QOwnNotes_vi.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_vi.qm
-install -D -m 0644 languages/QOwnNotes_lv.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_lv.qm
-install -D -m 0644 languages/QOwnNotes_ku.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ku.qm
-install -D -m 0644 languages/QOwnNotes_lt.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_lt.qm
-install -D -m 0644 languages/QOwnNotes_bs.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_bs.qm
-install -D -m 0644 languages/QOwnNotes_mk.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_mk.qm
-install -D -m 0644 languages/QOwnNotes_ko.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_ko.qm
-install -D -m 0644 languages/QOwnNotes_et.qm $RPM_BUILD_ROOT/%{_datadir}/QOwnNotes/languages/QOwnNotes_et.qm
-
 %if 0%{?suse_version}
 # see: https://de.opensuse.org/openSUSE:Paketbauvereinbarungen_zu_RPM-Makros
 %suse_update_desktop_file -c  PBE.QOwnNotes QOwnNotes QOwnNotes QOwnNotes QOwnNotes "Utility;SyncUtility;"
 %endif
+%find_lang QOwnNotes --with-qt
 
 %fdupes $RPM_BUILD_ROOT/%{_prefix}
 
@@ -206,98 +142,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc LICENSE README.md CHANGELOG.md shortcuts.md
 %{_bindir}/QOwnNotes
-%{_datadir}/pixmaps/QOwnNotes.png
-
-%{_datadir}/icons/hicolor/16x16/apps/QOwnNotes.png
-%{_datadir}/icons/hicolor/24x24/apps/QOwnNotes.png
-%{_datadir}/icons/hicolor/32x32/apps/QOwnNotes.png
-%{_datadir}/icons/hicolor/48x48/apps/QOwnNotes.png
-%{_datadir}/icons/hicolor/64x64/apps/QOwnNotes.png
-%{_datadir}/icons/hicolor/96x96/apps/QOwnNotes.png
-%{_datadir}/icons/hicolor/128x128/apps/QOwnNotes.png
-%{_datadir}/icons/hicolor/256x256/apps/QOwnNotes.png
-%{_datadir}/icons/hicolor/512x512/apps/QOwnNotes.png
-%{_datadir}/QOwnNotes/languages/QOwnNotes_en.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_de.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_fr.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_pl.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_zh_CN.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_zh_TW.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ru.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_pt_BR.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_pt_PT.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_es.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_nl.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_hu.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ja.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_it.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ar.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_uk.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_cs.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_hr.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ca.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_sv.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_id.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_bn.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_tr.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_tl.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_fil.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ceb.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_hi.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_hil.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ur.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_fi.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_el.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_gl.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_no.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_da.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ro.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_sl.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_sk.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_eu.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_sr.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_fa.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ha.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_bg.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_is.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_pa.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_sq.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_he.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_xh.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ms.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_mi.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ga.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_uz.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_vi.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_lv.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ku.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_lt.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_bs.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_mk.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_ko.qm
-%{_datadir}/QOwnNotes/languages/QOwnNotes_et.qm
+%{_datadir}/icons/hicolor/
+%{_datadir}/icons/hicolor/scalable/apps/QOwnNotes.svg
+%{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/applications/PBE.QOwnNotes.desktop
-
-%dir %{_datadir}/icons/hicolor/512x512/apps
-%dir %{_datadir}/icons/hicolor/256x256/apps
-%dir %{_datadir}/icons/hicolor/128x128/apps
-%dir %{_datadir}/icons/hicolor/96x96/apps
-%dir %{_datadir}/icons/hicolor/64x64/apps
-%dir %{_datadir}/icons/hicolor/48x48/apps
-%dir %{_datadir}/icons/hicolor/32x32/apps
-%dir %{_datadir}/icons/hicolor/24x24/apps
-%dir %{_datadir}/icons/hicolor/16x16/apps
-%dir %{_datadir}/icons/hicolor/512x512
-%dir %{_datadir}/icons/hicolor/256x256
-%dir %{_datadir}/icons/hicolor/128x128
-%dir %{_datadir}/icons/hicolor/96x96
-%dir %{_datadir}/icons/hicolor/64x64
-%dir %{_datadir}/icons/hicolor/48x48
-%dir %{_datadir}/icons/hicolor/32x32
-%dir %{_datadir}/icons/hicolor/24x24
-%dir %{_datadir}/icons/hicolor/16x16
-%dir %{_datadir}/icons/hicolor
-%dir %{_datadir}/QOwnNotes/languages
-%dir %{_datadir}/QOwnNotes
+%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?centos} >= 7
+%{_datadir}/qt5/
+%else
+%files lang -f QOwnNotes.lang
+%{_datadir}/qt5/
+%endif
 
 %changelog

src/QOwnNotes.pro

@@ -333,7 +333,7 @@ unix {
   desktop.path = $$DATADIR/applications
   desktop.files += PBE.QOwnNotes.desktop
 
-  i18n.path = $$DATADIR/QOwnNotes/languages
+  i18n.path = $$DATADIR/qt5/translations
   i18n.files += languages/*.qm
 
   icons.path = $$DATADIR/icons/hicolor