diveintopython fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674814

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +0,0 @@
-diveintopython-common-5.4.zip
-diveintopython-xml-5.4.zip

dead.package

@@ -0,0 +1 @@
+diveintopython fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674814

diveintopython-build.xml.patch

@@ -1,11 +0,0 @@
---- old/build.xml	2008-01-23 23:06:01.000000000 +0800
-+++ new/build.xml	2008-01-23 23:06:14.000000000 +0800
-@@ -6,7 +6,7 @@
- <!ENTITY common "../common">
- <!ENTITY buildcommon SYSTEM "../common/build_common.xml">
- ]>
--<project name="diveintopython" default="html" basedir=".">
-+<project name="diveintopython" default="all" basedir=".">
- 
- <property name="lang" value=""/>
- <property name="ftpdir" value=""/>

diveintopython-build_common.xml.patch

@@ -1,13 +0,0 @@
---- 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=""/>
- 

diveintopython-xalan.patch

@@ -1,190 +0,0 @@
-From 00e7220d86517677f7e6b5bd2e8412da5ca8bb9f Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Thu, 26 Nov 2009 13:24:49 +0100
-Subject: [PATCH] Support formatting with Xalan
-
----
- common/build_common.xml |  107 ++++++++++++++++++++++++----------------------
- 1 files changed, 56 insertions(+), 51 deletions(-)
-
-diff --git a/common/build_common.xml b/common/build_common.xml
-index 905cf49..7575449 100644
---- a/common/build_common.xml
-+++ b/common/build_common.xml
-@@ -18,6 +18,7 @@
- <property name="images" value="&common;/images"/>
- <property name="crimson" value="/usr/share/java/xerces-j2.jar"/>
- <property name="saxon" value="/usr/share/java/saxon.jar:${crimson}"/>
-+<property name="xalan-j2" value="/usr/share/java/xalan-j2.jar:/usr/share/java/xalan-j2-serializer.jar"/>
- <property name="encoding" value="iso-8859-1"/>
- <property name="standardargs" value=""/>
- 
-@@ -31,8 +32,53 @@
-   </patternset>
- </fileset>
- 
-+<!-- configure saxon xslt processor to use (default) -->
-+<target name="use-saxon" unless="xalan">
-+  <property name="standardargs" value="-param use.extensions 1"/>
-+  <macrodef name="xslt-transform">
-+     <attribute name="out" default=""/>
-+     <attribute name="in"/>
-+     <attribute name="xsl"/>
-+     <attribute name="args" default=""/>
-+     <sequential>
-+       <property name="outarg." value=""/>
-+       <condition property="outarg.@{out}" value="-o @{out}">
-+         <not><equals arg1="@{out}" arg2=""/></not>
-+       </condition>
-+       <java classname="com.icl.saxon.StyleSheet" fork="yes" failonerror="yes">
-+         <arg line="${standardargs} ${outarg.@{out}} @{in} @{xsl} @{args}"/>
-+         <classpath>
-+           <pathelement path="${saxon}"/>
-+         </classpath>
-+       </java>
-+     </sequential>
-+  </macrodef>
-+</target>
-+
-+<!-- configure xalan-j2 xslt processor to use -->
-+<target name="use-xalan" if="xalan">
-+  <macrodef name="xslt-transform">
-+     <attribute name="out" default="" />
-+     <attribute name="in"/>
-+     <attribute name="xsl"/>
-+     <attribute name="args" default=""/>
-+     <sequential>
-+       <property name="outarg." value=""/>
-+       <condition property="outarg.@{out}" value="-out @{out}">
-+         <not><equals arg1="@{out}" arg2=""/></not>
-+       </condition>
-+       <java classname="org.apache.xalan.xslt.Process" fork="yes" failonerror="yes">
-+         <arg line="${standardargs} -in @{in} ${outarg.@{out}} -xsl @{xsl} @{args} -param base.dir ${user.dir}/dist/html/"/>
-+         <classpath>
-+           <pathelement path="${xalan-j2}"/>
-+         </classpath>
-+       </java>
-+     </sequential>
-+  </macrodef>
-+</target>
-+
- <!-- administrative targets -->
--<target name="init">
-+<target name="init" depends="use-saxon,use-xalan">
-   <condition property="python" value="python">
-     <os family="unix"/>
-   </condition>
-@@ -140,22 +186,11 @@
-     <param name="target" value="${html}"/>
-   </antcall>
- 
--  <java classname="com.icl.saxon.StyleSheet" fork="yes" failonerror="yes">
--    <arg line="${standardargs} -o ${html}/index.html ${xml}/index.xml ${xsl}/index.xsl"/>
--    <classpath>
--      <pathelement path="${saxon}"/>
--    </classpath>
--  </java>
--
-+  <xslt-transform out="${html}/index.html" in="${xml}/index.xml" xsl="${xsl}/index.xsl"/>
- </target>
- 
- <target name="rss" depends="prepare">
--  <java classname="com.icl.saxon.StyleSheet" fork="yes" failonerror="yes">
--    <arg line="${standardargs} -o ${html}/history.xml ${xml}/${project}.xml ${xsl}/rss.xsl"/>
--    <classpath>
--      <pathelement path="${saxon}"/>
--    </classpath>
--  </java>
-+  <xslt-transform out="${html}/history.xml" in="${xml}/${project}.xml" xsl="${xsl}/rss.xsl"/>
- </target>
- 
- <target name="html" depends="prepare,validatebook">
-@@ -168,13 +203,7 @@
-     <param name="ext" value="png"/>
-   </antcall>
- 
--  <java classname="com.icl.saxon.StyleSheet" fork="yes" failonerror="yes">
--<!--    <arg line="${standardargs} -ds ${xml}/${project}.xml ${xsl}/html.xsl"/>-->
--    <arg line="${standardargs} ${xml}/${project}.xml ${xsl}/html.xsl"/>
--    <classpath>
--      <pathelement path="${saxon}"/>
--    </classpath>
--  </java>
-+  <xslt-transform in="${xml}/${project}.xml" xsl="${xsl}/html.xsl"/>
- 
-   <antcall target="postprocess">
-     <param name="target" value="${html}"/>
-@@ -201,12 +230,7 @@
-     <param name="ext" value="png"/>
-   </antcall>
- 
--  <java classname="com.icl.saxon.StyleSheet" fork="yes" failonerror="yes">
--    <arg line="${standardargs} -o ${htmlflat}/${project}${lang}.html ${xml}/${project}.xml ${xsl}/htmlsingle.xsl"/>
--    <classpath>
--      <pathelement path="${saxon}"/>
--    </classpath>
--  </java>
-+  <xslt-transform out="${htmlflat}/${project}${lang}.html" in="${xml}/${project}.xml" xsl="${xsl}/htmlsingle.xsl"/>
- 
-   <antcall target="postprocess">
-     <param name="target" value="${htmlflat}"/>
-@@ -220,12 +244,7 @@
- </target>
- 
- <target name="word" if="illegalmonopoly" depends="prepare,validatebook">
--  <java classname="com.icl.saxon.StyleSheet" fork="yes" failonerror="yes">
--    <arg line="${standardargs} -o ${word}/${project}.html ${xml}/${project}.xml ${xsl}/word2000.xsl"/>
--    <classpath>
--      <pathelement path="${saxon}"/>
--    </classpath>
--  </java>
-+  <xslt-transform out="${word}/${project}.html" in="${xml}/${project}.xml" xsl="${xsl}/word2000.xsl"/>
- 
-   <antcall target="postprocess">
-     <param name="target" value="${word}"/>
-@@ -247,12 +266,7 @@
-     <param name="ext" value="png"/>
-   </antcall>
- 
--  <java classname="com.icl.saxon.StyleSheet" fork="yes" failonerror="yes">
--    <arg line="${standardargs} -o ${pdf}/${project}.html ${xml}/${project}.xml ${xsl}/pdf.xsl"/>
--    <classpath>
--      <pathelement path="${saxon}"/>
--    </classpath>
--  </java>
-+  <xslt-transform out="${pdf}/${project}.html" in="${xml}/${project}.xml" xsl="${xsl}/pdf.xsl"/>
- 
-   <antcall target="postprocess">
-     <param name="target" value="${pdf}"/>
-@@ -275,12 +289,7 @@
- </target>
- 
- <target name="text" depends="prepare,validatebook">
--  <java classname="com.icl.saxon.StyleSheet" fork="yes" failonerror="yes">
--    <arg line="${standardargs} -o ${text}/${project}.html ${xml}/${project}.xml ${xsl}/text.xsl"/>
--    <classpath>
--      <pathelement path="${saxon}"/>
--    </classpath>
--  </java>
-+  <xslt-transform out="${text}/${project}.html" in="${xml}/${project}.xml" xsl="${xsl}/text.xsl"/>
- 
-   <antcall target="postprocess">
-     <param name="target" value="${text}"/>
-@@ -305,12 +314,8 @@
-   </antcall>
- 
-     
--  <java dir="${htmlhelp}" classname="com.icl.saxon.StyleSheet" fork="yes" failonerror="yes">
--    <arg line="${standardargs} -o ${project}.html ${htmlhelppathtoroot}/${xml}/${project}.xml ${htmlhelppathtoroot}/${xsl}/htmlhelp.xsl htmlhelp.encoding=${encoding}"/>
--    <classpath>
--      <pathelement path="${saxon}"/>
--    </classpath>
--  </java>
-+  <xslt-transform out="${project}.html" in="${htmlhelppathtoroot/${xml}/${project}.xml"
-+    xsl="${htmlhelppathtoroot}/${xsl}/htmlhelp.xsl" args="htmlhelp.encoding=${encoding}"/>
- 
-   <antcall target="colorize">
-     <param name="target" value="${htmlhelp}"/>
--- 
-1.6.5.2
-

