rpms/waf/devel waf-1.5.2-book.patch, NONE, 1.1 waf-1.5.2-libdir.patch, NONE, 1.1 waf-1.5.2-stylesheet.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 import.log, 1.2, 1.3 sources, 1.7, 1.8 waf.spec, 1.9, 1.10 waf-1.4.4-libdir.patch, 1.1, NONE

Thomas Moschny thm at fedoraproject.org
Fri Jan 16 17:16:21 UTC 2009 

Author: thm

Update of /cvs/pkgs/rpms/waf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5009/devel

Modified Files:
	.cvsignore import.log sources waf.spec 
Added Files:
	waf-1.5.2-book.patch waf-1.5.2-libdir.patch 
	waf-1.5.2-stylesheet.patch 
Removed Files:
	waf-1.4.4-libdir.patch 
Log Message:
Update to 1.5.2.

waf-1.5.2-book.patch:

--- NEW FILE waf-1.5.2-book.patch ---
Index: doc/book/c_builds.xml
===================================================================
--- doc/book/c_builds.xml	(revision 5461)
+++ doc/book/c_builds.xml	(revision 5462)
@@ -67,20 +67,20 @@
 	main.source = 'main.c'
 	main.target = 'test_c_program'
 	main.includes = '.'
-	main.uselib_local = 'teststaticlib' <co id="uselib-co" linkends="b4"/>
+	main.uselib_local = 'teststaticlib' <co id="uselib2-co" linkends="b4"/>
 			</programlisting>
 
 			<calloutlist>
 				<callout arearefs="lib-co" id="b1">
 					<para>A static library</para>
 				</callout>
-				<callout arearefs="lib-co" id="b2">
+				<callout arearefs="uselib-co" id="b2">
 					<para>Include paths to export for use with uselib_local (include paths are not added automatically). These folders are taken relatively to the current target.</para>
 				</callout>
 				<callout arearefs="prog-co" id="b3">
 					<para>A program using the static library declared previously</para>
 				</callout>
-				<callout arearefs="uselib-co" id="b4">
+				<callout arearefs="uselib2-co" id="b4">
 					<para>A list of references to existing libraries declared in the project (either a python list or a string containing the names space-separated)</para>
 				</callout>
 			</calloutlist>

waf-1.5.2-libdir.patch:

--- NEW FILE waf-1.5.2-libdir.patch ---
diff -up waf-1.5.2/waf-light.orig waf-1.5.2/waf-light
--- waf-1.5.2/waf-light.orig	2008-12-22 00:31:57.000000000 +0100
+++ waf-1.5.2/waf-light	2009-01-16 17:13:00.000000000 +0100
@@ -102,7 +102,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.5.2/wscript.orig waf-1.5.2/wscript
--- waf-1.5.2/wscript.orig	2008-12-22 00:31:57.000000000 +0100
+++ waf-1.5.2/wscript	2009-01-16 17:13:00.000000000 +0100
@@ -318,7 +318,7 @@ def build(bld):
 		if val != True and val != "y": sys.exit(1)
 		create_waf()
 
-	dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
+	dir = os.path.join('share', 'waf', 'wafadmin')
 
 	wafadmin = bld.new_task_gen('py')
 	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])

waf-1.5.2-stylesheet.patch:

--- NEW FILE waf-1.5.2-stylesheet.patch ---
diff -up waf-1.5.2/doc/book/wscript.orig waf-1.5.2/doc/book/wscript
--- waf-1.5.2/doc/book/wscript.orig	2008-12-22 00:30:46.000000000 +0100
+++ waf-1.5.2/doc/book/wscript	2009-01-16 17:35:02.000000000 +0100
@@ -87,8 +87,8 @@ def build(bld):
 	obj.source = 'waf.xml'
 
 	obj.type = 'html'
