Revert Emacs packaging changes

- clean up PPC64 handling on el6

.gitignore

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

gambit-c.spec

@@ -1,28 +1,30 @@
-# Build options:
-#
-# --with termite
-#   The termite distributed programming system is currently broken
+%global _dirname gambc-v4_7_9-devel
 
-%define dirname gambc-v4_6_1-devel
-%define termite_rev 080714_2216
+# 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 # ppc64
+%endif # el6
 
 Name:           gambit-c
-Version:        4.6.1
-Release:        1%{?dist}
+Version:        4.7.9
+Release:        1%{?dist}.1
 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
-
-%if %{?_with_termite:1}%{!?_with_termite:0}
-Source1:        http://termite.googlecode.com/files/termite%{termite_rev}.tar.gz
-%else
-Provides:       gambit-c-termite = %{version}-%{release}
-Obsoletes:      gambit-c-termite < %{version}-%{release}
-%endif
-Source2:        gambit-init.el
+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
 
 BuildRequires:  emacs
@@ -49,12 +51,7 @@ Requires:       %{name} = %{version}-%{release}
 Requires(post):  info
 Requires(preun): info
 # switch to noarch
-Obsoletes:	gambit-c-doc < %{version}-%{release}
-%if %{?_with_termite:0}%{!?_with_termite:1}
-Provides:       gambit-c-termite-doc = %{version}-%{release}
-Obsoletes:      gambit-c-termite-doc < %{version}-%{release}
-%endif
-
+Obsoletes:      gambit-c-doc < %{version}-%{release}
 
 %description    doc
 Gambit-C includes a Scheme interpreter and a Scheme compiler which can
@@ -65,30 +62,6 @@ with a decent C compiler.
 This package contains the Gambit-C user manual in HTML and PDF formats.
 
 
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%package        termite
-Summary:        Termite distributed programming system
-Group:          Development/Languages
-URL:            http://www.toute.ca/
-Requires:       %{name} = %{version}-%{release}
-
-
-%description    termite
-Termite is an Erlang-like distributed programming system written in Scheme.
-
-
-%package        termite-doc
-Summary:        Examples for the Termite distributed programming system
-Group:          Documentation
-Requires:       %{name}-termite = %{version}-%{release}
-
-%description    termite-doc
-Termite is an Erlang-like distributed programming system written in Scheme.
-
-This package contains examples and benchmarks for Termite.
-%endif
-
-
 %package -n emacs-gambit
 Summary:        Gambit-C editing mode for Emacs
 Group:          Applications/Editors
@@ -111,34 +84,52 @@ Elisp source file for the Gambit-C editing mode for Emacs.
 
 
 %prep
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%setup -q -n %{dirname} -a1
-%else
-%setup -q -n %{dirname}
-%endif
+%setup -q -n %{_dirname}
 %patch0 -p1 -b .modtime
 
-#find . -name '*.scm' | xargs chmod 0644
-#find examples -name '*.scm' | xargs sed -i 's|/usr/local/Gambit-C|/usr|g'
 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}
 mv doc/gambit-c.info-2{.utf8,}
-#sed -i "s|\xE9|\xC3\xA9|g" doc/gambit-c.info-2
 # Permission fixes
-chmod -x lib/{mem.c,setup.h}
+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
@@ -146,7 +137,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
@@ -165,38 +155,11 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
 # Emacs mode files
 mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 cp -p misc/gambit.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
 # Link static libs
 (cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/*.a .)
 
-%if %{?_with_termite:1}%{!?_with_termite:0}
-# Termite
-chmod 755 termite termite/examples
-chmod -R g+r-w,o+r termite
-cd termite
-mv tsi $RPM_BUILD_ROOT%{_bindir}
-
-# Fix script interpreters
-find benchmarks examples otp -name '*.scm' | xargs \
-  sed -i 's|/usr/local/Gambit-C/bin/gsi|/usr/bin/gsi|g'
-chmod +x otp/gen_event.scm
-
-# Move docs
-mkdir ../termite-doc ../termite-more-docs
-mv CHANGELOG LICENSE README VERSION ../termite-doc
-chmod a-x ../termite-doc/* ../termite-more-docs/benchmarks/*
-mv benchmarks examples ../termite-more-docs
-rm INSTALL
-cd ..
-
-mv termite $RPM_BUILD_ROOT%{_libdir}/%{name}/current/lib
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %post doc
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
@@ -211,26 +174,12 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc LGPL.txt LICENSE-2.0.txt README
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%exclude %{_bindir}/tsi
-%endif
 %{_bindir}/*
 %{_includedir}/*.h
 %{_mandir}/man1/gsi.*
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%exclude %{_libdir}/%{name}/*/lib/termite
-%endif
 %{_libdir}/%{name}
 %{_libdir}/*.a
 
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%files termite
-%defattr(-,root,root,-)
-%doc termite-doc/*
-%{_bindir}/tsi
-%{_libdir}/%{name}/v%{version}/lib/termite
-%endif
-
 %files -n emacs-gambit
 %defattr(-,root,root,-)
 %doc LGPL.txt LICENSE-2.0.txt
@@ -248,21 +197,50 @@ fi
 # examples
 %{_infodir}/*
 
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%files termite-doc
-%defattr(-,root,root,-)
-%doc termite-more-docs/*
-%endif
-
 
 
 %changelog
+* Fri Sep 11 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.7.9-1.1
+- Restore old Emacs subpackages; new guidelines do not apply to el6
+
+* 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.
+
+* Tue Jun  5 2012 Michel Salim <salimma@fedoraproject.org> - 4.6.6-1
+- Update to 4.6.6
+
+* Sat Mar 31 2012 Michel Salim <salimma@fedoraproject.org> - 4.6.5-2
+- Reduce optimization level on ppc64 to work around gcc compilation error
+
+* Thu Mar 29 2012 Michel Salim <salimma@fedoraproject.org> - 4.6.5-1
+- Update to 4.6.5
+- Drop termite subpackages, they have been disabled for many releases
+- Disable ppc64 target for now; broken since 4.6.4
+
+* Wed Feb 15 2012 Michel Salim <salimma@fedoraproject.org> - 4.6.4-1
+- Update to 4.6.4
+
+* Wed Feb  1 2012 Michel Salim <salimma@fedoraproject.org> - 4.6.3-1
+- Update to 4.6.3
+
 * Wed Jul 27 2011 Michel Salim <salimma@fedoraproject.org> - 4.6.1-1
 - Update to 4.6.1
 
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.6.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
 * Mon Jul 12 2010 Michel Salim <salimma@fedoraproject.org> - 4.6.0-2
 - noarch -doc subpackage properly obsoletes older, arched variant
 

sources

@@ -1 +1 @@
-7542cde52d4e24704bc49ba67d492f14  gambc-v4_6_1-devel.tgz
+18191b5707db0e761822ecb0245c5ca6  gambc-v4_7_9-devel.tgz