diveintopython.desktop.in

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Dive Into Python
-Comment=Open Dive Into Python book
-Exec=xdg-open @DOCDIR@/pdf/diveintopython.pdf
-Icon=gnome-mime-application-pdf
-Terminal=false
-Type=Application
-Categories=Application;Development;

diveintopython.spec

@@ -1,216 +0,0 @@
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
-Name:           diveintopython
-Version:        5.4
-Release:        27%{?dist}
-
-Summary:        Dive into Python - a python book
-
-Group:          Documentation
-License:        GFDL
-URL:            http://www.diveintopython.net
-Source0:        http://www.diveintopython.net/download/%{name}-common-%{version}.zip
-Source1:        http://www.diveintopython.net/download/%{name}-xml-%{version}.zip
-Source2:        %{name}.desktop.in
-
-BuildArch:      noarch
-Requires:       diveintopython-pdf, xdg-utils
-Patch0:         diveintopython-build.xml.patch
-Patch1:         diveintopython-build_common.xml.patch
-Patch2:         diveintopython-xalan.patch
-
-BuildRequires:  desktop-file-utils, htmldoc, ant >= 1.8.2, jakarta-commons-net, ant-commons-net, xerces-j2, xml-commons-apis
-BuildRequires:  python, w3m, java, xalan-j2
-
-%description
-Dive Into Python is a Python book for experienced programmers.
-
-%package         pdf
-Summary:         Dive into Python - a python book
-Group:           Documentation
-%description     pdf
-Dive Into Python is a Python book for experienced programmers.
-The PDF version
-
-%package         html
-Summary:         Dive into Python - a python book
-Group:           Documentation
-%description     html
-Dive Into Python is a Python book for experienced programmers.
-The html version
-
-%package         single-html
-Summary:         Dive into Python - a python book
-Group:           Documentation
-%description     single-html
-Dive Into Python is a Python book for experienced programmers.
-The single html page version
-
-%package         txt
-Summary:         Dive into Python - a python book
-Group:           Documentation
-%description     txt
-Dive Into Python is a Python book for experienced programmers.
-The text version
-
-%prep 
-%setup -q -b 1
-%patch0 -p1 -b .build-all
-%patch1 -p1
-%patch2 -p1 -b .xalan
-mkdir build
-mv xml make.sh build.xml build/
-
-find \( -name '*.jar' -o -name '*.py[co]' \) -delete
-
-%build
-pushd build
-#/bin/sh make.sh
-ant -Dxalan=1
-popd
-
-%install
-pushd build/dist
-#cleanup unnecessary duplicates
-rm -rf pdf/*.png pdf/*.html pdf/images/
-rm -rf txt/*.html
-
-#install the files
-find . -type d -exec mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/'{}'  \;
-for DIR in * ; do
-  find $DIR -type f -exec install -D -m 0644 '{}' $RPM_BUILD_ROOT%{_pkgdocdir}/'{}' \;
-done
-popd
-
-#install desktop file
-mkdir ${RPM_BUILD_ROOT}%{_datadir}/applications/
-cat %{SOURCE2}|sed "s|@DOCDIR@|%{_pkgdocdir}/|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/diveintopython.desktop
-
-desktop-file-install  \
-        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-        --add-category="Documentation"                  \
-        ${RPM_BUILD_ROOT}%{_datadir}/applications/diveintopython.desktop
-
-%files 
-
-%files html
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/html
-
-%files pdf
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/pdf
-%{_datadir}/applications/diveintopython.desktop
-
-%files single-html
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/htmlflat
-
-%files txt
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/txt
-
-%changelog
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Dec 12 2013 Ville Skyttä <ville.skytta@iki.fi> - 5.4-26
-- Install to %%{_pkgdocdir} where available (#993724).
-- Fix ant(-nodeps) build dependency (#992130).
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 22 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 5.4-24
-- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
-- clean up spec to follow current guidelines
-- fix desktop file to follow specification
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Apr 26 2012 Devrim Gunduz <devrim@gunduz.org> - 5.4-21
-- Fix URL, per #816351.
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jul 13 2010 Alexander Kurtakov <akurtako@redhat.com> 5.4-18
-- Fix xalan patch.
-
-* Wed Nov 25 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.4-17
-- Newer saxon no longer supports XSLT 1.0, use Xalan-J instead
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Nov  4 2008 Paul W. Frields <stickster@gmail.com> - 5.4-14
-- Fix file location problem that breaks HTML version
-
-* Tue Sep  2 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 5.4-13
-- Include /usr/share/doc/diveintopython-5.4 directory (in all pkgs)
-
-* Tue Feb 5 2008 Marc Wiriadisastra <marc@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@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@gmail.com> - 5.4-10
-- Major cleanup of spec to be less complex
-- Made the packaging less diverted from the generated tree from upstream build script
-- Changed desktop file to use pdf mimetype icon as diveintopython.png is corrupted
-  even in upstream zip file
-- Removed unnecessary patches
-- Removed builreq ant as upstream make.sh uses upstream provided jars (we might want to
-  use ant from fedora repo, todo: investigate possibility of patching make.sh and adding
-  more java buildreqs for this)
-- Switched diveintopython to be a metapackage which pulls diveintopython-pdf
-
-* Sat Jan 19 2008 Marc Wiriadisastra <marc@mwiriadi.id.au> - 5.4-8
-- Removed multiple desktop-files
-- Made the default version the pdf version
-- Added build requires check so it can build on F7
-
-* Sat Jan 19 2008 Marc Wiriadisastra <marc@mwiriadi.id.au> - 5.4-7
-- Fixed spec file to install the txt version in the txt folder (bug #429239)
-- Added diveintopython.png to desktop file in txt version
-- Fixed desktop files to relate to each individual package more. (bug #429239)
-
-* Wed Jan 9 2008 Marc Wiriadisastra <marc@mwiriadi.id.au> - 5.4-6
-- Fix ownership of folders
-- Fix spec file for spaces and tabs again :(
-
-* Sun Jan 6 2008 Marc Wiriadisastra <marc@mwiriadi.id.au> - 5.4-5
-- Fixed build requires - added iced-tea, python, w3m and htmldoc
-
-* Fri Jan 4 2008 Marc Wiriadisastra <marc@mwiriadi.id.au> - 5.4-4
-- Added patches for all builds
-- Created additional packages for the users choice
-- Added additional desktop files
-
-* Wed Jan 2 2008 Marc Wiriadisastra <marc@mwiriadi.id.au> - 5.4-3
-- Using the docbook and creating the html using ant
-- Patched neccessary build files and included additional source files
-
-* Thu Nov 22 2007 Marc Wiriadisastra <marc@mwiriadi.id.au> - 5.4-2
-- Fixed line encoding (Jerry James)
-- Fixed owning of directories in spec file
-
-* Fri Nov 16 2007 Marc Wiriadisastra <marc@mwiriadi.id.au> - 5.4-1
-- new install

sources

@@ -1,2 +0,0 @@
-722affd8054d667d66764c3c48a6490b  diveintopython-common-5.4.zip
-3e1c9e3d00fc912cb298b062bdac9002  diveintopython-xml-5.4.zip