From 5c54ec0c34f4bedaf70797cd7d3e1adbbc63ce06 Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Thu, 10 Jan 2008 21:05:33 +0000 Subject: [PATCH] *** empty log message *** --- .cvsignore | 2 + diveintopython-build.xml.patch | 16 +++ diveintopython-html.desktop | 9 ++ diveintopython-index.xml.patch | 10 ++ diveintopython-pdf.desktop | 9 ++ diveintopython-single-html.desktop | 9 ++ diveintopython-txt.desktop | 9 ++ diveintopython.png | Bin 0 -> 2487 bytes diveintopython.spec | 189 +++++++++++++++++++++++++++++ diveintopython.xml.patch | 10 ++ make.sh.patch | 6 + sources | 2 + 12 files changed, 271 insertions(+) create mode 100644 diveintopython-build.xml.patch create mode 100644 diveintopython-html.desktop create mode 100644 diveintopython-index.xml.patch create mode 100644 diveintopython-pdf.desktop create mode 100644 diveintopython-single-html.desktop create mode 100644 diveintopython-txt.desktop create mode 100644 diveintopython.png create mode 100644 diveintopython.spec create mode 100644 diveintopython.xml.patch create mode 100644 make.sh.patch diff --git a/.cvsignore b/.cvsignore index e69de29..ab506a1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +diveintopython-common-5.4.zip +diveintopython-xml-5.4.zip diff --git a/diveintopython-build.xml.patch b/diveintopython-build.xml.patch new file mode 100644 index 0000000..40259c3 --- /dev/null +++ b/diveintopython-build.xml.patch @@ -0,0 +1,16 @@ +--- 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; +- +- ++ ++ + ]> +- ++ + + + diff --git a/diveintopython-html.desktop b/diveintopython-html.desktop new file mode 100644 index 0000000..b1e7751 --- /dev/null +++ b/diveintopython-html.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Dive Into Python +Comment=Open Dive Into Python book +Exec=xdg-open /usr/share/diveintopython-html/index.html +Icon=diveintopython +Terminal=false +Type=Application +Categories=Application;Development; diff --git a/diveintopython-index.xml.patch b/diveintopython-index.xml.patch new file mode 100644 index 0000000..57b7b97 --- /dev/null +++ b/diveintopython-index.xml.patch @@ -0,0 +1,10 @@ +--- 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# literal 0 HcmV?d00001 diff --git a/diveintopython.spec b/diveintopython.spec new file mode 100644 index 0000000..f02d86c --- /dev/null +++ b/diveintopython.spec @@ -0,0 +1,189 @@ +Name: diveintopython +Version: 5.4 +Release: 6%{?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}-html.desktop +Source2: %{name}.png +Source3: http://www.diveintopython.org/download/%{name}-common-%{version}.zip +Source4: %{name}-pdf.desktop +Source5: %{name}-txt.desktop +Source6: %{name}-single-html.desktop +Patch0: make.sh.patch +Patch1: diveintopython.xml.patch +Patch2: diveintopython-build.xml.patch +Patch3: diveintopython-index.xml.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +BuildRequires: desktop-file-utils, ant, htmldoc, java-1.7.0-icedtea-devel, python, w3m + +%description +Dive Into Python is a Python book for experienced programmers. + +%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 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 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 -a 3 html +mv %{name}-%{version}/common xml/ +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +rm -f make.bat + +%build +/bin/sh make.sh + +%install +rm -rf $RPM_BUILD_ROOT + +install -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/diveintopython.png +# Install html version +install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/diveintopython-html +pushd dist/html/ +for DIR in * ; do + install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/diveintopython-html/${DIR} + find $DIR -type f -exec install -m 0644 '{}' $RPM_BUILD_ROOT%{_datadir}/diveintopython-html/${DIR}/ \; +done +install -m 0644 diveintopython.css $RPM_BUILD_ROOT%{_datadir}/diveintopython-html/diveintopython.css +install -m 0644 history.xml $RPM_BUILD_ROOT%{_datadir}/diveintopython-html/history.xml +install -m 0644 index.html $RPM_BUILD_ROOT%{_datadir}/diveintopython-html/index.html +popd + +# Install pdf version +pushd dist/pdf/ +install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/diveintopython-pdf +for DIR in * ; do + install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/diveintopython-pdf/${DIR} + find $DIR -type f -exec install -m 0644 '{}' $RPM_BUILD_ROOT%{_datadir}/diveintopython-pdf/${DIR}/ \; +done +install -m 0644 diveintopython.html $RPM_BUILD_ROOT%{_datadir}/diveintopython-pdf/diveintopython.html +install -m 0644 diveintopython.pdf $RPM_BUILD_ROOT%{_datadir}/diveintopython-pdf/diveintopython.pdf +popd + +# Install single html page +pushd dist/htmlflat/ +install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/diveintopython-single-html +for DIR in * ; do + install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/diveintopython-single-html/${DIR} + find $DIR -type f -exec install -m 0644 '{}' $RPM_BUILD_ROOT%{_datadir}/diveintopython-single-html/${DIR}/ \; +done +install -m 0644 diveintopython.html $RPM_BUILD_ROOT%{_datadir}/diveintopython-single-html/diveintopython.html +install -m 0644 diveintopython.css $RPM_BUILD_ROOT%{_datadir}/diveintopython-single-html/diveintopython.css +popd + +# Install text version +pushd dist/txt/ +install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/diveintopython-txt +install -m 0644 diveintopython.html $RPM_BUILD_ROOT%{_datadir}/diveintopython-single-html/diveintopython.html +install -m 0644 diveintopython.txt $RPM_BUILD_ROOT%{_datadir}/diveintopython-single-html/diveintopython.txt +popd + +# HTML desktop file +desktop-file-install --vendor="fedora" \ + --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category="Documentation" \ + %{SOURCE1} + +# txt desktop file +desktop-file-install --vendor="fedora" \ + --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category="Documentation" \ + %{SOURCE5} + +# pdf desktop file +desktop-file-install --vendor="fedora" \ + --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category="Documentation" \ + %{SOURCE4} + +# single-html desktop file +desktop-file-install --vendor="fedora" \ + --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category="Documentation" \ + %{SOURCE6} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files html +%defattr(-,root,root,-) +%doc %{_datadir}/diveintopython-html/ +%{_datadir}/applications/fedora-diveintopython-html.desktop +%{_datadir}/pixmaps/diveintopython.png + +%files pdf +%defattr(-,root,root,-) +%doc %{_datadir}/diveintopython-pdf/ +%{_datadir}/applications/fedora-diveintopython-pdf.desktop +%{_datadir}/pixmaps/diveintopython.png + +%files single-html +%defattr(-,root,root,-) +%doc %{_datadir}/diveintopython-single-html/ +%{_datadir}/applications/fedora-diveintopython-single-html.desktop +%{_datadir}/pixmaps/diveintopython.png + +%files txt +%defattr(-,root,root,-) +%doc %{_datadir}/diveintopython-txt/ +%{_datadir}/diveintopython-txt/ +%{_datadir}/applications/fedora-diveintopython-txt.desktop + +%changelog +* 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/diveintopython.xml.patch b/diveintopython.xml.patch new file mode 100644 index 0000000..0cbafc4 --- /dev/null +++ b/diveintopython.xml.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 0000000..c4985a1 --- /dev/null +++ b/make.sh.patch @@ -0,0 +1,6 @@ +--- 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 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