- X doesn't seem to be used, disable it explicitly (and kill BR)

- double configure hack seems no longer needed
- release 2

Changed files:
    gdb.spec -> 1.85

diff --git a/gdb.spec b/gdb.spec
index d810e25fbc12b94dbfc44a0bcac4f50650fa96a9..1fdb1e617b1c15eb068ed918d484df1c70376638 100644 (file)
--- a/gdb.spec
+++ b/gdb.spec
@@ -11,7 +11,7 @@ Summary(zh_CN):       [
 Summary(zh_TW):        [.-A¶}µo]C©M.$)B¨ä.-A¥L»y.$)B¨¥ªº½Õ¸Õ¾¹
 Name:          gdb
 Version:       6.4
-Release:       1
+Release:       2
 License:       GPL
 Group:         Development/Debuggers
 Source0:       ftp://ftp.gnu.org/gnu/gdb/%{name}-%{version}.tar.bz2
@@ -24,7 +24,6 @@ Patch2:               %{name}-passflags.patch
 # updated from http://www.math.uni.wroc.pl/~hebisch/gpc/gdb-6.1.diff
 Patch3:                %{name}-gpc.patch
 Patch4:                %{name}-gdbinit-stat.patch
-BuildRequires: XFree86-devel
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 BuildRequires: bison
@@ -109,25 +108,22 @@ cp -f /usr/share/automake/config.* .
 # !! Don't enable shared here !!
 # This will cause serious problems --misiek
 %configure2_13 \
+       --disable-gdbtk \
        --disable-shared \
-       --enable-nls \
-       --without-included-gettext \
-       --without-included-regex \
-       --enable-gdcli \
+       --enable-gdbcli \
        --enable-gdbmi \
        --enable-multi-ice \
        --enable-netrom \
-       --with-cpu=%{_target_cpu} \
+       --enable-nls \
        --enable-tui \
+       --with-cpu=%{_target_cpu} \
+       --without-included-gettext \
+       --without-included-regex \
+       --without-x \
 %ifnarch alpha
        --with-mmalloc
 %endif
 
-# something is wrong after above - e.g. $exeext=="no" - fix it:
-cd gdb
-%configure
-cd ..
-
 %{__make}
 %{__make} info