Accepting request 97382 from editors

add autoconf to buildrequires (forwarded request 97341 from coolo)

OBS-URL: https://build.opensuse.org/request/show/97382
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=73

emacs-23.3.dif

@@ -348,6 +348,16 @@
  
  profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
  	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
+--- lib-src/pop.c
++++ lib-src/pop.c	2011-11-28 08:38:56.235647209 +0000
+@@ -29,6 +29,7 @@ along with GNU Emacs.  If not, see <http
+ #ifdef MAIL_USE_POP
+ 
+ #include <sys/types.h>
++#include <ctype.h>
+ #ifdef WINDOWSNT
+ #include "ntlib.h"
+ #include <winsock.h>
 --- lib-src/vcdiff
 +++ lib-src/vcdiff	2009-08-12 13:22:18.000000000 +0000
 @@ -76,6 +76,8 @@ esac
@@ -1231,3 +1241,13 @@
  /* Best not to include -lg, unless it is last on the command line */
  #define LIBS_DEBUG
  #undef LIB_GCC
+--- src/sysdep.c
++++ src/sysdep.c	2011-11-28 08:46:29.903146518 +0000
+@@ -131,6 +131,7 @@ extern int quit_char;
+ #include "dispextern.h"
+ #include "process.h"
+ #include "cm.h"  /* for reset_sys_modes */
++extern void tputs P_ ((const char *, int, int (*)(int)));
+ 
+ /* For serial_configure and serial_open.  */
+ extern Lisp_Object QCport, QCspeed, QCprocess;

emacs.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Dec 20 20:30:48 UTC 2011 - coolo@suse.com
+
+- add autoconf as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Tue Dec 20 20:23:40 UTC 2011 - coolo@suse.com
+
+- remove call to suse_update_config (very old work around)
+
+-------------------------------------------------------------------
+Mon Nov 28 08:36:10 UTC 2011 - werner@suse.de
+
+- Resolve build conflicts 
+
 -------------------------------------------------------------------
 Thu Nov 24 14:01:22 UTC 2011 - werner@suse.de
 

emacs.spec

@@ -16,25 +16,48 @@
 #
 
 
-
 Name:           emacs
-BuildRequires:  alsa-devel bind-devel dbus-1-devel elfutils fdupes fonts-config freetype2-devel gconf2-devel giflib-devel gtk2-devel krb5-devel libjpeg-devel libotf-devel libpng-devel librsvg-devel libtiff-devel m17n-lib-devel ncurses-devel nmh sendmail texinfo update-desktop-files xaw3d-devel xorg-x11-devel
+BuildRequires:  alsa-devel
+BuildRequires:  autoconf
+BuildRequires:  bind-devel
+BuildRequires:  dbus-1-devel
+BuildRequires:  elfutils
+BuildRequires:  fdupes
+BuildRequires:  fonts-config
+BuildRequires:  freetype2-devel
+BuildRequires:  gconf2-devel
+BuildRequires:  giflib-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  krb5-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libotf-devel
+BuildRequires:  libpng-devel
+BuildRequires:  librsvg-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  m17n-lib-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  nmh
+BuildRequires:  sendmail
+BuildRequires:  texinfo
+BuildRequires:  update-desktop-files
+BuildRequires:  xaw3d-devel
+BuildRequires:  xorg-x11-devel
 %if 0%{?suse_version} > 1130
 BuildRequires:  gpm-devel
 %else
 BuildRequires:  gpm
 %endif
 Url:            http://www.gnu.org/software/emacs/
-License:        GPLv2+
-Group:          Productivity/Editors/Emacs
 Version:        23.3
-Release:        2
+Release:        0
 Obsoletes:      ge_exec ge_site emacmisc emacsger emacs-url Mule-UCS emacs-calc erc
 Requires:       emacs-info = %{version}
 Requires:       emacs_program = %{version}-%{release}
 Requires:       ctags
 Provides:       ge_site ge_exec emacs-url Mule-UCS emacs-calc erc emacmisc
 Summary:        GNU Emacs Base Package
