rpms/waf/F-9 waf-1.4.2-fcntl.patch, NONE, 1.1 waf-1.4.2-libdir.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 waf.spec, 1.4, 1.5 waf-1.4.1-libdir.patch, 1.1, NONE
Thomas Moschny (thm)
fedora-extras-commits at redhat.com
Mon May 26 08:14:44 UTC 2008
- Previous message (by thread): rpms/xfce4-dict/devel xfce4-dict.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/R-DynDoc/F-8 .cvsignore, 1.3, 1.4 R-DynDoc.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thm
Update of /cvs/pkgs/rpms/waf/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2625/F-9
Modified Files:
.cvsignore sources waf.spec
Added Files:
waf-1.4.2-fcntl.patch waf-1.4.2-libdir.patch
Removed Files:
waf-1.4.1-libdir.patch
Log Message:
- Update to 1.4.2.
- Patch: stdout might not be a terminal.
waf-1.4.2-fcntl.patch:
--- NEW FILE waf-1.4.2-fcntl.patch ---
--- waf-1.4.2/wafadmin/Utils.py 2008-05-16 17:43:19.000000000 +0200
+++ waf-1.4.2.fcntl/wafadmin/Utils.py 2008-05-26 09:23:19.000000000 +0200
@@ -154,10 +154,13 @@ except ImportError:
return 55
else:
def get_term_cols():
- dummy_lines, cols = struct.unpack("HHHH", \
- fcntl.ioctl(sys.stdout.fileno(),termios.TIOCGWINSZ , \
- struct.pack("HHHH", 0, 0, 0, 0)))[:2]
- return cols
+ try:
+ dummy_lines, cols = struct.unpack("HHHH", \
+ fcntl.ioctl(sys.stdout.fileno(),termios.TIOCGWINSZ , \
+ struct.pack("HHHH", 0, 0, 0, 0)))[:2]
+ return cols
+ except IOError:
+ return 55
def progress_line(state, total, col1, col2):
n = len(str(total))
waf-1.4.2-libdir.patch:
--- NEW FILE waf-1.4.2-libdir.patch ---
diff -up waf-1.4.2/waf-light.libdir waf-1.4.2/waf-light
--- waf-1.4.2/waf-light.libdir 2008-05-17 14:24:37.000000000 +0200
+++ waf-1.4.2/waf-light 2008-05-26 08:56:47.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.2/wscript.libdir waf-1.4.2/wscript
--- waf-1.4.2/wscript.libdir 2008-05-17 14:24:37.000000000 +0200
+++ waf-1.4.2/wscript 2008-05-26 08:56:47.000000000 +0200
@@ -301,7 +301,7 @@ def install_waf():
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'))
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 4 May 2008 18:52:29 -0000 1.4
+++ .cvsignore 26 May 2008 08:14:01 -0000 1.5
@@ -1 +1 @@
-waf-1.4.1.tar.bz2
+waf-1.4.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 4 May 2008 18:52:29 -0000 1.4
+++ sources 26 May 2008 08:14:01 -0000 1.5
@@ -1 +1 @@
-2e9055fe3b5e0ab1917f5e1ff1fa8c81 waf-1.4.1.tar.bz2
+0d0c397ee675b2df79f65b375eb8a0f8 waf-1.4.2.tar.bz2
Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-9/waf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- waf.spec 4 May 2008 18:52:29 -0000 1.4
+++ waf.spec 26 May 2008 08:14:01 -0000 1.5
@@ -1,6 +1,6 @@
Name: waf
-Version: 1.4.1
-Release: 1%{?dist}
+Version: 1.4.2
+Release: 2%{?dist}
Summary: A Python-based build system
Group: Development/Tools
@@ -9,7 +9,8 @@
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.1-libdir.patch
+Patch0: waf-1.4.2-libdir.patch
+Patch1: waf-1.4.2-fcntl.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
@@ -32,7 +33,8 @@
%prep
%setup -q
-%patch0 -p0 -b .libdir
+%patch0 -p1 -b .libdir
+%patch1 -p1 -b .fcntl
%build
@@ -42,10 +44,12 @@
%install
rm -rf $RPM_BUILD_ROOT
-# remove shebangs from all scripts in wafadmin
-find wafadmin -name '*.py' -exec sed -i "1{/^#!/d}" {} \;
+# the install target wants an acknowledgement
+echo y | ./waf install --prefix=%{_prefix} --destdir=$RPM_BUILD_ROOT
-./waf install --prefix=%{_prefix} --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}' {} \;
# fix waf script shebang line
sed -i "1c#! /usr/bin/python" $RPM_BUILD_ROOT%{_bindir}/waf
@@ -53,12 +57,13 @@
# 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 {} \;
+# remove zero-length files
+rm demos/gnome/src/hello.h
+rm demos/simple_scenarios/local_tool/uh.coin
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -72,6 +77,14 @@
%changelog
+* Mon May 26 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.4.2-2
+- Patch: stdout might not be a terminal.
+
+* Sat May 17 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.4.2-1
+- Update to 1.4.2.
+- Remove shebang lines from files in wafadmin after installation, not
+ before, otherwise install will re-add them.
+
* Sun May 4 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.4.1-1
- Update to upstream version 1.4.1.
--- waf-1.4.1-libdir.patch DELETED ---
- Previous message (by thread): rpms/xfce4-dict/devel xfce4-dict.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/R-DynDoc/F-8 .cvsignore, 1.3, 1.4 R-DynDoc.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list