diff --git a/.gitignore b/.gitignore index a5d8733..07eb4a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -/okteta-16.04.0.tar.xz -/okteta-16.04.1.tar.xz -/okteta-16.04.2.tar.xz -/okteta-16.04.3.tar.xz -/okteta-16.07.80.tar.xz -/okteta-16.07.90.tar.xz -/okteta-16.08.0.tar.xz -/okteta-16.08.1.tar.xz -/okteta-16.08.2.tar.xz -/okteta-16.08.3.tar.xz -/okteta-16.12.1.tar.xz -/okteta-16.12.2.tar.xz -/okteta-16.12.3.tar.xz +/okteta-17.04.1.tar.xz diff --git a/okteta.spec b/okteta.spec index 3afa980..2befc7a 100644 --- a/okteta.spec +++ b/okteta.spec @@ -1,10 +1,10 @@ Name: okteta Summary: Binary/hex editor -Version: 16.12.3 +Version: 17.04.1 Release: 1%{?dist} License: GPLv2+ and GFDL -URL: https://quickgit.kde.org/?p=%{name}.git +URL: https://cgit.kde.org/%{name}.git %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -46,6 +46,9 @@ BuildRequires: pkgconfig(Qt5Xml) BuildRequires: libappstream-glib %endif +# translations moved here +Conflicts: kde-l10n < 17.03 + Conflicts: kdesdk-common < 4.10.80 Obsoletes: kdesdk-okteta < 4.10.80 Provides: kdesdk-okteta = %{version}-%{release} @@ -98,6 +101,8 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%find_lang %{name} --all-name --with-html + test -f %{buildroot}%{_datadir}/appdata/okteta.appdata.xml && mv %{buildroot}%{_datadir}/appdata/okteta.appdata.xml \ %{buildroot}%{_datadir}/appdata/org.kde.okteta.appdata.xml @@ -110,11 +115,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.okteta.deskto %post touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||: -touch --no-create %{_kde4_datadir}/mime ||: +touch --no-create %{_datadir}/mime ||: %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||: -update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || : +update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %postun if [ $1 -eq 0 ] ; then @@ -124,7 +129,7 @@ touch --no-create %{_datadir}/mime ||: update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : fi -%files +%files -f %{name}.lang %doc README %license COPYING* %{_bindir}/okteta @@ -134,7 +139,6 @@ fi %{_datadir}/applications/org.kde.okteta.desktop %{_datadir}/kxmlgui5/okteta/ %{_datadir}/icons/hicolor/*/apps/okteta.* -%{_docdir}/HTML/en/okteta/ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -169,6 +173,9 @@ fi %changelog +* Sat Jun 03 2017 Rex Dieter - 17.04.1-1 +- 17.04.1 + * Thu Mar 09 2017 Rex Dieter - 16.12.3-1 - 16.12.3 diff --git a/sources b/sources index a6654de..bd47a68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (okteta-16.12.3.tar.xz) = d5d6d6fe989751679a584da264ac86dcb1f8adb993b91794662c03d4771ab9e6598bf904ec8064cc996527f5a7e8df17c12f0faf93b39f121eac5d21917c3b71 +SHA512 (okteta-17.04.1.tar.xz) = 75796e89bc712b2ab66dfb21ce4a48b260bf8ce34cc5454f06f04b88663fc2d0ed9a964bbc6a287ad5257db24d004ca83a11e6395a0be7ddb6549b8e209b4e14