From d30cb08ba8824a507d6861e628f67103a581b909 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel@michel-slm.name>
Date: Sep 06 2015 18:09:47 +0000
Subject: 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

(cherry picked from commit a5dfe68b1b6a8c0e9b093763df6320877cb28ac6)

---

diff --git a/.gitignore b/.gitignore
index 73c12b2..2ec8dfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/gambc-v4_7_3-devel.tgz
+/gambc-v4_?_?-devel.tgz
diff --git a/gambc-v4_6_6-reduce-opt.patch b/gambc-v4_6_6-reduce-opt.patch
deleted file mode 100644
index ceaff8c..0000000
--- a/gambc-v4_6_6-reduce-opt.patch
+++ /dev/null
@@ -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
-           ;;
- 
diff --git a/gambit-c.spec b/gambit-c.spec
index d08945b..20ecb3d 100644
--- a/gambit-c.spec
+++ b/gambit-c.spec
@@ -1,4 +1,4 @@
-%global _dirname gambc-v4_7_3-devel
+%global _dirname gambc-v4_7_9-devel
 
 # Using -O2 on ppc64 triggers ICE with gcc < 4.6.4
 # http://www.iro.umontreal.ca/~gambit/bugzilla/show_bug.cgi?id=155
@@ -14,26 +14,23 @@
 %endif # ppc64
 %endif # el6
 
-# package build runs OOM on s390
-%ifarch s390
-%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
-%endif
-
 Name:           gambit-c
-Version:        4.7.3
-Release:        2%{?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
+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
@@ -67,39 +64,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}
 %patch0 -p1 -b .modtime
 
-%if 0%{?el6}
-%ifarch ppc64
-%if ! %{with ppc64opt2}
-%patch1 -p1 -b .reduce-opt
-%endif
-%endif # ppc64
-%endif # el6
-
 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}
@@ -109,15 +77,20 @@ chmod -x lib/*.{c,h}
 
 
 %build
+# disable expensive optimizations on specified platforms
+# see INSTALL.txt
 %configure --enable-single-host \
+           --enable-c-opt \
+%ifnarch s390 %{arm}
            --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
@@ -125,7 +98,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
@@ -150,10 +122,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 || :
 
@@ -172,16 +140,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,-)
@@ -193,6 +155,12 @@ 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
 
diff --git a/sources b/sources
index 2a28b6e..abff776 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4235f86e5e89bf909d56df2d898c4f40  gambc-v4_7_3-devel.tgz
+18191b5707db0e761822ecb0245c5ca6  gambc-v4_7_9-devel.tgz