--- gtk+.spec	Tue Mar 21 21:45:22 2000
+++ foo	Wed Mar 22 01:39:49 2000
@@ -1,6 +1,6 @@
 # Note that this is NOT a relocatable package
 %define ver      1.2.7
-%define rel      3mdk
+%define rel      4mdk
 %define prefix   /usr
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
@@ -19,6 +19,7 @@
 URL: http://www.gtk.org
 Requires: glib >= %{version}
 Docdir: %{prefix}/doc
+Prefix: %{prefix}
 
 %description
 The gtk+ package contains the GIMP ToolKit (GTK+), a library for creating
@@ -52,6 +53,10 @@
 need to install the gtk+ package.
 
 %changelog
+* Wed Mar 22 2000 Geoffrey Lee <snailtalk@linux-mandrake.com>
+- fixed problem of include files being placed in /usr/local
+- disabled strip, because we have the spec helper
+
 * Tue Mar 21 2000 DindinX <odin@mandrakesoft.com> 1.2.7-3mdk
 - Patches cleanups (now use 1.2.7 from www.gtk.org instead of 1.2.4 + patches
 
@@ -207,7 +212,7 @@
   Otto Hammersmith <otto@redhat.com>
   
 %prep
-%setup -n %{name}-%{ver}
+%setup -q -n %{name}-%{ver}
 
 tar yxvf %{SOURCE2}
 tar yxvf %{SOURCE3}
@@ -216,9 +221,9 @@
 
 %build
 [ -f ./autogen.sh ] && {
-CFLAGS="$RPM_OPT_FLAGS" sh ./autogen.sh --prefix=%prefix --sysconfdir="/etc" --with-xinput=xfree --enable-debug=no
+CFLAGS="$RPM_OPT_FLAGS" sh ./autogen.sh --prefix=%{prefix} --sysconfdir="/etc" --with-xinput=xfree --enable-debug=no
 } || {
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir="/etc" --with-xinput=xfree --enable-debug=no
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --sysconfdir="/etc" --with-xinput=xfree --enable-debug=no
 }
 
 if [ x"$SMP" != x"" ]; then
@@ -236,11 +241,12 @@
 
 install -m 444 %{SOURCE1} $RPM_BUILD_ROOT/etc/gtk/gtkrc
 
-find $RPM_BUILD_ROOT/ -type 'f' -name '*[0-9]'|xargs file|grep troff\
-|cut -d: -f1|xargs bzip2 -9
-for i in `find $RPM_BUILD_ROOT/ -type 'f' -perm '+a=x'`;do
-	file $i|grep -q "not stripped" && strip $i
-done
+# disabled this because we have spec helper
+#find $RPM_BUILD_ROOT/ -type 'f' -name '*[0-9]'|xargs file|grep troff\
+#|cut -d: -f1|xargs bzip2 -9
+#for i in `find $RPM_BUILD_ROOT/ -type 'f' -perm '+a=x'`;do
+#	file $i|grep -q "not stripped" && strip $i
+#done
 
 # i18n garbage with this one.
 rm -f $RPM_BUILD_ROOT/etc/gtk/gtkrc