[sawfish] improved specfile; add --nocfg flag to autogen.sh

[Christopher Bratusek <chrisb src gnome org>]

commit 1f18876f3dc43061291d0640b12aa8f164c398f0
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Sat Jan 2 11:27:02 2010 +0100

    improved specfile; add --nocfg flag to autogen.sh

 ChangeLog       |    4 ++++
 autogen.sh      |    4 +++-
 man/news.texi   |    2 +-
 sawfish.spec.in |    7 ++-----
 4 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c689938..3127596 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,10 @@
 	* configure.in: bump minimum librep to 0.90.5
 	                bump minimum rep-gtk to 0.90.2
 
+	* autogen.sh: added --nocfg flag for not running configure afterwards
+
+	* sawfish.spec.in: improved [Kim B. Heino]
+
 2009-12-30  Timo Korvola <tkorvola iki fi>
 	* lisp/sawfish/wm/commands/shrink-yank.jl: fixed docstrings
 
diff --git a/autogen.sh b/autogen.sh
index 5308b0e..ef368bc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -34,4 +34,6 @@ if [ -f configure.in ]; then
   autoconf $AUTOCONF_FLAGS || exit 1
 fi
 
-./configure "$@"
+if [ "${1}" != "--nocfg" ]; then
+	./configure "$@"
+fi
diff --git a/man/news.texi b/man/news.texi
index e3beda7..d715c5b 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -35,7 +35,7 @@ Make $datadir/kde4/apps/ the fallback path, if KDE4 is not installed.
 [Kim B. Heino]
 
 @item Improved debian and rpm packaging scripts.
-[Christopher Bratusek]
+[Christopher Bratusek] [Kim B. Heino]
 
 @item The spec has been reworked to detect kde4/librep directories while runtime,
 instead of hardcoding those paths from configure, which makes it more portable.
diff --git a/sawfish.spec.in b/sawfish.spec.in
index b8304b9..1c4a93f 100644
--- a/sawfish.spec.in
+++ b/sawfish.spec.in
@@ -31,12 +31,9 @@ using a GTK+ interface.  Sawfish is mostly GNOME compliant
 %setup -q
 
 %build
-./autogen.sh \
-	--x-libraries=%{_libdir} \
-	--x-includes=/usr/include/X11
-
+./autogen.sh --nocfg
 %configure
-make host_type=%{_target_platform}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT