From 3d6350e285e93d94e68bfff15b34c1270e9df5369fe4536aaa1d1013e663f6ec Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Thu, 14 Sep 2017 01:11:49 +0000 Subject: [PATCH] Accepting request 522453 from home:alois:branches:devel:languages:misc - Update to version 2.2 (see NEWS or ChangeLog) - Switched license to GPL-3.0+/LGPL-3.0+ - Updated source URL and homepage on account of being accepted into the GNU Project - Added gnucobol-CFLAGS.patch - Dropped types.diff (apparently no longer necessary) OBS-URL: https://build.opensuse.org/request/show/522453 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/gnu-cobol?expand=0&rev=5 --- gnu-cobol-1.1.tar.gz | 3 -- gnu-cobol.changes | 10 +++++ gnu-cobol.spec | 86 ++++++++++++++++++++++--------------------- gnucobol-2.2.tar.xz | 3 ++ gnucobol-CFLAGS.patch | 28 ++++++++++++++ types.diff | 12 ------ 6 files changed, 85 insertions(+), 57 deletions(-) delete mode 100644 gnu-cobol-1.1.tar.gz create mode 100644 gnucobol-2.2.tar.xz create mode 100644 gnucobol-CFLAGS.patch delete mode 100644 types.diff diff --git a/gnu-cobol-1.1.tar.gz b/gnu-cobol-1.1.tar.gz deleted file mode 100644 index 2e1352a..0000000 --- a/gnu-cobol-1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd319c0d001e85835c8501ad74c9de0052fe82b8a38b4530f41b49b2af028b9d -size 1093343 diff --git a/gnu-cobol.changes b/gnu-cobol.changes index 97ec0a3..42e0249 100644 --- a/gnu-cobol.changes +++ b/gnu-cobol.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 7 19:42:36 UTC 2017 - aloisio@gmx.com + +- Update to version 2.2 (see NEWS or ChangeLog) +- Switched license to GPL-3.0+/LGPL-3.0+ +- Updated source URL and homepage on account of being accepted + into the GNU Project +- Added gnucobol-CFLAGS.patch +- Dropped types.diff (apparently no longer necessary) + ------------------------------------------------------------------- Mon Apr 6 15:00:39 UTC 2015 - mpluskal@suse.com diff --git a/gnu-cobol.spec b/gnu-cobol.spec index 6fd5e91..559b6b3 100644 --- a/gnu-cobol.spec +++ b/gnu-cobol.spec @@ -1,7 +1,7 @@ # # spec file for package gnu-cobol # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -15,45 +15,47 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -Name: gnu-cobol -Version: 1.1 -Release: 0 -Summary: A free and open COBOL compiler -License: GPL-2.0+ -Group: Development/Languages/Other -Url: http://www.opencobol.org/ -Source0: ftp://ftp.gnu.org/gnu/gnucobol/gnu-cobol-%{version}.tar.gz -Source1: %{name}.changes -Patch1: types.diff -BuildRequires: db-devel -BuildRequires: gmp-devel -BuildRequires: ncurses-devel -Requires(post): %{install_info_prereq} +%define sover 4 +Name: gnu-cobol +Version: 2.2 +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 +Source1: %{name}.changes +# PATCH-FIX-OPENSUSE gnucobol-CFLAGS.patch -- fixes overreaching regex +Patch2: gnucobol-CFLAGS.patch +BuildRequires: db-devel +BuildRequires: gmp-devel +BuildRequires: help2man +BuildRequires: makeinfo +BuildRequires: ncurses-devel +Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} -Provides: opencobol = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: opencobol = %{version} %description GNU Cobol (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 libcob1 +%package -n libcob%{sover} Summary: GNU COBOL shared library -License: LGPL-2.1+ +License: LGPL-3.0+ Group: Development/Languages/Other -%description -n libcob1 +%description -n libcob%{sover} GNU Cobol (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 -License: LGPL-2.1+ +License: LGPL-3.0+ Group: Development/Languages/Other -Requires: libcob1 = %{version} +Requires: libcob%{sover} = %{version} %description -n libcob-devel GNU Cobol (formerly OpenCOBOL) is a free COBOL compiler. @@ -61,8 +63,8 @@ cobc translates COBOL to executable using intermediate C sources, providing full access to nearly all C libraries. %prep -%setup -q -%patch1 -p1 +%setup -q -n gnucobol-%{version} +%patch2 -p1 # replace build date with date from changelog modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE1}")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" @@ -74,40 +76,40 @@ find . -name '*.[ch]' |\ %build %configure \ --enable-static=no -make %{?_smp_mflags} +# build is not parallel safe +make -j1 %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install # do not ship these rm %{buildroot}%{_libdir}/libcob.la - -%find_lang %name +%find_lang gnucobol %post -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/gnucobol.info.gz %preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/gnucobol.info.gz -%post -n libcob1 -p /sbin/ldconfig +%post -n libcob%{sover} -p /sbin/ldconfig +%postun -n libcob%{sover} -p /sbin/ldconfig -%postun -n libcob1 -p /sbin/ldconfig - -%files -f %name.lang +%files -f gnucobol.lang %defattr(-,root,root) %doc ABOUT-NLS AUTHORS COPYING COPYING.DOC ChangeLog NEWS README THANKS TODO %{_bindir}/cob-config %{_bindir}/cobc %{_bindir}/cobcrun -%{_infodir}/gnu-cobol.info.gz -%{_libdir}/gnu-cobol -%{_datadir}/gnu-cobol +%{_datadir}/gnucobol +%{_infodir}/gnucobol.info%{ext_info} +%{_libdir}/gnucobol +%{_mandir}/man1/cobc.1%{ext_info} +%{_mandir}/man1/cobcrun.1%{ext_info} -%files -n libcob1 +%files -n libcob%{sover} %defattr(-,root,root) -%doc COPYING.LIB -%{_libdir}/libcob.so.1 -%{_libdir}/libcob.so.1.0.0 +%doc COPYING.LESSER +%{_libdir}/libcob.so.%{sover}* %files -n libcob-devel %defattr(-,root,root) diff --git a/gnucobol-2.2.tar.xz b/gnucobol-2.2.tar.xz new file mode 100644 index 0000000..5400952 --- /dev/null +++ b/gnucobol-2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc18fc45c269debfe86a4bbe20a7250983cba6238ea1917e135df5926cd024a0 +size 1604648 diff --git a/gnucobol-CFLAGS.patch b/gnucobol-CFLAGS.patch new file mode 100644 index 0000000..bfecab5 --- /dev/null +++ b/gnucobol-CFLAGS.patch @@ -0,0 +1,28 @@ +Index: gnucobol-2.2/configure +=================================================================== +--- gnucobol-2.2.orig/configure ++++ gnucobol-2.2/configure +@@ -18412,7 +18412,7 @@ fi + unset enable_cflags_setting + + if test "$enable_debug" != "yes" -a "x$CFLAGS" != "x"; then +- CFLAGS=`echo "$CFLAGS" | sed -e 's/-g3//' -e 's/-g//' -e 's/^ //' -e 's/ $//'` ++ CFLAGS=`echo "$CFLAGS" | sed -e 's/-g3//' -e 's/-g //' -e 's/^ //' -e 's/ $//'` + fi + + if test "$COB_USES_GCC" = "yes"; then +@@ -18516,12 +18516,12 @@ if test "x$CPPFLAGS" != "x"; then + fi + fi + if test "x$cob_temp_flags" != "x"; then +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-g3//' -e 's/-g//' -e 's/ $//' -e 's/^ //'` ++ cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-g3//' -e 's/-g //' -e 's/ $//' -e 's/^ //'` + 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/^ //'` diff --git a/types.diff b/types.diff deleted file mode 100644 index d1ed947..0000000 --- a/types.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Pdpru gnu-cobol-1.1/libcob/common.h gnu-cobol-1.1-mod/libcob/common.h ---- gnu-cobol-1.1/libcob/common.h 2013-12-23 22:21:31.000000000 +0900 -+++ gnu-cobol-1.1-mod/libcob/common.h 2014-04-30 21:28:19.563475933 +0900 -@@ -258,7 +258,7 @@ - #define COB_EXPIMP __declspec(dllimport) extern - #endif - #else -- #define COB_EXPIMP extern -+ #define COB_EXPIMP /*extern*/ - #endif - - #if defined(__370__) || defined(_MSC_VER)