rpms/waf/devel import.log, NONE, 1.1 waf-1.4.3-libdir.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 waf.spec, 1.6, 1.7 waf-1.4.2-fcntl.patch, 1.1, NONE waf-1.4.2-libdir.patch, 1.1, NONE
Thomas Moschny (thm)
fedora-extras-commits at redhat.com
Sat Jun 28 23:03:53 UTC 2008
Author: thm
Update of /cvs/pkgs/rpms/waf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18079/devel
Modified Files:
.cvsignore sources waf.spec
Added Files:
import.log waf-1.4.3-libdir.patch
Removed Files:
waf-1.4.2-fcntl.patch waf-1.4.2-libdir.patch
Log Message:
- Update to 1.4.3.
- Remove fcntl patch (fixed upstream).
- Prefix has to be set in a configure step now.
- Pack the bash completion file.
--- NEW FILE import.log ---
waf-1_4_3-1_fc9:HEAD:waf-1.4.3-1.fc9.src.rpm:1214694119
waf-1.4.3-libdir.patch:
--- NEW FILE waf-1.4.3-libdir.patch ---
diff -up waf-1.4.3/waf-light.orig waf-1.4.3/waf-light
--- waf-1.4.3/waf-light.orig 2008-06-23 01:53:07.000000000 +0200
+++ waf-1.4.3/waf-light 2008-06-28 19:04:21.000000000 +0200
@@ -109,7 +109,7 @@ def find_lib():
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
diff -up waf-1.4.3/wscript.orig waf-1.4.3/wscript
--- waf-1.4.3/wscript.orig 2008-06-23 01:53:07.000000000 +0200
+++ waf-1.4.3/wscript 2008-06-28 19:02:00.000000000 +0200
@@ -324,7 +324,7 @@ def build(bld):
wafadmin = bld.create_obj('py')
wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])
wafadmin.inst_var = 'PREFIX'
- wafadmin.inst_dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
+ wafadmin.inst_dir = os.path.join('share', 'waf', 'wafadmin')
tools = bld.create_obj('py')
tools.find_sources_in_dirs('wafadmin/Tools', exts=['.py'])
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 26 May 2008 07:04:16 -0000 1.5
+++ .cvsignore 28 Jun 2008 23:03:03 -0000 1.6
@@ -1 +1 @@
-waf-1.4.2.tar.bz2
+waf-1.4.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 26 May 2008 07:04:16 -0000 1.5
+++ sources 28 Jun 2008 23:03:03 -0000 1.6
@@ -1 +1 @@
-0d0c397ee675b2df79f65b375eb8a0f8 waf-1.4.2.tar.bz2
+fb4acb46dbb612e911d7296282269743 waf-1.4.3.tar.bz2
Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- waf.spec 26 May 2008 08:03:06 -0000 1.6
+++ waf.spec 28 Jun 2008 23:03:03 -0000 1.7
@@ -1,6 +1,6 @@
Name: waf
-Version: 1.4.2
-Release: 2%{?dist}
+Version: 1.4.3
+Release: 1%{?dist}
Summary: A Python-based build system
Group: Development/Tools
@@ -9,8 +9,7 @@
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.4.2-libdir.patch
-Patch1: waf-1.4.2-fcntl.patch
+Patch0: waf-1.4.3-libdir.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
@@ -34,39 +33,43 @@
%prep
%setup -q
%patch0 -p1 -b .libdir
-%patch1 -p1 -b .fcntl
%build
+./waf-light configure --prefix=%{_prefix}
./waf-light --make-waf --strip
%install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
# the install target wants an acknowledgement
-echo y | ./waf install --prefix=%{_prefix} --destdir=$RPM_BUILD_ROOT
+echo y | ./waf install --destdir=$RPM_BUILD_ROOT
# remove shebangs from all scripts in wafadmin
find $RPM_BUILD_ROOT%{_datadir}/waf/wafadmin -name '*.py' \
- -exec sed -i '1{/^#!/d}' {} \;
+ -exec %{__sed} -i '1{/^#!/d}' {} \;
# fix waf script shebang line
-sed -i "1c#! /usr/bin/python" $RPM_BUILD_ROOT%{_bindir}/waf
+%{__sed} -i "1c#! /usr/bin/python" $RPM_BUILD_ROOT%{_bindir}/waf
# fix EOL
-sed -i 's|\r$||g' utils/amtool.py
+%{__sed} -i 's|\r$||g' utils/amtool.py
# remove x-bits from everything going to doc
-find demos utils -type f -exec chmod 0644 {} \;
+find demos utils -type f -exec %{__chmod} 0644 {} \;
# remove zero-length files
-rm demos/gnome/src/hello.h
-rm demos/simple_scenarios/local_tool/uh.coin
+%{__rm} demos/gnome/src/hello.h
+%{__rm} demos/simple_scenarios/local_tool/uh.coin
+
+# bash completion
+%{__install} -D -p -m 0644 utils/waf-completion.bash \
+ %{buildroot}%{_sysconfdir}/bash_completion.d//waf-completion.bash
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
%files
@@ -74,9 +77,16 @@
%doc README TODO ChangeLog demos doc/waf.pdf utils
%{_bindir}/waf
%{_datadir}/waf
+%{_sysconfdir}/bash_completion.d
%changelog
+* Sat Jun 28 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.4.3-1
+- Update to 1.4.3.
+- Remove fcntl patch (fixed upstream).
+- Prefix has to be set in a configure step now.
+- Pack the bash completion file.
+
* Mon May 26 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.4.2-2
- Patch: stdout might not be a terminal.
--- waf-1.4.2-fcntl.patch DELETED ---
--- waf-1.4.2-libdir.patch DELETED ---
More information about the fedora-extras-commits
mailing list