diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ab506a1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +diveintopython-common-5.4.zip +diveintopython-xml-5.4.zip diff --git a/Makefile b/Makefile deleted file mode 100644 index 427eb90..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: diveintopython -# $Id$ -NAME := diveintopython -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/diveintopython-build.xml.patch b/diveintopython-build.xml.patch new file mode 100644 index 0000000..e3da6f5 --- /dev/null +++ b/diveintopython-build.xml.patch @@ -0,0 +1,11 @@ +--- 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 @@ + + + ]> +- ++ + + + diff --git a/diveintopython-build_common.xml.patch b/diveintopython-build_common.xml.patch new file mode 100644 index 0000000..57ee0db --- /dev/null +++ b/diveintopython-build_common.xml.patch @@ -0,0 +1,13 @@ +--- 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 @@ + + + +- +- ++ ++ + + + diff --git a/diveintopython.desktop.in b/diveintopython.desktop.in new file mode 100644 index 0000000..4ac4d5c --- /dev/null +++ b/diveintopython.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +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; diff --git a/diveintopython.spec b/diveintopython.spec new file mode 100644 index 0000000..18c9d53 --- /dev/null +++ b/diveintopython.spec @@ -0,0 +1,172 @@ +Name: diveintopython +Version: 5.4 +Release: 12%{?dist} + +Summary: Dive into Python - a python book + +Group: Documentation +License: GFDL +URL: http://www.diveintopython.org +Source0: http://www.diveintopython.org/download/%{name}-common-%{version}.zip +Source1: http://www.diveintopython.org/download/%{name}-xml-%{version}.zip +Source2: %{name}.desktop.in + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: diveintopython-pdf, xdg-utils +Patch0: diveintopython-build.xml.patch +Patch1: diveintopython-build_common.xml.patch + +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. + +%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 +mkdir build +mv xml make.sh build.xml build/ + +find ./ -name '*.jar' -exec rm -f {} ';' + +%build +pushd build +#/bin/sh make.sh +ant +popd + +%install +rm -rf $RPM_BUILD_ROOT +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%{_docdir}/%{name}-%{version}/'{}' \; +for DIR in * ; do + find $DIR -type f -exec install -m 0644 '{}' $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/${DIR}/ \; +done +popd + +#install desktop file +mkdir ${RPM_BUILD_ROOT}%{_datadir}/applications/ +cat %{SOURCE2}|sed "s|@DOCDIR@|%{_docdir}/%{name}-%{version}/|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/diveintopython.desktop + +desktop-file-install --vendor="fedora" \ + --delete-original \ + --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category="Documentation" \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/diveintopython.desktop + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) + +%files html +%defattr(-,root,root,-) +%doc %{_docdir}/%{name}-%{version}/html + +%files pdf +%defattr(-,root,root,-) +%doc %{_docdir}/%{name}-%{version}/pdf +%{_datadir}/applications/fedora-diveintopython.desktop + +%files single-html +%defattr(-,root,root,-) +%doc %{_docdir}/%{name}-%{version}/htmlflat + +%files txt +%defattr(-,root,root,-) +%doc %{_docdir}/%{name}-%{version}/txt + + +%changelog +* Tue Feb 5 2008 Marc Wiriadisastra - 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 - 5.4-11 +- Added xdg-utils Requires to open pdf and other files + +* Wed Jan 23 2008 Mohd Izhar Firdaus Ismail - 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 - 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 - 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 - 5.4-6 +- Fix ownership of folders +- Fix spec file for spaces and tabs again :( + +* Sun Jan 6 2008 Marc Wiriadisastra - 5.4-5 +- Fixed build requires - added iced-tea, python, w3m and htmldoc + +* Fri Jan 4 2008 Marc Wiriadisastra - 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 - 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 - 5.4-2 +- Fixed line encoding (Jerry James) +- Fixed owning of directories in spec file + +* Fri Nov 16 2007 Marc Wiriadisastra - 5.4-1 +- new install diff --git a/sources b/sources index e69de29..a0e777e 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +722affd8054d667d66764c3c48a6490b diveintopython-common-5.4.zip +3e1c9e3d00fc912cb298b062bdac9002 diveintopython-xml-5.4.zip