[halibut/el5/master] Make the modifications so that we build on EL5

Mark Chappell tremble at fedoraproject.org
Thu Sep 16 08:10:12 UTC 2010


commit 8b8eee919daae7f05fbdce03bf7f906655a73fcc
Author: Mark Chappell <tremble at fedoraproject.org>
Date:   Thu Sep 16 10:09:59 2010 +0200

    Make the modifications so that we build on EL5

 halibut.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/halibut.spec b/halibut.spec
index cefe415..979f9ac 100644
--- a/halibut.spec
+++ b/halibut.spec
@@ -4,7 +4,7 @@
 Name:		halibut
 Summary:	TeX-like software manual tool
 Version:	1.0
-Release:	2.%{svndate}svn%{svnver}%{?dist}
+Release:	2.%{svndate}svn%{svnver}%{?dist}.1
 License:	MIT
 Group:		Applications/Text
 URL:		http://www.chiark.greenend.org.uk/~sgtatham/halibut.html
@@ -31,7 +31,7 @@ output documents wherever possible.
 Summary:	Syntax file for the halibut manual tool
 Group:		Applications/Editors
 Requires:	vim-common
-BuildArch:	noarch
+#BuildArch:	noarch
 
 %description -n vim-halibut
 This package provides vim syntax support for Halibut input files (*.but).
@@ -42,7 +42,7 @@ This package provides vim syntax support for Halibut input files (*.but).
 %build
 sed -i 's/CFLAGS += -g/CFLAGS += /g' Makefile
 export CFLAGS="%{optflags}"
-make %{?_smp_mflags} VERSION="%{version}"
+make %{?_smp_mflags} -j1 VERSION="%{version}"
 make -C doc
 
 %install
@@ -67,6 +67,11 @@ rm -rf %{buildroot}
 %{_datadir}/vim/vimfiles/syntax/*.vim
 
 %changelog
+* Thu Sep 16 2010 Mark Chappell <tremble at fedoraproject.org> - 1.0-2.20100504svn8934.1
+- Specify a BuildRoot for EL5 builds
+- EL5's RPM can't copy with noarch subpackages so we'll need to comment them out
+- Looks like the build process isn't thread safe, drop down to -j 1
+
 * Mon May 10 2010 Chen Lei <supercyper at 163.com> - 1.0-2.20100504svn8934
 - merge -doc subpackage to the main package
 


More information about the scm-commits mailing list