rpms/waf/devel .cvsignore, 1.8, 1.9 import.log, 1.3, 1.4 sources, 1.8, 1.9 waf.spec, 1.10, 1.11 waf-1.5.2-book.patch, 1.1, NONE waf-1.5.2-stylesheet.patch, 1.1, NONE

[Thomas Moschny]

Author: thm

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

Modified Files:
	.cvsignore import.log sources waf.spec 
Removed Files:
	waf-1.5.2-book.patch waf-1.5.2-stylesheet.patch 
Log Message:
Remove documentation ("The Waf Book"), bad license.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Jan 2009 17:15:51 -0000	1.8
+++ .cvsignore	16 Jan 2009 17:54:52 -0000	1.9
@@ -1 +1 @@
-waf-1.5.2.tar.bz2
+waf-1.5.2.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	16 Jan 2009 17:15:51 -0000	1.3
+++ import.log	16 Jan 2009 17:54:52 -0000	1.4
@@ -1,3 +1,4 @@
 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
+waf-1_5_2-2_fc10:HEAD:waf-1.5.2-2.fc10.src.rpm:1232128440


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Jan 2009 17:15:51 -0000	1.8
+++ sources	16 Jan 2009 17:54:52 -0000	1.9
@@ -1 +1 @@
-7b84bb61b447ec13021b883cf86e4770  waf-1.5.2.tar.bz2
+f389fe7cb4ac72f4bbc2248aa130dbb6  waf-1.5.2.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- waf.spec	16 Jan 2009 17:15:51 -0000	1.10
+++ waf.spec	16 Jan 2009 17:54:52 -0000	1.11
@@ -1,23 +1,21 @@
 Name:           waf
 Version:        1.5.2
-Release:        1%{?dist}
+Release:        2%{?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/
-Source:         http://waf.googlecode.com/files/waf-%{version}.tar.bz2
+# Original tarfile can be found at
+# http://waf.googlecode.com/files/waf-%{version}.tar.bz2
+# We remove doc/book, as this is under CC-BY-NC-ND, which is not
+# allowed in Fedora.
+Source:         waf-%{version}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
 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]")
@@ -38,16 +36,12 @@
 %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 %{buildroot}
@@ -70,15 +64,11 @@
 # 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 %{buildroot}
@@ -87,13 +77,16 @@
 %files
 %defattr(-,root,root,-)
 %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-2
+- Remove the documentation again, as it is under CC-BY-NC-ND. Also
+  remove it from the tarfile.
+
 * 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).


--- waf-1.5.2-book.patch DELETED ---


--- waf-1.5.2-stylesheet.patch DELETED ---