-	obj.stylesheet='/usr/share/xml/docbook/stylesheet/nwalsh/current/html/chunk.xsl'
-	#obj.stylesheet='/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl'
+	#obj.stylesheet='/usr/share/xml/docbook/stylesheet/nwalsh/current/html/chunk.xsl'
+	obj.stylesheet='/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl'
 	#obj.stylesheet = '/home/tnagy/docbook-xsl-snapshot/html/chunk.xsl'
 
 	#obj.type = 'pdf'


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	31 Aug 2008 20:49:53 -0000	1.7
+++ .cvsignore	16 Jan 2009 17:15:51 -0000	1.8
@@ -1 +1 @@
-waf-1.4.4.tar.bz2
+waf-1.5.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	31 Aug 2008 20:49:53 -0000	1.2
+++ import.log	16 Jan 2009 17:15:51 -0000	1.3
@@ -1,2 +1,3 @@
 waf-1_4_3-1_fc9:HEAD:waf-1.4.3-1.fc9.src.rpm:1214694119
 waf-1_4_4-1_fc9:HEAD:waf-1.4.4-1.fc9.src.rpm:1220215604
+waf-1_5_2-1_fc10:HEAD:waf-1.5.2-1.fc10.src.rpm:1232126058


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Aug 2008 20:49:53 -0000	1.7
+++ sources	16 Jan 2009 17:15:51 -0000	1.8
@@ -1 +1 @@
-6a809e446497b710592579772c8b22bd  waf-1.4.4.tar.bz2
+7b84bb61b447ec13021b883cf86e4770  waf-1.5.2.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- waf.spec	1 Dec 2008 15:00:54 -0000	1.9
+++ waf.spec	16 Jan 2009 17:15:51 -0000	1.10
@@ -1,29 +1,34 @@
 Name:           waf
-Version:        1.4.4
-Release:        2%{?dist}
+Version:        1.5.2
+Release:        1%{?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
+Source:         http://waf.googlecode.com/files/waf-%{version}.tar.bz2
 # use _datadir instead of /usr/lib
-Patch0:         waf-1.4.4-libdir.patch
-
+Patch0:         waf-1.5.2-libdir.patch
+Patch1:         waf-1.5.2-stylesheet.patch
+# r5462 from trunk
+Patch2:         waf-1.5.2-book.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
-
 BuildRequires:  python-devel
+# for building the documentation
+BuildRequires:  /usr/bin/xsltproc
+BuildRequires:  docbook-style-xsl
 # 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]")
+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
@@ -33,25 +38,28 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .stylesheet
+%patch2 -p0 -b .book
 
 
 %build
 ./waf-light configure --prefix=%{_prefix}
 ./waf-light --make-waf --strip
 
+(cd doc/book ; ../../waf configure && ../../waf)
+
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-# the install target wants an acknowledgement
-echo y | ./waf install --destdir=$RPM_BUILD_ROOT
+./waf install --yes --destdir=%{buildroot}
 
 # remove shebangs from all scripts in wafadmin
-find $RPM_BUILD_ROOT%{_datadir}/waf/wafadmin -name '*.py' \
+find %{buildroot}%{_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
+%{__sed} -i "1c#! /usr/bin/python" %{buildroot}%{_bindir}/waf
 
 # fix EOL
 %{__sed} -i 's|\r$||g' utils/amtool.py
@@ -62,25 +70,37 @@
 # remove zero-length files
 %{__rm} demos/gnome/src/hello.h
 %{__rm} demos/simple_scenarios/local_tool/uh.coin
+%{__rm} doc/book/build/default/waf.html
 
 # bash completion
 %{__install} -D -p -m 0644 utils/waf-completion.bash \
   %{buildroot}%{_sysconfdir}/bash_completion.d//waf-completion.bash
 
+# basically giving it a better name
+%{__mv} doc/book/build/default doc/html
+
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%doc README TODO ChangeLog demos doc/waf.pdf utils
+%doc README TODO ChangeLog demos utils
+%doc doc/html
 %{_bindir}/waf
 %{_datadir}/waf
 %{_sysconfdir}/bash_completion.d
 
 
 %changelog
+* Fri Jan 16 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.2-1
+- Update to 1.5.2.
+- Generate html documentation (though without highlighting).
+
+* Fri Dec 19 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.1-1
+- Update to 1.5.1.
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.4.4-2
 - Rebuild for Python 2.6
 


--- waf-1.4.4-libdir.patch DELETED ---

More information about the fedora-extras-commits mailing list