From 7280caa3d320aa107dac05ea2851ce340ee2247f Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Thu, 24 Jan 2008 05:20:06 +0000 Subject: [PATCH] Thanks to Mohd Izhar Firdaus Ismail for the following: - 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 --- diveintopython-build.xml.patch | 15 +-- diveintopython-index.xml.patch | 10 -- ...ython.desktop => diveintopython.desktop.in | 6 +- diveintopython.png | Bin 2487 -> 0 bytes diveintopython.spec | 119 ++++++++---------- diveintopython.xml.patch | 10 -- make.sh.patch | 6 - 7 files changed, 62 insertions(+), 104 deletions(-) delete mode 100644 diveintopython-index.xml.patch rename diveintopython.desktop => diveintopython.desktop.in (54%) delete mode 100644 diveintopython.png delete mode 100644 diveintopython.xml.patch delete mode 100644 make.sh.patch diff --git a/diveintopython-build.xml.patch b/diveintopython-build.xml.patch index 40259c3..e3da6f5 100644 --- a/diveintopython-build.xml.patch +++ b/diveintopython-build.xml.patch @@ -1,13 +1,8 @@ ---- diveintopython-5.4/build.xml 2002-07-28 16:27:46.000000000 +0800 -+++ build.xml 2008-01-04 01:00:53.000000000 +0900 -@@ -3,10 +3,10 @@ - [ - - %version; -- -- -+ -+ +--- 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-index.xml.patch b/diveintopython-index.xml.patch deleted file mode 100644 index 57b7b97..0000000 --- a/diveintopython-index.xml.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- diveintopython-5.4/xml/index.xml 2004-05-05 11:10:00.000000000 +0800 -+++ index.xml 2008-01-04 01:01:34.000000000 +0900 -@@ -1,6 +1,6 @@ - - @S8%G#4mZ?>8*0N1wc(}{I-Ss| z!cDnd3mN*R@iRRDM=Db970WdyL3B67Vt)ic@MZx3007uHH*f6#0002MEFnR2cXN}s z$o^}yy4~aB;r>4F`SbH&qA0Svno`=jY*|7VWnMSS{=} z*Czjb`fgGS+Dq754#^z+{IRF6ciI+ROrH7mYbhFeF7c`ortu|*&>v!qOGEgg9m(nNV zk4h_-1U@(R!R_DmSNTBL1|t{3w4m#(u7? zX55Ga`nt86aD5DhN}|3qaqA`=)x?!zEMuv%mUX?H1} zQ+pb*O4#qbUj@q3@u>CWL+15$BjtpHI{sltouHtJgui-> z7b%8$>)O$k&|V^Uw0arq9yT^MHn#05_FdKm)%zz$gdEvJO`I%sk#C5z5}E#F(I z@(O}x{v90G7o}mAGDXv^{w_29ih^c7#<&9|t6N{Xm$7>l{H%Kb0I)5d@9ggRwY7js zTtF;E3Mq4Z!mUG-SLnC>_WS$ot!1Xe{k^U@awS3Y^KdZJ$xv{W6mze$MoazkkN;a$Wp#yeZN7 z?m<-ytte>9W%9G3*1G;qQnai@0#V8}46Ezyb{rlEe=^3PmDjPJXss0NzKT^n7XSdZ z%gGaS^&>bg>*&e-4B;NZ@48cDs$V|RoPFs^!LI(+p;Alf1eZ?6wFEivoulg4loGC| z%C_oaEu9><+RtQ)iaSvU)y#o z=-ZxhfM!KOv;3b^v(YrdrAKGJM6KVuHWRH5s*E;Q=j#D2hsVO7j4^WPb*yWJdKu?| zKLiZ`z>eY0z9y3?Qw7ag^#hlJpaB5bG2GeLWF}?0A*bLQ?BJ-*B419|DlA{B0sw%m zgP>WH0YQ^r>C&;b^1W^dqLY7fFPEtqZQkl^YXAV)GzgkC84xsjO5V!Jun;8j#$0u_ zH2?r?n*RU*0RR8&ow0QrF${)h@h)D$D|n6@A*I`tN}19#q;#8E6vTM?gMc7;r@Q1? z*7rRZCmJAePyvV}ND`VOIV7QB_smXumD{)%0N@itLUSZnBs6h}_sBIQ+=c4Q8AcfSI#6f0002{$O(-;`mBjAKu)tb z67xBmSUjRznRMERs!RMVkXUBY?xO9f+bHdA07=*nPm`DrrxVru+92yk$8~~wSmV-o zBuw-V006)qx(SU(CW~0-%SF(NRZ;BQ)01Zm7MRbM2_BPo75gYjd$#OHl4&@99;jQ; zO|v)>_Q>tRYV?QLgPH2x`muGTdKyc%4TRHs$#3o!Uq>s|%?xk!hccl_HYf8+ca_~H zMYGD27-f6$b<}9@62IK3z#5l&qHNF6KL7v#JE@nP{7Oj08~-&QgJ06pv%-~MwH*Ut zN)beC8K}3WyRbTOVN+DGu06y-lL4iAncIzpQ@5qH-gF)aRw{e4P;h01l+s6r64+_VuPVIF--q8^xwRTgCY2?OF#(s~%;yNxhfQ zOohkRu2&zsrDxuzui*T?5qo*xDb>!V+OunDHsYFno2k#e_+H=5<`))T*kS&gN7FYr%=$C72EHoNHhq1G+Q z<|MXt4^8UajL~e?nlE=Mu*RiYzKk<}0000x86`COiLa>R!L_XbiqE||m-e}A8LKDr zVm*=enWicy-wfn|b_o?jt$I6_K2C*852%W#R987t%qr5*$>vsUW${!})W70J@BInQ z8kbrg<1>H$O;P0p004(Dn()^K+grb2sFxCbWUjV(xzwgnMg#x=_d_>iYHsEeY}>r6 zgy!vZ(iS2PdI11{JK@H{JOBUyK+7)x009600{|~7_Mu4-X`BE6002ovPDHLkV1lH^ BzJLG# diff --git a/diveintopython.spec b/diveintopython.spec index eced383..e1dd12c 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,33 +1,39 @@ Name: diveintopython Version: 5.4 -Release: 8%{?dist} +Release: 10%{?dist} Summary: Dive into Python - a python book Group: Documentation License: GFDL URL: http://www.diveintopython.org -Source0: http://www.diveintopython.org/download/%{name}-xml-%{version}.zip -Source1: %{name}.png -Source2: http://www.diveintopython.org/download/%{name}-common-%{version}.zip -Source3: %{name}.desktop -Patch0: make.sh.patch -Patch1: diveintopython.xml.patch -Patch2: diveintopython-build.xml.patch -Patch3: diveintopython-index.xml.patch +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 +Patch0: diveintopython-build.xml.patch -BuildRequires: desktop-file-utils, ant, htmldoc, python, w3m +BuildRequires: desktop-file-utils, htmldoc, +BuildRequires: python, w3m %if 0%{?fedora} >= 8 -BuildRequires: java-1.7.0-icedtea-devel +BuildRequires: java-1.7.0-icedtea %else -BuildRequires: java-1.5.0-gcj-devel +BuildRequires: java-1.5.0-gcj %endif %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 @@ -50,93 +56,76 @@ Dive Into Python is a Python book for experienced programmers. The text version %prep -%setup -q -a 2 html -mv %{name}-%{version}/common xml/ -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -rm -f make.bat +%setup -q -b 1 +%patch0 -p1 -b .build-all +mkdir build +mv xml make.sh build.xml build/ %build +pushd build /bin/sh make.sh +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 -m 0644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/diveintopython.png -# Install html version -mkdir -p $RPM_BUILD_ROOT%{_docdir}/diveintopython-html -pushd dist/html/ -find . -type d -exec mkdir -p $RPM_BUILD_ROOT%{_docdir}/diveintopython-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}/diveintopython-html/${DIR}/ \; + find $DIR -type f -exec install -m 0644 '{}' $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/${DIR}/ \; done -install -m 0644 diveintopython.css $RPM_BUILD_ROOT%{_docdir}/diveintopython-html/diveintopython.css -install -m 0644 history.xml $RPM_BUILD_ROOT%{_docdir}/diveintopython-html/history.xml -install -m 0644 index.html $RPM_BUILD_ROOT%{_docdir}/diveintopython-html/index.html popd -# Install pdf version -pushd dist/pdf/ -mkdir -p $RPM_BUILD_ROOT%{_docdir}/diveintopython -find . -type d -exec mkdir -p $RPM_BUILD_ROOT%{_docdir}/diveintopython/'{}' \; -for DIR in * ; do - find $DIR -type f -exec install -m 0644 '{}' $RPM_BUILD_ROOT%{_docdir}/diveintopython/${DIR}/ \; -done -install -m 0644 diveintopython.html $RPM_BUILD_ROOT%{_docdir}/diveintopython/diveintopython.html -install -m 0644 diveintopython.pdf $RPM_BUILD_ROOT%{_docdir}/diveintopython/diveintopython.pdf -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 -# Install single html page -pushd dist/htmlflat/ -mkdir -p $RPM_BUILD_ROOT%{_docdir}/diveintopython-single-html -find . -type d -exec mkdir -p $RPM_BUILD_ROOT%{_docdir}/diveintopython-single-html/'{}' \; -for DIR in * ; do - find $DIR -type f -exec install -m 0644 '{}' $RPM_BUILD_ROOT%{_docdir}/diveintopython-single-html/${DIR}/ \; -done -install -m 0644 diveintopython.html $RPM_BUILD_ROOT%{_docdir}/diveintopython-single-html/diveintopython.html -install -m 0644 diveintopython.css $RPM_BUILD_ROOT%{_docdir}/diveintopython-single-html/diveintopython.css -popd - -# Install text version -pushd dist/txt/ -mkdir -p $RPM_BUILD_ROOT%{_docdir}/diveintopython-txt -install -m 0644 diveintopython.html $RPM_BUILD_ROOT%{_docdir}/diveintopython-txt/diveintopython.html -install -m 0644 diveintopython.txt $RPM_BUILD_ROOT%{_docdir}/diveintopython-txt/diveintopython.txt -popd - -# pdf desktop file desktop-file-install --vendor="fedora" \ + --delete-original \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category="Documentation" \ - %{SOURCE3} - + ${RPM_BUILD_ROOT}%{_datadir}/applications/diveintopython.desktop %clean rm -rf $RPM_BUILD_ROOT +%files +%defattr(-,root,root,-) %files html %defattr(-,root,root,-) -%doc %{_docdir}/diveintopython-html/ +%doc %{_docdir}/%{name}-%{version}/html -%files +%files pdf %defattr(-,root,root,-) -%doc %{_docdir}/diveintopython/ +%doc %{_docdir}/%{name}-%{version}/pdf %{_datadir}/applications/fedora-diveintopython.desktop -%{_datadir}/pixmaps/diveintopython.png %files single-html %defattr(-,root,root,-) -%doc %{_docdir}/diveintopython-single-html/ +%doc %{_docdir}/%{name}-%{version}/htmlflat %files txt %defattr(-,root,root,-) -%doc %{_docdir}/diveintopython-txt/ +%doc %{_docdir}/%{name}-%{version}/txt %changelog +* 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 diff --git a/diveintopython.xml.patch b/diveintopython.xml.patch deleted file mode 100644 index 0cbafc4..0000000 --- a/diveintopython.xml.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- diveintopython-5.4/xml/diveintopython.xml 2004-05-05 17:24:52.000000000 +0800 -+++ diveintopython.xml 2008-01-02 18:01:08.000000000 +0900 -@@ -1,6 +1,6 @@ - - - %entities; diff --git a/make.sh.patch b/make.sh.patch deleted file mode 100644 index c4985a1..0000000 --- a/make.sh.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- diveintopython-5.4/make.sh 2002-02-21 13:45:50.000000000 +0800 -+++ make.sh 2008-01-02 17:58:58.000000000 +0900 -@@ -1,2 +1,2 @@ - #! /bin/sh --java -classpath "../common/lib/ant.jar:../common/lib/optional.jar:../common/lib/NetComponents.jar:../common/lib/jaxp.jar:../common/lib/crimson.jar" org.apache.tools.ant.Main $1 $2 $3 $4 $5 $6 $7 $8 $9 -+java -classpath "xml/common/lib/ant.jar:xml/common/lib/optional.jar:xml/common/lib/NetComponents.jar:xml/common/lib/jaxp.jar:xml/common/lib/crimson.jar" org.apache.tools.ant.Main $1 $2 $3 $4 $5 $6 $7 $8 $9