[sawfish] improved KDE4 detection (configure/spec) ; more portable spec

[Christopher Bratusek <chrisb src gnome org>]

commit e8d492bdafc9661818b985f1731cbbe744f270bd
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Mon Dec 28 16:36:39 2009 +0100

    improved KDE4 detection (configure/spec) ; more portable spec

 ChangeLog       |    5 +++++
 configure.in    |    2 +-
 sawfish.spec.in |   13 ++++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8d6d379..61f5615 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-28  Christopher Bratusek <zanghar freenet de>
+	* configure.in: use `kde4-config --install data' instead of `kde4-config --path data' [Kim B. Heino]
+
+	* sawfish.spec.in: find kde4/librep directories while runtime instead of hardcoding [Kim B. Heino]
+
 2009-12-27  Christopher Bratusek <zanghar freenet de>
 	* configure.in: improve configures help message for better readability [Kim B. Heino]
 
diff --git a/configure.in b/configure.in
index 8437f0d..c59eb0e 100644
--- a/configure.in
+++ b/configure.in
@@ -345,7 +345,7 @@ fi
 AC_MSG_RESULT($LINGUAS)
 
 dnl install directory for sawfish-ksm.desktop
-KDEDIR="`kde4-config --path data | sed -e 's/.*://g'`"
+KDEDIR="`kde4-config --install data`"
 
 if test "x$KDEDIR" = x; then
 	KDEDIR="/usr/share/apps/"
diff --git a/sawfish.spec.in b/sawfish.spec.in
index 2eadb5d..0744f0a 100644
--- a/sawfish.spec.in
+++ b/sawfish.spec.in
@@ -12,6 +12,13 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gmp-devel texinfo
 Provides: windowmanager
 
+%define rep_execdir %(pkg-config librep --variable=repcommonexecdir)
+%if %(kde4-config; echo $?)
+%define kde_apps %{_datadir}/apps/
+%else
+%define kde_apps %(kde4-config --install data)
+%endif
+
 %description
 Sawfish is an extensible window manager which uses a Lisp-based
 scripting language.  All window decorations are configurable and the
@@ -26,7 +33,7 @@ using a GTK+ interface.  Sawfish is mostly GNOME compliant
 %build
 ./autogen.sh \
 	--x-libraries=%{_libdir} \
-	--x-includes=/usr/include/X11 
+	--x-includes=/usr/include/X11
 
 %configure
 make host_type=%{_target_platform}
@@ -63,13 +70,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sawfish/%{version}
 %{_datadir}/gnome/wm-properties/sawfish-wm.desktop
 %{_datadir}/applications/sawfish.desktop
- KDEDIR@/ksmserver/windowmanagers/sawfish.desktop
+%{kde_apps}/ksmserver/windowmanagers/sawfish.desktop
 %{_datadir}/xsessions/sawfish.desktop
 %{_datadir}/man/man1/sawfish*.gz
 %{_datadir}/sawfish/sawfish.png
 %{_libdir}/pkgconfig/sawfish.pc
 %{_libdir}/sawfish/%{version}/%{_host}
- REP_EXECDIR@/sawfish
+%{rep_execdir}/sawfish
 %{_infodir}/sawfish*
 
 %changelog