- also disable gcc opts on F21 and RHEL <= 7

- clean up PPC64 handling on el6

.gitignore

@@ -1 +1 @@
-/gambc-v4_6_6-devel.tgz
+/gambc-v4_?_?-devel.tgz

gambc-v4_6_6-reduce-opt.patch

@@ -1,11 +0,0 @@
---- gambc-v4_6_6-devel/configure.reduce-opt	2012-05-24 00:18:43.000000000 +0700
-+++ gambc-v4_6_6-devel/configure	2012-06-05 15:45:33.295482005 +0700
-@@ -22314,7 +22314,7 @@
-   case "$ENABLE_C_OPT" in
- 
-      yes) if test "$DASH_O2" != ""; then
--            OPT_LEVEL_FLAG="$DASH_O2"
-+            OPT_LEVEL_FLAG="$DASH_O1"
-           fi
-           ;;
- 

gambit-c.spec

@@ -1,32 +1,37 @@
-%global dirname gambc-v4_6_6-devel
+%global _dirname gambc-v4_7_9-devel
 
-# Using -O2 on ppc64 triggers ICE with gcc
+# Using -O2 on ppc64 triggers ICE with gcc < 4.6.4
 # http://www.iro.umontreal.ca/~gambit/bugzilla/show_bug.cgi?id=155
 # https://bugzilla.redhat.com/show_bug.cgi?id=808285
 # Use --with ppc64opt2 when rebuilding to see if this is fixed
 %bcond_with ppc64opt2
 
+%if 0%{?el6}
 %ifarch ppc64
 %if ! %{with ppc64opt2}
+%global disable_c_opt 1
 %global optflags %(echo %{optflags} | sed 's/-O2 /-O1 /')
 %endif
-%endif
+%endif # ppc64
+%endif # el6
 
 Name:           gambit-c
-Version:        4.6.6
-Release:        3%{?dist}
+Version:        4.7.9
+Release:        1%{?dist}
 Summary:        Scheme programming system
 
 Group:          Development/Languages
 License:        ASL 2.0 or LGPLv2
-URL:            http://www.iro.umontreal.ca/~gambit
-Source0:        http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/%{dirname}.tgz
+URL:            http://gambitscheme.org/
+Source0:        http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/source/%{_dirname}.tgz
 Source1:        gambit-init.el
 Patch0:         gambc-v4_2_8-modtime.patch
-Patch1:         gambc-v4_6_6-reduce-opt.patch
 
 BuildRequires:  emacs
 Requires:       gcc
+Requires:       emacs-filesystem >= %{_emacs_version}
+Obsoletes:      emacs-gambit    < 4.7.7-2
+Obsoletes:      emacs-gambit-el < 4.7.7-2
 
 %description
 Gambit-C includes a Scheme interpreter and a Scheme compiler which can
@@ -60,37 +65,10 @@ with a decent C compiler.
 This package contains the Gambit-C user manual in HTML and PDF formats.
 
 
-%package -n emacs-gambit
-Summary:        Gambit-C editing mode for Emacs
-Group:          Applications/Editors
-
-BuildArch:      noarch
-Requires:       emacs(bin) >= %{_emacs_version}
-
-%description -n emacs-gambit
-An Emacs mode for editing Gambit-C Scheme source code.
-
-%package -n emacs-gambit-el
-Summary:        Elisp source file for emacs-gambit
-Group:          Applications/Editors
-
-BuildArch:      noarch
-Requires:       emacs-gambit = %{version}-%{release}
-
-%description -n emacs-gambit-el
-Elisp source file for the Gambit-C editing mode for Emacs.
-
-
 %prep
-%setup -q -n %{dirname}
+%setup -q -n %{_dirname}
 %patch0 -p1 -b .modtime
 
-%ifarch ppc64
-%if ! %{with ppc64opt2}
-%patch1 -p1 -b .reduce-opt
-%endif
-%endif
-
 touch -r doc/gambit-c.info-2{,.tstamp}
 iconv -f iso88591 -t utf8 doc/gambit-c.info-2 -o doc/gambit-c.info-2.utf8
 touch -r doc/gambit-c.info-2{,.utf8}
@@ -100,15 +78,40 @@ chmod -x lib/*.{c,h}
 
 
 %build
+# disable expensive optimizations on specified platforms
+# see INSTALL.txt
+%ifarch s390 %{arm}
+%global disable_gcc_opts 1
+%endif
+
+%if 0%{?fedora}
+%if 0%{?fedora} <= 21
+%global disable_gcc_opts 1
+%endif
+%endif
+
+%if 0%{?rhel}
+%if 0%{?rhel} <= 7
+%global disable_gcc_opts 1
+%endif
+%endif
+
 %configure --enable-single-host \
+%if 0%{?disable_c_opt:1}
+%else
+           --enable-c-opt \
+%endif
+%if 0%{?disable_gcc_opts:1}
+%else
            --enable-gcc-opts \
+%endif
            --bindir=%{_libdir}/%{name}/bin \
            --libdir=%{_libdir}/%{name}
 
 make %{?_smp_mflags}
 
 # Compile emacs module
-(cd misc && emacs -batch -f batch-byte-compile gambit.el)
+(cd misc && %{_emacs_bytecompile} gambit.el)
 
 
 %check
@@ -116,7 +119,6 @@ make check
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 for i in gsc gsi
@@ -141,10 +143,6 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 (cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/*.a .)
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post doc
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
@@ -163,16 +161,10 @@ fi
 %{_mandir}/man1/gsi.*
 %{_libdir}/%{name}
 %{_libdir}/*.a
-
-%files -n emacs-gambit
-%defattr(-,root,root,-)
-%doc LGPL.txt LICENSE-2.0.txt
+%{_emacs_sitelispdir}/*.el
 %{_emacs_sitelispdir}/*.elc
 %{_emacs_sitestartdir}/gambit-init.el
 
-%files -n emacs-gambit-el
-%defattr(-,root,root,-)
-%{_emacs_sitelispdir}/*.el
 
 %files doc
 %defattr(-,root,root,-)
@@ -184,6 +176,24 @@ fi
 
 
 %changelog
+* Sun Sep  6 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.7.9-1
+- Update to 4.7.9
+- Update home page link
+- Adjust to new Emacs packaging guidelines, no longer shipping separate packages
+- Further reduce expensive optimizations on resource-limited arches
+
+* Tue Nov 04 2014 Jakub Čajka <jcajka@redhat.com> - 4.7.3-2
+- Fix build OOM on s390
+
+* Thu Oct 30 2014 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.7.3-1
+- Update to 4.7.3
+
+* Fri Feb  7 2014 Michel Salim <salimma@fedoraproject.org> - 4.7.2-1
+- Update to 4.7.2
+
+* Tue Nov 05 2013 Kyle McMartin <kyle@fedoraproject.org>
+- Fix FTBFS because of dirname macro, use _dirname instead.
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.6.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

sources

@@ -1 +1 @@
-55776c2f88cab9a595cbd9487f474787  gambc-v4_6_6-devel.tgz
+18191b5707db0e761822ecb0245c5ca6  gambc-v4_7_9-devel.tgz