+License:        GPL-2.0+
+Group:          Productivity/Editors/Emacs
 Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-23.3a.tar.bz2
 Source1:        app-defaults.Emacs
 Source2:        site-lisp.tar.bz2
@@ -82,13 +105,11 @@ Basic package for the GNU Emacs editor. Requires emacs-x11 or
 emacs-nox.
 
 %package     -n emacs-nox
-License:        GPLv2+
 PreReq:         fileutils
 Obsoletes:      emac_nox
 Requires:       emacs = %{version}-%{release}
 Provides:       emacs_program = %{version}-%{release}, emac_nox
 Summary:        GNU Emacs-nox: An Emacs Binary without X Window System Support
-Group:          Productivity/Editors/Emacs
 
 %description -n emacs-nox
 Eight Megabytes And Constantly Swapping. Call it
@@ -98,7 +119,6 @@ emacs-nox
 Love it or leave it.
 
 %package     -n emacs-x11
-License:        GPLv2+
 PreReq:         fileutils
 Obsoletes:      emacsbin
 Requires:       emacs = %{version}-%{release}
@@ -106,7 +126,6 @@ Enhances:       xorg-x11-libs
 Provides:       emacs_program = %{version}-%{release} emacsbin
 Provides:       emacs:/usr/bin/emacs ge_exec:/usr/bin/emacs
 Summary:        GNU Emacs: Emacs binary with X Window System Support
-Group:          Productivity/Editors/Emacs
 
 %description -n emacs-x11
 Call it
@@ -117,12 +136,10 @@ Love it or leave it. This is the Emacs binary with X Window System
 Support.
 
 %package     -n emacs-el
-License:        GPLv2+
 Obsoletes:      ge_lisp
 Requires:       emacs = %{version}-%{release}
 Provides:       ge_lisp
 Summary:        Several Lisp Files for GNU Emacs
-Group:          Productivity/Editors/Emacs
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
@@ -132,11 +149,9 @@ Several Lisp files not needed for running GNU Emacs. Most of these
 files are pre-byte compiled and therefore not necessary.
 
 %package     -n emacs-info
-License:        GPLv2+
 Obsoletes:      ge_info elispman elisp-manual elispint emacs-lisp-intro
 Provides:       elispman elisp-manual elispint emacs-lisp-intro ge_info
 Summary:        Info files for GNU Emacs
-Group:          Productivity/Editors/Emacs
 PreReq:         %install_info_prereq
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
@@ -293,7 +308,6 @@ DESKTOP="--with-x \
 	 --with-xim \
 	 --enable-autodepend \
 "
-%{?suse_update_config}
 make_mchkoff ()
 {
     local OMC=$MALLOC_CHECK_
@@ -2847,7 +2861,6 @@ done
 %{_datadir}/emacs/site-lisp/vt200-esc-fix.elc
 %{_datadir}/emacs/site-lisp/xfonts.elc
 %doc %{_mandir}/man1/*.1.gz
-%{_datadir}/pixmaps/emacs.png
 %dir /var/games/emacs/
 /var/games/emacs/snake-scores
 /var/games/emacs/tetris-scores
@@ -2858,7 +2871,6 @@ done
 
 %files       -n emacs-x11
 %defattr(-, root, root)
-%{_bindir}/emacs
 %{_bindir}/emacs-x11
 %{_bindir}/emacs-gtk
 %{appDefaultsFile}
@@ -3036,7 +3048,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/files.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/generic.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/linux.el.gz
-%{_datadir}/emacs/%{version}/lisp/cedet/ede/loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/locate.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/make.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/makefile-edit.el.gz
@@ -3115,7 +3126,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/java.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/lex-spp.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/lex.el.gz
-%{_datadir}/emacs/%{version}/lisp/cedet/semantic/loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/mru-bookmark.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/sb.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/scope.el.gz
@@ -3160,7 +3170,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/getset.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/insert.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/java.el.gz
-%{_datadir}/emacs/%{version}/lisp/cedet/srecode/loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/map.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/semantic.el.gz