Accepting request 605500 from home:alois:branches:devel:languages:misc

- Update to version 3.0rc1, stabler than 2.2 final
  (see NEWS or ChangeLog for details)
- Refreshed gnucobol-CFLAGS.patch
- Switched source URL to sourceforge to get the latest tarball
- Fixed description
- Enabled tests

OBS-URL: https://build.opensuse.org/request/show/605500
OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/gnu-cobol?expand=0&rev=6

gnu-cobol.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue May  8 22:14:34 UTC 2018 - aloisio@gmx.com
+
+- Update to version 3.0rc1, stabler than 2.2 final
+  (see NEWS or ChangeLog for details)
+- Refreshed gnucobol-CFLAGS.patch
+- Switched source URL to sourceforge to get the latest tarball
+- Fixed description
+- Enabled tests
+
 -------------------------------------------------------------------
 Thu Sep  7 19:42:36 UTC 2017 - aloisio@gmx.com
 

gnu-cobol.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnu-cobol
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,21 @@
 #
 
 %define sover   4
+%define _mver   3.0
+%define _over   3.0-rc1
 Name:           gnu-cobol
-Version:        2.2
+Version:        3.0rc1
 Release:        0
 Summary:        A free and open COBOL compiler
 License:        GPL-3.0+ and LGPL-3.0+
 Group:          Development/Languages/Other
 Url:            https://savannah.gnu.org/projects/gnucobol
-Source0:        https://ftp.gnu.org/gnu/gnucobol/gnucobol-%{version}.tar.xz
+Source0:        https://sourceforge.net/projects/open-cobol/files/gnu-cobol/%{_mver}/gnucobol-%{_over}.tar.xz
 Source1:        %{name}.changes
 # PATCH-FIX-OPENSUSE gnucobol-CFLAGS.patch -- fixes overreaching regex
 Patch2:         gnucobol-CFLAGS.patch
 BuildRequires:  db-devel
+BuildRequires:  dos2unix
 BuildRequires:  gmp-devel
 BuildRequires:  help2man
 BuildRequires:  makeinfo
@@ -37,33 +40,33 @@ Requires(preun): %{install_info_prereq}
 Provides:       opencobol = %{version}
 
 %description
-GNU Cobol (formerly OpenCOBOL) is a free COBOL compiler.
+GnuCOBOL (formerly OpenCOBOL) is a free COBOL compiler.
 cobc translates COBOL to executable using intermediate C sources,
 providing full access to nearly all C libraries.
 
 %package -n libcob%{sover}
-Summary:        GNU COBOL shared library
+Summary:        GnuCOBOL shared library
 License:        LGPL-3.0+
 Group:          Development/Languages/Other
 
 %description -n libcob%{sover}
-GNU Cobol (formerly OpenCOBOL) is a free COBOL compiler.
+GnuCOBOL (formerly OpenCOBOL) is a free COBOL compiler.
 cobc translates COBOL to executable using intermediate C sources,
 providing full access to nearly all C libraries.
 
 %package -n libcob-devel
-Summary:        Include files for GNU COBOL shared library
+Summary:        Include files for GnuCOBOL shared library
 License:        LGPL-3.0+
 Group:          Development/Languages/Other
 Requires:       libcob%{sover} = %{version}
 
 %description -n libcob-devel
-GNU Cobol (formerly OpenCOBOL) is a free COBOL compiler.
+GnuCOBOL (formerly OpenCOBOL) is a free COBOL compiler.
 cobc translates COBOL to executable using intermediate C sources,
 providing full access to nearly all C libraries.
 
 %prep
-%setup -q -n gnucobol-%{version}
+%setup -q -n gnucobol-%{_over}
 %patch2 -p1
 # replace build date with date from changelog
 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE1}")"
@@ -71,7 +74,9 @@ DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
 TIME="\"$(date -d "${modified}" "+%%R")\""
 find .  -name '*.[ch]' |\
     xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g"
-
+# fix EOL encoding
+dos2unix ABOUT-NLS AUTHORS COPYING COPYING.DOC ChangeLog NEWS \
+ README THANKS TODO COPYING.LESSER
 
 %build
 %configure \
@@ -85,6 +90,9 @@ make -j1
 rm %{buildroot}%{_libdir}/libcob.la
 %find_lang gnucobol
 
+%check
+make check
+
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/gnucobol.info.gz
 

gnucobol-2.2.tar.xz

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

gnucobol-3.0-rc1.tar.xz

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

gnucobol-CFLAGS.patch

@@ -1,8 +1,8 @@
-Index: gnucobol-2.2/configure
+Index: gnucobol-3.0-rc1/configure
 ===================================================================
---- gnucobol-2.2.orig/configure
-+++ gnucobol-2.2/configure
-@@ -18412,7 +18412,7 @@ fi
+--- gnucobol-3.0-rc1.orig/configure
++++ gnucobol-3.0-rc1/configure
+@@ -18460,7 +18460,7 @@ fi
  unset enable_cflags_setting
  
  if test "$enable_debug" != "yes" -a "x$CFLAGS" != "x"; then
@@ -11,7 +11,7 @@ Index: gnucobol-2.2/configure
  fi
  
  if test "$COB_USES_GCC" = "yes"; then
-@@ -18516,12 +18516,12 @@ if test "x$CPPFLAGS" != "x"; then
+@@ -18564,7 +18564,7 @@ if test "x$CPPFLAGS" != "x"; then
  	fi
  fi
  if test "x$cob_temp_flags" != "x"; then
@@ -20,9 +20,3 @@ Index: gnucobol-2.2/configure
  	cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/[+-]O[0-9s]//' -e 's/ $//' -e 's/^ //'`
  	cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-O//' -e 's/ $//' -e 's/^ //'`
  	cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-fmessage-length=0//'`
- 	cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-D_FORTIFY_SOURCE=.//'`
--	cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-fstack-protector//'`
-+	cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-fstack-protector //'`
- 	cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-funwind-tables//'`
- 	cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-fasynchronous-unwind-tables//'`
- 	cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/  */ /g' -e 's/ $//' -e 's/^ //'`