summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--metacity.spec21
1 files changed, 13 insertions, 8 deletions
diff --git a/metacity.spec b/metacity.spec
index 8161ffa..ff8351b 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -3,7 +3,7 @@
Summary: Metacity window manager
Name: metacity
Version: 2.8.6
-Release: 1
+Release: 2
URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
Source0: %{name}-%{version}.tar.bz2
License: GPL
@@ -40,10 +40,10 @@ GNOME 2.
%build
-libtoolize --copy --force
-aclocal-1.4
-automake-1.4
-autoconf
+#libtoolize --copy --force
+#aclocal-1.4
+#automake-1.4
+#autoconf
export LIBS="-L/usr/X11R6/%{_lib} -lXext -lX11"
%configure
@@ -51,9 +51,11 @@ export LIBS="-L/usr/X11R6/%{_lib} -lXext -lX11"
## intltool munges metacity.schemas in UTF-8 locale
## http://bugzilla.gnome.org/show_bug.cgi?id=91289
## force regeneration with intltool in non-UTF-8 locale
-rm -f src/metacity.schemas
-rm -f po/.intltool-merge-cache
-LANG=en_US.ISO-8859-1 make ## %{?_smp_mflags}
+#rm -f src/metacity.schemas
+#rm -f po/.intltool-merge-cache
+#LANG=en_US.ISO-8859-1 make ## %{?_smp_mflags}
+
+make
SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
@@ -108,6 +110,9 @@ done
%{_libdir}/pkgconfig/*
%changelog
+* Sat Oct 16 2004 Havoc Pennington <hp@redhat.com> 2.8.6-2
+- remove all the rerunning of autotools, intltool, etc. cruft; seemed to be breaking build
+
* Fri Oct 15 2004 Havoc Pennington <hp@redhat.com> 2.8.6-1
- upgrade to 2.8.6, fixes a lot of focus bugs primarily.