[open-cobol/f19] Use source file from sourceforge.net

Jochen Schmitt s4504kr at fedoraproject.org
Sun Sep 1 08:35:07 UTC 2013


commit 6d85c6af796d6939ddf5841920e4ae66530999b3
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sun Sep 1 10:34:50 2013 +0200

    Use source file from sourceforge.net
    
    - Fix issue with FORTIFY_SOURCE
    - Add libdb-devel as a BR

 open-cobol.spec |   77 +++++++++++++++++++++++++++----------------------------
 sources         |    2 +-
 2 files changed, 39 insertions(+), 40 deletions(-)
---
diff --git a/open-cobol.spec b/open-cobol.spec
index b844c33..bb5ae4e 100644
--- a/open-cobol.spec
+++ b/open-cobol.spec
@@ -1,33 +1,33 @@
 %define cobvers 1.1
 
-Name:		open-cobol
-Version:	1.1
-Release:	0.20090211%{?dist}.2
-Summary:	OpenCOBOL - COBOL compiler
-
-Group:		Development/Languages
-License:	GPLv2+ and LGPLv2+
-
-URL:		http://www.opencobol.org
-# Source:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source:		http://www.sim-basis.de/%{name}-%{version}.tar.gz
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	gmp-devel >= 4.1.4
-BuildRequires:	readline-devel
-BuildRequires:	db4-devel >= 4.1.24
-BuildRequires:	libtool
-BuildRequires:	libtool-ltdl-devel
-
-Requires:	gcc
-Requires:	glibc-devel
-Requires:	gmp >= 4.1.4
-Requires:	gmp-devel >= 4.1.4
-Requires:	db4 >= 4.1.24
-Requires:	ncurses >= 5.4
+Name:           open-cobol
+Version:        1.1
+Release:        1%{?dist}
+Summary:        OpenCOBOL - COBOL compiler
+
+Group:          Development/Languages
+License:        GPLv2+ and LGPLv2+
+
+URL:            http://www.opencobol.org
+# Source:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source:         http://downloads.sourceforge.net/open-cobol/open-cobol-1.1.tar.gz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  gmp-devel >= 4.1.4
+BuildRequires:  readline-devel
+BuildRequires:  db4-devel >= 4.1.24 libdb-devel
+BuildRequires:  libtool
+BuildRequires:  libtool-ltdl-devel
+
+Requires:       gcc
+Requires:       glibc-devel
+Requires:       gmp >= 4.1.4
+Requires:       gmp-devel >= 4.1.4
+Requires:       db4 >= 4.1.24
+Requires:       ncurses >= 5.4
 Requires:       libcob = %{version}
-Obsoletes:	libcob-devel < 1.0.90
+Obsoletes:      libcob-devel < 1.0.90
 Requires(post): /sbin/install-info
 
 %description
@@ -36,9 +36,9 @@ programs to C code and compiles it using GCC.
 
 %package -n libcob
 Summary:        OpenCOBOL runtime library
-Group:		Development/Libraries
-Requires(post):	/sbin/ldconfig
-Requires(postun):	/sbin/ldconfig
+Group:          Development/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun):       /sbin/ldconfig
 
 %description -n libcob
 %{summary}.
@@ -48,21 +48,15 @@ Runtime libraries for OpenCOBOL
 %setup -q -n %{name}-%{cobvers}
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+export CFLAGS="$RPM_OPT_FLAGS -fPIC -O"
+export CPPFLAGS="$CFLAGS"
 %configure --disable-rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-# set -D__NO_STRING_LINES for i86 systems
-
-# %ifarch %{ix86}
-# BUILDFLAGS="-D__NO_STRING_INLINES=1"
-# %endif
-
 make %{?_smp_mflags} 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT/%{_libdir} -type f -name "*.*a" -exec rm -f {} ';'
 rm -rf $RPM_BUILD_ROOT/%{_infodir}/dir
@@ -70,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT/%{_infodir}/dir
 %find_lang %{name}
 
 %check
-make check
+make check CLFAGS="$RPM_OPT_FLGAS -O"
 
 %files -f %{name}.lang
 %defattr (-,root,root,-)
@@ -105,6 +99,11 @@ fi
 %postun -n libcob -p /sbin/ldconfig
 
 %changelog
+* Sat Aug 31 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1.1-1
+- Use source file from sourceforge.net
+- Fix issue with FORTIFY_SOURCE
+- Add libdb-devel as a BR
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-0.20090211.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 09e701b..885a0af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eeb826ab1c181ce0024c7c64b8d32f52  open-cobol-1.1.tar.gz
+e38c898e01d50a7ca6bb3e41cfcb0c64  open-cobol-1.1.tar.gz


More information about the scm-commits mailing list