Accepting request 196778 from home:ailin_nemui:branches:M17N:back

@Werner must be some bug of obs, please try again

OBS-URL: https://build.opensuse.org/request/show/196778
OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=68

xemacs-21.5.33.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:448c76aa32cd5c84257027846f01b75a5e4f1e9db3278f95e68ff23d59fb8f94
-size 15781151

xemacs-21.5.34.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d15dc4bb5ac8f74208a7575cf2d89656b5c3bf539c1014d30c01e7a9775b0ad
+size 15816499

xemacs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 23 15:14:41 UTC 2013 - ailin.nemui@gmail.com
+
+- XEmacs version 21.5.24 "kale" got released
+  * see http://list-archive.xemacs.org/pipermail/xemacs-beta/2013-August/024401.html
+
 -------------------------------------------------------------------
 Tue Jul 23 08:59:47 UTC 2013 - ailin.nemui@gmail.com
 

xemacs.spec

@@ -41,9 +41,9 @@ BuildRequires:  gpm-devel
 %else
 BuildRequires:  gpm
 %endif
-%define _id     bee2e2568828
+%define _id     995257d0c590
 %define _hg     hg%{_id}
-Version:        21.5.33
+Version:        21.5.34
 Release:        0
 Summary:        XEmacs
 License:        GPL-3.0+
@@ -140,16 +140,15 @@ This package contains all info files for XEmacs. All these files can be
 read online with XEmacs and describe XEmacs and some of its modes.
 
 %prep
+%ifarch ia64
+# ia64 has different memory laylout then x86 or x86_64 have!
+%global pdump_broken 1
+%endif
 # Currently XEmacs is not fully usable for Xfreetype support
 # therefore we use XFontSet support:
 %{!?enable_xfs:%global enable_xfs 1}
-%ifarch ia64
+%{!?pdump_broken:%global pdump_broken 0}
-# ia64 has different memory laylout then x86 or x86_64 have!
+%{!?kkcc_broken:%global kkcc_broken 0}
-%global enable_pdump 0
-%else
-%global enable_pdump 1
-%endif
-%global enable_dump_in_exec 1
 %if ! %enable_xfs
 echo Use xft, requires X11, Xft, Xrender, freetype, and fontconfig support.
 %else
@@ -245,7 +244,7 @@ LIBEXEC=${LIB}/xemacs/${VERSION}
     MOD=${ARCH}/modules
   STATE=/var/lib/xemacs
     MAN=/usr/share/man/man1
- CFLAGS="-Wall %{optflags} -pipe ${LOOP} -DLDAP_DEPRECATED "
+ CFLAGS="-Wall ${RPM_OPT_FLAGS} -pipe ${LOOP} -DLDAP_DEPRECATED "
 %ifarch s390x
  CFLAGS="$CFLAGS -O1"
 %endif
@@ -253,8 +252,6 @@ LIBEXEC=${LIB}/xemacs/${VERSION}
 # $CFLAGS="$CFLAGS -DPRINT_XLWMENU_RESOURCE_CONVERSIONS "
 # this prints the Xresources used for the Menus to stdout
 # when the Menus are used.
-LDFLAGS=
-export CFLAGS LDFLAGS
 #
 # Maybe there are emacs and xemacs on the
 # same system, therefore put binaries into /usr/X11R6/bin
@@ -288,34 +285,20 @@ PREFIX="--prefix=/usr \
 #
 #  when using "--rel-alloc, XEmacs 21.5.18 crashes often when using
 #  'compile-goto-error'.
-#      --rel-alloc \
 SPECIAL="--with-database=berkdb,gdbm \
 	 --with-ncurses \
 	 --with-canna \
 	 --with-tty=yes \
 	 --with-site-lisp \
-%ifarch ia64 ppc ppc64 s390x s390 %ix86 x86_64 %arm
+%if %kkcc_broken
-	 --disable-mc-alloc \
 	 --disable-kkcc \
-         --disable-newgc \
-%else
-	 --with-mc-alloc \
-	 --with-kkcc \
-         --with-newgc \
 %endif
 %ifnarch s390
 	 --enable-sound=native \
 	 --with-gpm \
 %endif
-%if %enable_pdump
+%if %pdump_broken
-	 --enable-pdump \
+	 --without-pdump \
-%if %enable_dump_in_exec
-         --enable-dump-in-exec \
-%else
-	 --disable-dump-in-exec \
-%endif
-%else
-	 --enable-pdump=no \
 %endif
 %if ! %enable_xfs
      --with-xft=emacs,menubars,tabs,gauges \
@@ -332,10 +315,6 @@ X11="--with-xpm \
      --with-png \
      --with-x \
      --with-athena=3d \
-     --with-menubars=lucid \
-     --with-scrollbars=lucid \
-     --with-dialogs=athena \
-     --with-widgets=athena \
      --x-includes=%{xincludes} \
      --x-libraries=%{xlibraries} \
 "
@@ -375,7 +354,6 @@ COMP="--with-gcc \
       --with-debug \
       --enable-error-checking=none \
       --with-cflags=\"${CFLAGS}\" \
-      --with-ldflags=\"${LDFLAGS}\" \
 "
 eval ./configure $SYS $COMP $PREFIX $SPECIAL $X11 $MULE $MAIL
 make %{?_smp_mflags}
@@ -561,11 +539,9 @@ rm -rf %{buildroot}%{_prefix}/lib/xemacs/%{version}/*-suse-linux/include/
 %{xbindir}/gnudoit
 %{xbindir}/ootags
 %verify(not mode) %{xbindir}/xemacs
-%if %enable_pdump
+%if %pdump_broken
-%if !%{enable_dump_in_exec}
 %{xbindir}/xemacs*.dmp
 %endif
-%endif
 %{appdefdir}/app-defaults/XEmacs
 %dir %{_prefix}/lib/xemacs
 %dir %{_prefix}/lib/xemacs/%{version}