From 25004c448a2380aebb8bed1c6e239eb482776595 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 10 Jan 2008 16:39:13 +0000 Subject: [PATCH 1/8] Initialize branch F-7 for diveintopython --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 06074665d3c06fb3bee2648a33d043877d22b452 Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Thu, 10 Jan 2008 21:10:37 +0000 Subject: [PATCH 2/8] *** 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 From 4b770e6d9e9d1cffcfce5298d1ad966b0107bee8 Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Sat, 19 Jan 2008 13:14:01 +0000 Subject: [PATCH 3/8] - Removed multiple desktop-files - Made the default version the pdf version - Added build requires check so it can build on F7 - Fixed spec file so html works now --- diveintopython-pdf.desktop | 9 -- diveintopython-single-html.desktop | 9 -- diveintopython-txt.desktop | 9 -- ...hon-html.desktop => diveintopython.desktop | 4 +- diveintopython.spec | 116 ++++++++---------- 5 files changed, 51 insertions(+), 96 deletions(-) delete mode 100644 diveintopython-pdf.desktop delete mode 100644 diveintopython-single-html.desktop delete mode 100644 diveintopython-txt.desktop rename diveintopython-html.desktop => diveintopython.desktop (62%) diff --git a/diveintopython-pdf.desktop b/diveintopython-pdf.desktop deleted file mode 100644 index 19d7a5b..0000000 --- a/diveintopython-pdf.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Dive Into Python -Comment=Open Dive Into Python book -Exec=xdg-open /usr/share/diveintopython-pdf/diveintopython.pdf -Icon=diveintopython -Terminal=false -Type=Application -Categories=Application;Development; diff --git a/diveintopython-single-html.desktop b/diveintopython-single-html.desktop deleted file mode 100644 index 9c71e6c..0000000 --- a/diveintopython-single-html.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Dive Into Python -Comment=Open Dive Into Python book -Exec=xdg-open /usr/share/diveintopython-single-html/diveintopython.html -Icon=diveintopython -Terminal=false -Type=Application -Categories=Application;Development; diff --git a/diveintopython-txt.desktop b/diveintopython-txt.desktop deleted file mode 100644 index 64218cd..0000000 --- a/diveintopython-txt.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Dive Into Python -Comment=Open Dive Into Python book -Exec=xdg-open /usr/share/diveintopython-txt/diveintopython.txt -Icon=diveintopython -Terminal=false -Type=Application -Categories=Application;Development; diff --git a/diveintopython-html.desktop b/diveintopython.desktop similarity index 62% rename from diveintopython-html.desktop rename to diveintopython.desktop index b1e7751..0580465 100644 --- a/diveintopython-html.desktop +++ b/diveintopython.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 -Name=Dive Into Python +Name=Dive Into Python - pdf Comment=Open Dive Into Python book -Exec=xdg-open /usr/share/diveintopython-html/index.html +Exec=xdg-open /usr/share/doc/diveintopython/diveintopython.pdf Icon=diveintopython Terminal=false Type=Application diff --git a/diveintopython.spec b/diveintopython.spec index f02d86c..eced383 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 6%{?dist} +Release: 8%{?dist} Summary: Dive into Python - a python book @@ -8,12 +8,9 @@ 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 +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 @@ -21,7 +18,12 @@ 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 +BuildRequires: desktop-file-utils, ant, htmldoc, python, w3m +%if 0%{?fedora} >= 8 +BuildRequires: java-1.7.0-icedtea-devel +%else +BuildRequires: java-1.5.0-gcj-devel +%endif %description Dive Into Python is a Python book for experienced programmers. @@ -33,13 +35,6 @@ Group: Documentation 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 @@ -55,7 +50,7 @@ Dive Into Python is a Python book for experienced programmers. The text version %prep -%setup -q -a 3 html +%setup -q -a 2 html mv %{name}-%{version}/common xml/ %patch0 -p1 %patch1 -p1 @@ -69,71 +64,53 @@ rm -f make.bat %install rm -rf $RPM_BUILD_ROOT -install -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/diveintopython.png +install -m 0644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/diveintopython.png # Install html version -install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/diveintopython-html +mkdir -p $RPM_BUILD_ROOT%{_docdir}/diveintopython-html pushd dist/html/ +find . -type d -exec mkdir -p $RPM_BUILD_ROOT%{_docdir}/diveintopython-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}/ \; + find $DIR -type f -exec install -m 0644 '{}' $RPM_BUILD_ROOT%{_docdir}/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 +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/ -install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/diveintopython-pdf +mkdir -p $RPM_BUILD_ROOT%{_docdir}/diveintopython +find . -type d -exec mkdir -p $RPM_BUILD_ROOT%{_docdir}/diveintopython/'{}' \; 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}/ \; + find $DIR -type f -exec install -m 0644 '{}' $RPM_BUILD_ROOT%{_docdir}/diveintopython/${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 +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 single html page pushd dist/htmlflat/ -install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/diveintopython-single-html +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 - 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}/ \; + 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%{_datadir}/diveintopython-single-html/diveintopython.html -install -m 0644 diveintopython.css $RPM_BUILD_ROOT%{_datadir}/diveintopython-single-html/diveintopython.css +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/ -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 +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 -# 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} + %{SOURCE3} %clean @@ -142,29 +119,34 @@ rm -rf $RPM_BUILD_ROOT %files html %defattr(-,root,root,-) -%doc %{_datadir}/diveintopython-html/ -%{_datadir}/applications/fedora-diveintopython-html.desktop -%{_datadir}/pixmaps/diveintopython.png +%doc %{_docdir}/diveintopython-html/ -%files pdf +%files %defattr(-,root,root,-) -%doc %{_datadir}/diveintopython-pdf/ -%{_datadir}/applications/fedora-diveintopython-pdf.desktop +%doc %{_docdir}/diveintopython/ +%{_datadir}/applications/fedora-diveintopython.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 +%doc %{_docdir}/diveintopython-single-html/ %files txt %defattr(-,root,root,-) -%doc %{_datadir}/diveintopython-txt/ -%{_datadir}/diveintopython-txt/ -%{_datadir}/applications/fedora-diveintopython-txt.desktop +%doc %{_docdir}/diveintopython-txt/ + %changelog +* 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 :( From 7280caa3d320aa107dac05ea2851ce340ee2247f Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Thu, 24 Jan 2008 05:20:06 +0000 Subject: [PATCH 4/8] 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 From 665f3fd6312096822163ac891809701646b197fe Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Sat, 2 Feb 2008 07:36:01 +0000 Subject: [PATCH 5/8] Added xdg-utils --- diveintopython.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/diveintopython.spec b/diveintopython.spec index e1dd12c..9d62ced 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Dive into Python - a python book @@ -13,7 +13,7 @@ Source2: %{name}.desktop.in BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: diveintopython-pdf +Requires: diveintopython-pdf, xdg-utils Patch0: diveintopython-build.xml.patch BuildRequires: desktop-file-utils, htmldoc, @@ -115,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 2 2008 Marc Wiriadisastra - 5.4-10 - Major cleanup of spec to be less complex - Made the packaging less diverted from the generated tree from upstream build script From 5784c797aae8c8dad5073f0282b485a463d84bda Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Wed, 6 Feb 2008 09:57:45 +0000 Subject: [PATCH 6/8] - 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 | 13 ++++++++++++ diveintopython.spec | 29 ++++++++++++++++++--------- 2 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 diveintopython-build_common.xml.patch 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.spec b/diveintopython.spec index 9d62ced..18c9d53 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -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 @@ 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, -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 @@ 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 +#/bin/sh make.sh +ant popd %install @@ -115,7 +115,16 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Feb 2 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 From d5389834d3b41ba4fbdadef3cfcfb069842c1eb1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:23:14 +0000 Subject: [PATCH 7/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 427eb90..316d8b4 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: diveintopython -# $Id$ +# $Id: Makefile,v 1.1 2008/01/10 16:38:51 kevin Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 1c51d77ff39ccd2fe6c677fea578a064ab2f30e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:03:58 +0000 Subject: [PATCH 8/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 316d8b4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: diveintopython -# $Id: Makefile,v 1.1 2008/01/10 16:38:51 kevin Exp $ -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 $$d/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/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7