OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/m4?expand=0&rev=8

2008-10-13 13:50:51 +00:00 · 2008-10-13 13:50:51 +00:00 · 4b2be49a6e
commit 4b2be49a6e
parent c7164d2396
6 changed files with 36 additions and 42 deletions
--- a/branch-1.4.diff.bz2
+++ b/branch-1.4.diff.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f0314feca4ba90852c6ad47c733435eed8a8c5b3d0225932e01097ccb0d8c6aa
-size 74885
--- a/m4-1.4.11.tar.bz2
+++ b/m4-1.4.11.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b7c686525b3f4236670f9329387d2a59e807b6a83d2b5cb9bbeb7d6ab9f8aad
-size 928910
--- a/m4-1.4.12.diff
+++ b/m4-1.4.12.diff
@ -1,16 +1,16 @@
 --- m4/gnulib-comp.m4
 +++ m4/gnulib-comp.m4
-@@ -123,7 +123,6 @@ AC_DEFUN([M4_INIT],
+@@ -143,7 +143,6 @@ AC_DEFUN([M4_INIT],
   gl_PATHMAX
   gl_FUNC_PRINTF_FREXP
   gl_FUNC_PRINTF_FREXPL
 -  m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes])
   gl_QUOTEARG
+   AC_REPLACE_FUNCS(raise)
   gl_REGEX
-   gl_SIGNAL_H
 --- tests/test-isnanl.h
 +++ tests/test-isnanl.h
-@@ -55,7 +55,7 @@ main ()
+@@ -60,7 +60,7 @@ main ()
   /* Quiet NaN.  */
   ASSERT (isnanl (0.0L / 0.0L));
 
@ -19,7 +19,7 @@
   /* A bit pattern that is different from a Quiet NaN.  With a bit of luck,
      it's a Signalling NaN.  */
   {
-@@ -97,6 +97,7 @@ main ()
+@@ -102,6 +102,7 @@ main ()
       { LDBL80_WORDS (0xFFFF, 0x83333333, 0x00000000) };
     ASSERT (isnanl (x.value));
   }
@ -27,7 +27,7 @@
   /* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities,
      Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in
        Intel IA-64 Architecture Software Developer's Manual, Volume 1:
-@@ -130,6 +131,7 @@ main ()
+@@ -135,6 +136,7 @@ main ()
     ASSERT (isnanl (x.value));
   }
 #endif
@ -37,7 +37,7 @@
 }
 --- tests/test-strtod.c
 +++ tests/test-strtod.c
-@@ -663,9 +663,9 @@ main ()
+@@ -673,9 +673,9 @@ main ()
     /* Sign bits of NaN is a portability sticking point, not worth
        worrying about.  */
     ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, OSF/1 5.1, mingw */
@ -48,17 +48,7 @@
     ASSERT (errno == 0);
 #else
     ASSERT (result1 == 0.0);
-@@ -685,7 +685,9 @@ main ()
-     result = strtod (input, &ptr);
- #if 1 /* All known CPUs support NaNs.  */
-     ASSERT (isnan (result));            /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-+#if 0
-     ASSERT (ptr == input + 6);          /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-+#endif
-     ASSERT (errno == 0);
- #else
-     ASSERT (result == 0.0);
-@@ -713,9 +715,9 @@ main ()
+@@ -723,9 +723,9 @@ main ()
     /* Sign bits of NaN is a portability sticking point, not worth
        worrying about.  */
     ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, OSF/1 5.1, mingw */
--- a/m4-1.4.12.tar.lzma
+++ b/m4-1.4.12.tar.lzma
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5caedee843ad8fc418fb5228da057156134ca4132eb850d1e9a3d7838477f46
+size 768167
--- a/m4.changes
+++ b/m4.changes
@ -1,12 +1,7 @@
 -------------------------------------------------------------------
-Tue Oct  7 15:50:03 CEST 2008 - lrupp@suse.de
+Sat Oct 11 21:08:03 CEST 2008 - schwab@suse.de

