rpms/diveintopython/F-8 diveintopython-build_common.xml.patch, NONE, 1.1 diveintopython.spec, 1.6, 1.7
Marc Wiriadisastra (mwiriadi)
fedora-extras-commits at redhat.com
Wed Feb 6 09:56:53 UTC 2008
Author: mwiriadi
Update of /cvs/pkgs/rpms/diveintopython/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23262/F-8
Modified Files:
diveintopython.spec
Added Files:
diveintopython-build_common.xml.patch
Log Message:
- Removed specific java package's and just use java in BR (overholt)
- Added build_patch to not use downloaded jars and....
- use Fedora packages listed in build requires see next changelog entry (bz#431364)
- Added build requires ant, jakarta-commons-net, ant-commons-net and...
- xerces-j2, xml-commons-apis, java
- Removed upstream jars but maintained build-xml files just patched
- Fixed changelog
diveintopython-build_common.xml.patch:
--- NEW FILE diveintopython-build_common.xml.patch ---
--- diveintopython-5.4/common/build_common.xml 2004-05-05 17:42:24.000000000 +0800
+++ diveintopython-build_common.xml 2008-02-05 23:22:48.000000000 +0900
@@ -16,8 +16,8 @@
<property name="pdf" value="${dist}/pdf"/>
<property name="text" value="${dist}/txt"/>
<property name="images" value="&common;/images"/>
-<property name="crimson" value="&common;/lib/crimson.jar"/>
-<property name="saxon" value="&common;/lib/saxon.jar;${crimson}"/>
+<property name="crimson" value="/usr/share/java/xerces-j2.jar"/>
+<property name="saxon" value="/usr/share/java/saxon.jar:${crimson}"/>
<property name="encoding" value="iso-8859-1"/>
<property name="standardargs" value=""/>
Index: diveintopython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/diveintopython/F-8/diveintopython.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- diveintopython.spec 2 Feb 2008 07:33:12 -0000 1.6
+++ diveintopython.spec 6 Feb 2008 09:56:17 -0000 1.7
@@ -1,6 +1,6 @@
Name: diveintopython
Version: 5.4
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Dive into Python - a python book
@@ -15,14 +15,10 @@
BuildArch: noarch
Requires: diveintopython-pdf, xdg-utils
Patch0: diveintopython-build.xml.patch
+Patch1: diveintopython-build_common.xml.patch
-BuildRequires: desktop-file-utils, htmldoc,
-BuildRequires: python, w3m
-%if 0%{?fedora} >= 8
-BuildRequires: java-1.7.0-icedtea
-%else
-BuildRequires: java-1.5.0-gcj
-%endif
+BuildRequires: desktop-file-utils, htmldoc, ant, jakarta-commons-net, ant-commons-net, xerces-j2, xml-commons-apis
+BuildRequires: python, w3m, java, saxon, ant-nodeps
%description
Dive Into Python is a Python book for experienced programmers.
@@ -58,12 +54,16 @@
%prep
%setup -q -b 1
%patch0 -p1 -b .build-all
+%patch1 -p1
mkdir build
mv xml make.sh build.xml build/
+find ./ -name '*.jar' -exec rm -f {} ';'
+
%build
pushd build
-/bin/sh make.sh
+#/bin/sh make.sh
+ant
popd
%install
@@ -115,7 +115,16 @@
%changelog
-* Sat Feb 2 2008 Marc Wiriadisastra <marc at mwiriadi.id.au - 5.4-11
+* Tue Feb 5 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> - 5.4-12
+- Removed specific java package's and just use java in BR (overholt)
+- Added build_patch to not use downloaded jars and....
+- use Fedora packages listed in build requires see next changelog entry (bz#431364)
+- Added build requires ant, jakarta-commons-net, ant-commons-net and...
+- xerces-j2, xml-commons-apis, java
+- Removed upstream jars but maintained build-xml files just patched
+- Fixed changelog
+
+* Sat Feb 2 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> - 5.4-11
- Added xdg-utils Requires to open pdf and other files
* Wed Jan 23 2008 Mohd Izhar Firdaus Ismail <mohd.izhar.firdaus at gmail.com> - 5.4-10
More information about the fedora-extras-commits
mailing list