From 36567849bde1e6640831f86c4aa84c0ecdd9805e Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 12 Feb 2008 09:29:58 +0000 Subject: [PATCH] Initial import into devel branch. --- .cvsignore | 1 + sources | 1 + waf-1.3.2-libdir.patch | 22 ++++++++++ waf.spec | 95 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 119 insertions(+) create mode 100644 waf-1.3.2-libdir.patch create mode 100644 waf.spec diff --git a/.cvsignore b/.cvsignore index e69de29..7860a7d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +waf-1.3.2.tar.bz2 diff --git a/sources b/sources index e69de29..54ded4d 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9caca69cb435911c9ed6ff0519ce19ae waf-1.3.2.tar.bz2 diff --git a/waf-1.3.2-libdir.patch b/waf-1.3.2-libdir.patch new file mode 100644 index 0000000..930d8e1 --- /dev/null +++ b/waf-1.3.2-libdir.patch @@ -0,0 +1,22 @@ +--- waf-light.orig 2008-02-09 23:06:53.000000000 +0100 ++++ waf-light 2008-02-10 19:38:32.000000000 +0100 +@@ -107,7 +107,7 @@ + if w: return w + err("waf-light requires wafadmin -> export WAFDIR=/folder") + +- dir = "/lib/waf-%s-%s/" % (VERSION, REVISION) ++ dir = "/share/waf/" + for i in [INSTALL,'/usr','/usr/local','/opt']: + w = test(i+dir) + if w: return w +--- wscript.orig 2008-02-09 23:06:53.000000000 +0100 ++++ wscript 2008-02-10 19:40:10.000000000 +0100 +@@ -218,7 +218,7 @@ + prefix = Params.g_options.prefix + + binpath = os.path.join(prefix, 'bin%swaf' % os.sep) +- wafadmindir = os.path.join(prefix, 'lib%swaf-%s-%s%swafadmin%s' % (os.sep, VERSION, REVISION, os.sep, os.sep)) ++ wafadmindir = os.path.join(prefix, 'share%swaf%swafadmin%s' % (os.sep, os.sep, os.sep)) + toolsdir = os.path.join(wafadmindir, 'Tools' + os.sep) + + try: os.makedirs(os.path.join(prefix, 'bin')) diff --git a/waf.spec b/waf.spec new file mode 100644 index 0000000..236d389 --- /dev/null +++ b/waf.spec @@ -0,0 +1,95 @@ +Name: waf +Version: 1.3.2 +Release: 5%{?dist} +Summary: A Python-based build system + +Group: Development/Tools +# The entire source code is BSD apart from pproc.py (taken from Python 2.5) +License: BSD and Python +URL: http://code.google.com/p/waf/ +Source0: http://waf.googlecode.com/files/waf-%{version}.tar.bz2 +# use _datadir instead of /usr/lib +Patch0: waf-1.3.2-libdir.patch + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildArch: noarch + +BuildRequires: python-devel +# Seems like automatic ABI dependency is not detected since the files are +# going to a non-standard location +Requires: python-abi %(%{__python} -c "import sys ; print \"=\", sys.version[:3]") + +# the demo suite contains a perl module, which draws in unwanted +# provides and requires +%define __perl_provides %{nil} +%define __perl_requires %{nil} + +%description +Waf is a Python-based framework for configuring, compiling and +installing applications. It is a replacement for other tools such as +Autotools, Scons, CMake or Ant. + + +%prep +%setup -q +%patch0 -p0 -b .libdir + + +%build +./waf-light --make-waf --strip + + +%install +rm -rf $RPM_BUILD_ROOT + +# remove shebangs from all scripts in wafadmin +find wafadmin -name '*.py' -exec sed -i "1{/^#!/d}" {} \; + +./waf install --prefix=%{_prefix} --destdir=$RPM_BUILD_ROOT + +# fix waf script shebang line +sed -i "1c#! /usr/bin/python" $RPM_BUILD_ROOT%{_bindir}/waf + +# fix EOL +sed -i 's|\r$||g' utils/amtool.py + +# remove zero-length file +rm demos/gnome/src/hello.h + +# remove x-bits from everything going to doc +find demos utils -type f -exec chmod 0644 {} \; + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc README TODO demos doc/waf.pdf utils +%{_bindir}/waf +%{_datadir}/waf + + +%changelog +* Sun Feb 10 2008 Thomas Moschny - 1.3.2-5 +- Update to 1.3.2. +- Remove version and revision information from path to waf cache. + +* Fri Feb 1 2008 Michel Salim - 1.3.1-4 +- Upstream patch to fix check_tool('gnome'): trunk rev 2219 + +* Mon Jan 28 2008 Michel Salim - 1.3.1-3 +- Fix python-abi requirement so it can be parsed before python is installed +- rpmlint tidying-up + +* Fri Jan 25 2008 Michel Salim - 1.3.1-2 +- Merge in changes from Thomas Mochny : + * WAF cache moved from /usr/lib to /usr/share + * Remove shebangs from scripts not meant from users, rather than + making them executable + * Include tools and demos + +* Sun Jan 20 2008 Michel Salim - 1.3.1-1 +- Initial Fedora package +