From b2cdb546e1e655983a4fb9ea33fa7b7dded93f39bfbd843ed6de1f20172118c0 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 17 May 2017 20:07:46 +0000 Subject: [PATCH 1/5] KDE Applications 17.04.1 checkin OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lokalize?expand=0&rev=57 --- lokalize-17.04.0.tar.xz | 3 --- lokalize-17.04.1.tar.xz | 3 +++ lokalize.changes | 10 ++++++++++ lokalize.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 lokalize-17.04.0.tar.xz create mode 100644 lokalize-17.04.1.tar.xz diff --git a/lokalize-17.04.0.tar.xz b/lokalize-17.04.0.tar.xz deleted file mode 100644 index d0ab589..0000000 --- a/lokalize-17.04.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12f905be1267ee0292645a5dbc8064f0bf5249bce723d63ca30af409578b54be -size 1941328 diff --git a/lokalize-17.04.1.tar.xz b/lokalize-17.04.1.tar.xz new file mode 100644 index 0000000..4ebb7dd --- /dev/null +++ b/lokalize-17.04.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd16c87cf3f45cfa57808f3bcc38ec175b81cbc4b54f2a7e3b1592dacccb7b1a +size 1941608 diff --git a/lokalize.changes b/lokalize.changes index 87611c6..ae12ce6 100644 --- a/lokalize.changes +++ b/lokalize.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed May 17 20:37:22 CEST 2017 - lbeltrame@kde.org + +- Update to 17.04.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.1.php +- Changes since 17.04.0: + * None + ------------------------------------------------------------------- Sun Apr 16 10:45:18 CEST 2017 - lbeltrame@kde.org diff --git a/lokalize.spec b/lokalize.spec index 947f0a6..39a67b9 100644 --- a/lokalize.spec +++ b/lokalize.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: lokalize -Version: 17.04.0 +Version: 17.04.1 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From 783ffb4dfd6f97b43e8bb2c650fb2b84f4fb47e46db020c2f69171de1288f366 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 18 May 2017 04:47:18 +0000 Subject: [PATCH 2/5] - Remove stray locale folder (afteer discussion with upstream) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lokalize?expand=0&rev=58 --- lokalize.changes | 5 +++++ lokalize.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/lokalize.changes b/lokalize.changes index ae12ce6..48e973e 100644 --- a/lokalize.changes +++ b/lokalize.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 18 04:46:49 UTC 2017 - lbeltrame@kde.org + +- Remove stray locale folder (afteer discussion with upstream) + ------------------------------------------------------------------- Wed May 17 20:37:22 CEST 2017 - lbeltrame@kde.org diff --git a/lokalize.spec b/lokalize.spec index 39a67b9..4455871 100644 --- a/lokalize.spec +++ b/lokalize.spec @@ -75,6 +75,8 @@ export CFLAGS="%{optflags} -fPIC" %install %kf5_makeinstall -C build %if %{with lang} + # Remove bogus folder + rm -r %{_buildroot}/usr/share/locale/sr/docs/ %find_lang %{name} --with-man --all-name %kf5_find_htmldocs %endif From 72e71c27305a54e83c50839f11ac657c9c37e3e9b8d3180b82a3e0f1786d5195 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 18 May 2017 04:49:37 +0000 Subject: [PATCH 3/5] Typo OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lokalize?expand=0&rev=59 --- lokalize.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lokalize.spec b/lokalize.spec index 4455871..215e94d 100644 --- a/lokalize.spec +++ b/lokalize.spec @@ -76,7 +76,7 @@ export CFLAGS="%{optflags} -fPIC" %kf5_makeinstall -C build %if %{with lang} # Remove bogus folder - rm -r %{_buildroot}/usr/share/locale/sr/docs/ + rm -r %{buildroot}/usr/share/locale/sr/docs/ %find_lang %{name} --with-man --all-name %kf5_find_htmldocs %endif From 0ce5d811be48d631c57c2222a48f278e2e6c148a91b743bf2f28eb46ab9feb6a Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 18 May 2017 04:57:27 +0000 Subject: [PATCH 4/5] Use fdupes to remove some duplicated files OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lokalize?expand=0&rev=60 --- lokalize.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lokalize.spec b/lokalize.spec index 215e94d..35097c7 100644 --- a/lokalize.spec +++ b/lokalize.spec @@ -48,6 +48,7 @@ BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Script) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: fdupes Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} Recommends: %{name}-lang @@ -81,6 +82,7 @@ export CFLAGS="%{optflags} -fPIC" %kf5_find_htmldocs %endif %suse_update_desktop_file -r org.kde.lokalize Development Translation + %fdupes -s %{buildroot}%{_kf5_sharedir}/lokalize %files %defattr(-,root,root) From f4adc8548f2eeb9e7dd8fe1856dc9cca76e95d3df1c1f8891404b74ff6b53733 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 18 May 2017 05:03:07 +0000 Subject: [PATCH 5/5] Use -rf for the rm, it only happens with KF 5.34 or higher OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lokalize?expand=0&rev=61 --- lokalize.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lokalize.spec b/lokalize.spec index 35097c7..7df0cbc 100644 --- a/lokalize.spec +++ b/lokalize.spec @@ -77,7 +77,7 @@ export CFLAGS="%{optflags} -fPIC" %kf5_makeinstall -C build %if %{with lang} # Remove bogus folder - rm -r %{buildroot}/usr/share/locale/sr/docs/ + rm -rf %{buildroot}/usr/share/locale/sr/docs/ %find_lang %{name} --with-man --all-name %kf5_find_htmldocs %endif