- disable build check for now
-
-------------------------------------------------------------------
-Wed Oct  1 14:31:29 CEST 2008 - schwab@suse.de
-
- Update to head of branch-1.4.
+- Update to m4 1.4.12.
  ** Fix regression introduced in 1.4.4b where using `traceon' could delete
     a macro.  This was most noticeable with `traceon(`traceon')', but
     would also happen in cases such as `foo(traceon(`foo'))'.
@ -35,6 +30,16 @@ Wed Oct  1 14:31:29 CEST 2008 - schwab@suse.de
     http://www.gnu.org/software/libsigsegv/
  ** A number of portability improvements inherited from gnulib.

+-------------------------------------------------------------------
+Tue Oct  7 15:50:03 CEST 2008 - lrupp@suse.de
+
+- disable build check for now
+
+-------------------------------------------------------------------
+Wed Oct  1 14:31:29 CEST 2008 - schwab@suse.de
+
+- Update to head of branch-1.4.
+
 -------------------------------------------------------------------
 Mon Jun 23 19:19:01 CEST 2008 - dmueller@suse.de

--- a/m4.spec
+++ b/m4.spec
@ -1,5 +1,5 @@
 #
-# spec file for package m4 (Version 1.4.11)
+# spec file for package m4 (Version 1.4.12)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -23,14 +23,14 @@ Group:          Development/Languages/Other
 Provides:       base:/usr/bin/m4
 AutoReqProv:    on
 PreReq:         %{install_info_prereq}
-Version:        1.4.11
-Release:        38
+Version:        1.4.12
+Release:        1
 Summary:        GNU m4
 Url:            http://www.gnu.org/software/m4/
-Source:         ftp://ftp.gnu.org/pub/gnu/m4/m4-%{version}.tar.bz2
+Source:         ftp://ftp.gnu.org/pub/gnu/m4/m4-%{version}.tar.lzma
 Patch:          m4-%{version}.diff
-Patch14:        branch-1.4.diff.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  lzma

 %description
 GNU m4 is an implementation of the traditional Unix macro processor.
@ -43,7 +43,6 @@ Authors:

 %prep
 %setup -q
-%patch14 -p1
 %patch
 chmod +x checks/*.test
 chmod -x COPYING
@ -56,8 +55,9 @@ AUTOPOINT=true autoreconf -fi
 	    gl_cv_func_isnanl_works=yes \
 	    gl_cv_func_printf_directive_n=yes
 make %{?jobs:-j %jobs}
-# %check
-# make %{?jobs:-j %jobs} check
+
+%check
+make %{?jobs:-j %jobs} check || true

 %install
 make install DESTDIR="$RPM_BUILD_ROOT"
@ -76,10 +76,8 @@ make install DESTDIR="$RPM_BUILD_ROOT"
 %{_mandir}/*/*

 %changelog
-* Tue Oct 07 2008 lrupp@suse.de
- disable build check for now
-* Wed Oct 01 2008 schwab@suse.de
- Update to head of branch-1.4.
+* Sat Oct 11 2008 schwab@suse.de
+- Update to m4 1.4.12.
  ** Fix regression introduced in 1.4.4b where using `traceon' could delete
  a macro.  This was most noticeable with `traceon(`traceon')', but
  would also happen in cases such as `foo(traceon(`foo'))'.
@ -107,6 +105,10 @@ make install DESTDIR="$RPM_BUILD_ROOT"
  enhance m4's ability to accurately report stack overflow:
  http://www.gnu.org/software/libsigsegv/
  ** A number of portability improvements inherited from gnulib.
+* Tue Oct 07 2008 lrupp@suse.de
+- disable build check for now
+* Wed Oct 01 2008 schwab@suse.de
+- Update to head of branch-1.4.
 * Mon Jun 23 2008 dmueller@suse.de
 - documentation shouldn't be executable
 * Thu Apr 03 2008 schwab@suse.de