From 9bb4daf1f31e46fbe531d32ce1d20c5746e80313 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:19 +0000 Subject: [PATCH 1/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 95567d5..cd4c66d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: gambit-c -# $Id$ +# $Id: Makefile,v 1.1 2008/06/19 02:44:30 tibbs Exp $ NAME := gambit-c SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 1f56c22343fbe3a75464ae7cf0cfc876ceab7e35 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 12 Jul 2010 09:39:57 +0000 Subject: [PATCH 2/4] - Update to 4.6.0 - Bundle license text with independent Emacs subpackage --- .cvsignore | 2 +- gambit-c.spec | 92 +++++++++++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 54 insertions(+), 42 deletions(-) diff --git a/.cvsignore b/.cvsignore index 25687b4..6388afb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gambc-v4_3_2-devel.tgz +gambc-v4_6_0-devel.tgz diff --git a/gambit-c.spec b/gambit-c.spec index 978cf3f..69a86f7 100644 --- a/gambit-c.spec +++ b/gambit-c.spec @@ -3,27 +3,18 @@ # --with termite # The termite distributed programming system is currently broken -%define dirname gambc-v4_3_2-devel +%define dirname gambc-v4_6_0-devel %define termite_rev 080714_2216 -%if %($(pkg-config emacs) ; echo $?) -%define emacs_lispdir %{_datadir}/emacs/site-lisp -%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d -%else -%define emacs_version %(pkg-config emacs --modversion) -%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) -%define emacs_startdir %(pkg-config emacs --variable sitestartdir) -%endif - Name: gambit-c -Version: 4.3.2 -Release: 4%{?dist} -Summary: Gambit-C Scheme programming system +Version: 4.6.0 +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.3/source/%{dirname}.tgz +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 @@ -35,7 +26,7 @@ Source2: gambit-init.el Patch0: gambc-v4_2_8-modtime.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: emacs emacs-el +BuildRequires: emacs Requires: gcc %description @@ -53,6 +44,8 @@ numbers), and complex numbers. %package doc Summary: Documentation for %{name} Group: Documentation + +BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires(post): info Requires(preun): info @@ -98,16 +91,23 @@ This package contains examples and benchmarks for Termite. %package -n emacs-gambit Summary: Gambit-C editing mode for Emacs Group: Applications/Editors -%if 0%{?rhel} -Requires: emacs >= 21.4 -%else -Requires: emacs(bin) >= %{emacs_version} -%endif +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 %if %{?_with_termite:1}%{!?_with_termite:0} @@ -117,9 +117,13 @@ An Emacs mode for editing Gambit-C Scheme source code. %endif %patch0 -p1 -b .modtime -find . -name '*.scm' | xargs chmod 0644 -find examples -name '*.scm' | xargs sed -i 's|/usr/local/Gambit-C|/usr|g' -sed -i "s|\xE9|\xC3\xA9|g" doc/gambit-c.info-2 +#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} @@ -127,7 +131,8 @@ chmod -x lib/{mem.c,setup.h} %build %configure --enable-single-host \ --enable-gcc-opts \ - --prefix=%{_libdir}/%{name} + --bindir=%{_libdir}/%{name}/bin \ + --libdir=%{_libdir}/%{name} make %{?_smp_mflags} @@ -141,34 +146,28 @@ make check %install rm -rf $RPM_BUILD_ROOT -make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} \ - includedir=$RPM_BUILD_ROOT%{_includedir} +make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} for i in gsc gsi do - ln -sf ../%{_lib}/%{name}/current/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i + ln -sf ../%{_lib}/%{name}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i done cat > $RPM_BUILD_ROOT%{_bindir}/gsix < - 4.6.0-1 +- Update to 4.6.0 +- Bundle license text with independent Emacs subpackage + * Fri Jul 24 2009 Fedora Release Engineering - 4.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index bb1f82e..c5cc2fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2470faaccd3e91142dfc204fda5f3c96 gambc-v4_3_2-devel.tgz +7b5556cb864bfa00de13e12e34e9f6c9 gambc-v4_6_0-devel.tgz From cdd20a7e6fd81ff9aed0552a8c76f68da84c67c8 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 12 Jul 2010 09:59:45 +0000 Subject: [PATCH 3/4] - make noarch -doc subpackage properly obsolete its arched predecessor - update stable branches to 4.6.0 --- gambit-c.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gambit-c.spec b/gambit-c.spec index 69a86f7..4f9d298 100644 --- a/gambit-c.spec +++ b/gambit-c.spec @@ -8,7 +8,7 @@ Name: gambit-c Version: 4.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scheme programming system Group: Development/Languages @@ -49,6 +49,8 @@ BuildArch: noarch 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} @@ -256,6 +258,9 @@ fi %changelog +* Mon Jul 12 2010 Michel Salim - 4.6.0-2 +- noarch -doc subpackage properly obsoletes older, arched variant + * Mon Jul 12 2010 Michel Salim - 4.6.0-1 - Update to 4.6.0 - Bundle license text with independent Emacs subpackage From 9bd65d61dcb9c9b7ee62c9f0cf0200c1808acf9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:01:19 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index cd4c66d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: gambit-c -# $Id: Makefile,v 1.1 2008/06/19 02:44:30 tibbs Exp $ -NAME := gambit-c -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON)