rpms/waf/devel waf-1.3.2-libdir.patch, NONE, 1.1 waf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Thomas Moschny (thm)]

Author: thm

Update of /cvs/pkgs/rpms/waf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1971/devel

Modified Files:
	.cvsignore sources 
Added Files:
	waf-1.3.2-libdir.patch waf.spec 
Log Message:
Initial import into devel branch.

waf-1.3.2-libdir.patch:

--- NEW FILE waf-1.3.2-libdir.patch ---
--- 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'))


--- NEW FILE waf.spec ---
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 <thomas.moschny at gmx.de> - 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 <michel.sylvan at gmail.com> - 1.3.1-4
- Upstream patch to fix check_tool('gnome'): trunk rev 2219

* Mon Jan 28 2008 Michel Salim <michel.sylvan at gmail.com> - 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 <michel.sylvan at gmail.com> - 1.3.1-2
- Merge in changes from Thomas Mochny <thomas.moschny at gmx.de>:
  * 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 <michel.sylvan at gmail.com> - 1.3.1-1
- Initial Fedora package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Feb 2008 02:42:41 -0000	1.1
+++ .cvsignore	12 Feb 2008 09:29:58 -0000	1.2
@@ -0,0 +1 @@
+waf-1.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Feb 2008 02:42:41 -0000	1.1
+++ sources	12 Feb 2008 09:29:58 -0000	1.2
@@ -0,0 +1 @@
+9caca69cb435911c9ed6ff0519ce19ae  waf-1.3.2.tar.bz2