[kf5/f20: 2/2] KDE Frameworks 5.7.0

[Daniel Vrátil]

commit 3290eea5badc7fceacc7c5852673bfadbd8c9364
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Fri Feb 13 13:19:24 2015 +0100

    KDE Frameworks 5.7.0

 kf5.spec   |   24 +++++++++++++-----------
 macros.kf5 |   18 ++++++++++++++++++
 2 files changed, 31 insertions(+), 11 deletions(-)
---
diff --git a/kf5.spec b/kf5.spec
index 097db87..0957e54 100644
--- a/kf5.spec
+++ b/kf5.spec
@@ -1,15 +1,13 @@
 Name:           kf5
-Version:        5.6.0
+Version:        5.7.0
 Release:        2%{?dist}
 Summary:        Filesystem and RPM macros for KDE Frameworks 5
+BuildArch:      noarch
 License:        BSD
 URL:            http://www.kde.org
 
 Source0:        macros.kf5
 
-# noarch -> arch transition
-Obsoletes: kf5 < 5.5.0-2
-
 %description
 Filesystem and RPM macros for KDE Frameworks 5
 
@@ -20,15 +18,13 @@ Filesystem for KDE Frameworks 5.
 
 %package        rpm-macros
 Summary:        RPM macros for KDE Frameworks 5
-BuildArch:      noarch
 %description    rpm-macros
 RPM macros for building KDE Frameworks 5 packages.
 
 
 %install
 # See macros.kf5 where the directories are specified
-mkdir -p %{buildroot}%{_prefix}/lib/qt5/plugins/kf5
-mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt5/plugins/kf5
+mkdir -p %{buildroot}%{_libdir}/qt5/plugins/kf5
 mkdir -p %{buildroot}%{_includedir}/KF5
 mkdir -p %{buildroot}%{_libexecdir}/kf5
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown}
@@ -50,22 +46,28 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d
 
 
 %changelog
+* Tue Feb 10 2015 Daniel Vrátil <dvratil at redhat.com> - 5.7.0-2
+- add %%find_lang_kf5 macro to macros.kf5 to workaround %%find_lang bugs
+
+* Mon Feb 09 2015 Daniel Vrátil <dvratil at redhat.com> - 5.7.0-1
+- KDE Frameworks 5.7.0
+
 * Fri Jan 30 2015 Rex Dieter <rdieter at fedoraproject.org> 5.6.0-2
 - own /etc/xdg/plasma-workspace/, /etc/xdg/plasma-workspace/{env,shutdown}
 
 * Tue Jan 08 2015 Daniel Vrátil <dvratil at redhat.com> - 5.6.0-1
 - KDE Frameworks 5.6.0
 
-* Thu Dec 18 2014 Rex Dieter <rdieter at fedoraproject.org> 5.5.0-2
-- make pkg arch'd, own %%_prefix/%%_lib and %%_prefix/lib
+* Tue Jan 06 2015 Daniel Vrátil <dvratil at redhat.com> - 5.6.0-1
+- KDE Frameworks 5.6.0
 
-* Thu Dec 11 2014 Daniel Vrátil <dvratil at redhat.com> - 5.5.0-1
+* Sat Dec 06 2014 Daniel Vrátil <dvratil at redhat.com> - 5.5.0-1
 - KDE Frameworks 5.5.0
 
 * Mon Nov 24 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-2
 - macros.kf5: PATH, prepend %%_qt5_bindir instead of %%_kf5_bindir (ie, /usr/bin)
 
-* Mon Nov 03 2014 Daniel Vrátil <dvratil at redhat.com> - 5.4.0-1
+* Mon Nov 03 2014 Daniel Vrátil <dvratil at redhat.com> - 5.3.0-1
 - KDE Frameworks 5.4.0
 
 * Tue Oct 14 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.0-2
diff --git a/macros.kf5 b/macros.kf5
index 20d541e..cfa5bb0 100644
--- a/macros.kf5
+++ b/macros.kf5
@@ -47,3 +47,21 @@
     -DKF5_LIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} \\\
     -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} \\\
     -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON
+
+# %%find_lang_kf5
+#
+# This macro is used in KDE Frameworks 5 packages instead of %%find_lang,
+# becasue find_lang is broken an it thinks that "_qt" in foobar_qt.qm is
+# the name of the language.
+# This macro should NOT be used with anything else but KDE Frameworks, since
+# it does some assumptions regarding the names and locations and it might not
+# work with other packages.
+# We should eventually get this to RPM, or fix %%find_lang
+#                                                       -- dvratil
+# Usage: find_lang_kf5 fooBar5
+#   - will look for fooBar5_qt.qm files in %%{buildroot}/usr/share/locale/
+#
+%find_lang_kf5() \
+    (find %{buildroot}/%{_datadir}/locale/ -name "%1.qm" -type f | sed ' \
+        s:%{buildroot}/:: \
+        s:%{_datadir}/locale/\\([a-zA-Z_\\@]*\\)/\\([a-zA-Z_]*\\)/%1.qm:%lang(\\1) %{_datadir}/locale/\\1/\\2/%1.qm:' > %1.lang)