From 8f1c0a24b7dfc86d86722e1992577ae31ba2de47 Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Thu, 10 Jan 2008 21:00:27 +0000 Subject: [PATCH 01/36] *** 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 5573ac212ee7fb854190af6c25468f36b574230c Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Sat, 19 Jan 2008 00:39:52 +0000 Subject: [PATCH 02/36] Fixed install of txt file Added image to pixmaps for diveintopython-txt --- diveintopython.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/diveintopython.spec b/diveintopython.spec index f02d86c..b3c7117 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Dive into Python - a python book @@ -107,8 +107,8 @@ 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 +install -m 0644 diveintopython.html $RPM_BUILD_ROOT%{_datadir}/diveintopython-txt/diveintopython.html +install -m 0644 diveintopython.txt $RPM_BUILD_ROOT%{_datadir}/diveintopython-txt/diveintopython.txt popd # HTML desktop file @@ -163,8 +163,13 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/diveintopython-txt/ %{_datadir}/diveintopython-txt/ %{_datadir}/applications/fedora-diveintopython-txt.desktop +%{_datadir}/pixmaps/diveintopython.png %changelog +* Sat Jan 19 2008 Marc Wiriadisastra - 5.4-7 +- Fixed spec file to install the txt version in the txt folder +- Added desktop file to txt version + * Wed Jan 9 2008 Marc Wiriadisastra - 5.4-6 - Fix ownership of folders - Fix spec file for spaces and tabs again :( From 5c3a2b5857f499378a786d8f8bf02d80c1784c3d Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Sat, 19 Jan 2008 01:00:29 +0000 Subject: [PATCH 03/36] 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) --- diveintopython-html.desktop | 2 +- diveintopython-pdf.desktop | 2 +- diveintopython-single-html.desktop | 2 +- diveintopython-txt.desktop | 2 +- diveintopython.spec | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/diveintopython-html.desktop b/diveintopython-html.desktop index b1e7751..29a663f 100644 --- a/diveintopython-html.desktop +++ b/diveintopython-html.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Name=Dive Into Python +Name=Dive Into Python - html Comment=Open Dive Into Python book Exec=xdg-open /usr/share/diveintopython-html/index.html Icon=diveintopython diff --git a/diveintopython-pdf.desktop b/diveintopython-pdf.desktop index 19d7a5b..3233dc8 100644 --- a/diveintopython-pdf.desktop +++ b/diveintopython-pdf.desktop @@ -1,6 +1,6 @@ [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-pdf/diveintopython.pdf Icon=diveintopython diff --git a/diveintopython-single-html.desktop b/diveintopython-single-html.desktop index 9c71e6c..954bc55 100644 --- a/diveintopython-single-html.desktop +++ b/diveintopython-single-html.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Name=Dive Into Python +Name=Dive Into Python - Single-html Comment=Open Dive Into Python book Exec=xdg-open /usr/share/diveintopython-single-html/diveintopython.html Icon=diveintopython diff --git a/diveintopython-txt.desktop b/diveintopython-txt.desktop index 64218cd..beb6482 100644 --- a/diveintopython-txt.desktop +++ b/diveintopython-txt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Name=Dive Into Python +Name=Dive Into Python - Text Comment=Open Dive Into Python book Exec=xdg-open /usr/share/diveintopython-txt/diveintopython.txt Icon=diveintopython diff --git a/diveintopython.spec b/diveintopython.spec index b3c7117..ce2ccd2 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -167,8 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sat Jan 19 2008 Marc Wiriadisastra - 5.4-7 -- Fixed spec file to install the txt version in the txt folder -- Added desktop file to txt version +- 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 From 0534c8773560abd195e3dab69570facac45b4324 Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Sat, 19 Jan 2008 13:08:30 +0000 Subject: [PATCH 04/36] - 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-html.desktop | 9 -- diveintopython-single-html.desktop | 9 -- diveintopython-txt.desktop | 9 -- ...thon-pdf.desktop => diveintopython.desktop | 2 +- diveintopython.spec | 112 +++++++----------- 5 files changed, 45 insertions(+), 96 deletions(-) delete mode 100644 diveintopython-html.desktop delete mode 100644 diveintopython-single-html.desktop delete mode 100644 diveintopython-txt.desktop rename diveintopython-pdf.desktop => diveintopython.desktop (74%) diff --git a/diveintopython-html.desktop b/diveintopython-html.desktop deleted file mode 100644 index 29a663f..0000000 --- a/diveintopython-html.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Dive Into Python - html -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-single-html.desktop b/diveintopython-single-html.desktop deleted file mode 100644 index 954bc55..0000000 --- a/diveintopython-single-html.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Dive Into Python - Single-html -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 beb6482..0000000 --- a/diveintopython-txt.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Dive Into Python - Text -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-pdf.desktop b/diveintopython.desktop similarity index 74% rename from diveintopython-pdf.desktop rename to diveintopython.desktop index 3233dc8..0580465 100644 --- a/diveintopython-pdf.desktop +++ b/diveintopython.desktop @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=Dive Into Python - pdf Comment=Open Dive Into Python book -Exec=xdg-open /usr/share/diveintopython-pdf/diveintopython.pdf +Exec=xdg-open /usr/share/doc/diveintopython/diveintopython.pdf Icon=diveintopython Terminal=false Type=Application diff --git a/diveintopython.spec b/diveintopython.spec index ce2ccd2..eced383 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 7%{?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-txt/diveintopython.html -install -m 0644 diveintopython.txt $RPM_BUILD_ROOT%{_datadir}/diveintopython-txt/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,30 +119,29 @@ 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 -%{_datadir}/pixmaps/diveintopython.png +%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 From 49d51e74b499d476f5db937f4de30d1b8b94d709 Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Thu, 24 Jan 2008 05:23:18 +0000 Subject: [PATCH 05/36] 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 2e3660e1dfb25e1afac2d96e31ea5236be6e7c1e Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Sat, 2 Feb 2008 07:31:32 +0000 Subject: [PATCH 06/36] 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 d44161f66935d0684101ca7ce817f9cf1fc14db7 Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Wed, 6 Feb 2008 09:54:07 +0000 Subject: [PATCH 07/36] - 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 cceb29bbcdd9273365c102c736e4cd4198b898e5 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 2 Sep 2008 11:39:55 +0000 Subject: [PATCH 08/36] - Include /usr/share/doc/diveintopython-5.4 directory (in all pkgs) No build-job. --- diveintopython.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 18c9d53..1c73180 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Dive into Python - a python book @@ -98,23 +98,30 @@ rm -rf $RPM_BUILD_ROOT %files html %defattr(-,root,root,-) +%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/html %files pdf %defattr(-,root,root,-) +%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/pdf %{_datadir}/applications/fedora-diveintopython.desktop %files single-html %defattr(-,root,root,-) +%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/htmlflat %files txt %defattr(-,root,root,-) +%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/txt %changelog +* Tue Sep 2 2008 Michael Schwendt - 5.4-13 +- Include /usr/share/doc/diveintopython-5.4 directory (in all pkgs) + * 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.... From ee7a54c1b4f95666980dce27953a0214d80013f7 Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Wed, 5 Nov 2008 12:29:04 +0000 Subject: [PATCH 09/36] Fix file location problem that breaks HTML version - thanks to Paul --- diveintopython.spec | 7 +++++-- import.log | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 import.log diff --git a/diveintopython.spec b/diveintopython.spec index 1c73180..3fc4afc 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Dive into Python - a python book @@ -76,7 +76,7 @@ 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}/ \; + find $DIR -type f -exec install -D -m 0644 '{}' $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/'{}' \; done popd @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 4 2008 Paul W. Frields - 5.4-14 +- Fix file location problem that breaks HTML version + * Tue Sep 2 2008 Michael Schwendt - 5.4-13 - Include /usr/share/doc/diveintopython-5.4 directory (in all pkgs) diff --git a/import.log b/import.log new file mode 100644 index 0000000..38d0855 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +diveintopython-5_4-14_fc10:HEAD:diveintopython-5.4-14.fc10.src.rpm:1225888077 From f46565878b2c972de8db072ddfd005d84cd743df Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 12:02:36 +0000 Subject: [PATCH 10/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 3fc4afc..82b0e11 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Dive into Python - a python book @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 5.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Nov 4 2008 Paul W. Frields - 5.4-14 - Fix file location problem that breaks HTML version From aa6db71189244e82287275e84ed1108db5b6388b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 20:20:07 +0000 Subject: [PATCH 11/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 82b0e11..487cde7 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Dive into Python - a python book @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 5.4-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Feb 24 2009 Fedora Release Engineering - 5.4-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cf6840a5082b78365cc650e78f6c568c4786f5f9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:12:01 +0000 Subject: [PATCH 12/36] 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 41116bc341e9fdb115ec19911914abc02c6b44d1 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 26 Nov 2009 17:27:10 +0000 Subject: [PATCH 13/36] - Newer saxon no longer supports XSLT 1.0, use Xalan-J instead --- diveintopython-xalan.patch | 190 +++++++++++++++++++++++++++++++++++++ diveintopython.spec | 13 ++- 2 files changed, 199 insertions(+), 4 deletions(-) create mode 100644 diveintopython-xalan.patch diff --git a/diveintopython-xalan.patch b/diveintopython-xalan.patch new file mode 100644 index 0000000..9122cd8 --- /dev/null +++ b/diveintopython-xalan.patch @@ -0,0 +1,190 @@ +From 00e7220d86517677f7e6b5bd2e8412da5ca8bb9f Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +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 @@ + + + ++ + + + +@@ -31,8 +32,53 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +- ++ + + + +@@ -140,22 +186,11 @@ + + + +- +- +- +- +- +- +- ++ + + + +- +- +- +- +- +- ++ + + + +@@ -168,13 +203,7 @@ + + + +- +- +- +- +- +- +- ++ + + + +@@ -201,12 +230,7 @@ + + + +- +- +- +- +- +- ++ + + + +@@ -220,12 +244,7 @@ + + + +- +- +- +- +- +- ++ + + + +@@ -247,12 +266,7 @@ + + + +- +- +- +- +- +- ++ + + + +@@ -275,12 +289,7 @@ + + + +- +- +- +- +- +- ++ + + + +@@ -305,12 +314,8 @@ + + + +- +- +- +- +- +- ++ + + + +-- +1.6.5.2 + diff --git a/diveintopython.spec b/diveintopython.spec index 487cde7..70ec8de 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Dive into Python - a python book @@ -16,9 +16,10 @@ 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, jakarta-commons-net, ant-commons-net, xerces-j2, xml-commons-apis -BuildRequires: python, w3m, java, saxon, ant-nodeps +BuildRequires: python, w3m, java, xalan-j2, ant-nodeps %description Dive Into Python is a Python book for experienced programmers. @@ -55,15 +56,16 @@ The text version %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' -exec rm -f {} ';' +find \( -name '*.jar' -o -name '*.py[co]' \) -delete %build pushd build #/bin/sh make.sh -ant +ant -Dxalan=1 popd %install @@ -119,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 25 2009 Lubomir Rintel - 5.4-17 +- Newer saxon no longer supports XSLT 1.0, use Xalan-J instead + * Fri Jul 24 2009 Fedora Release Engineering - 5.4-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 19241c4acb7cf7ef36ad445ec1448380217312ab Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 13 Jul 2010 09:15:47 +0000 Subject: [PATCH 14/36] - Fix xalan patch. --- diveintopython-xalan.patch | 2 +- diveintopython.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/diveintopython-xalan.patch b/diveintopython-xalan.patch index 9122cd8..5c3fd94 100644 --- a/diveintopython-xalan.patch +++ b/diveintopython-xalan.patch @@ -15,7 +15,7 @@ index 905cf49..7575449 100644 -+ ++ diff --git a/diveintopython.spec b/diveintopython.spec index 70ec8de..86d7081 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Dive into Python - a python book @@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 13 2010 Alexander Kurtakov 5.4-18 +- Fix xalan patch. + * Wed Nov 25 2009 Lubomir Rintel - 5.4-17 - Newer saxon no longer supports XSLT 1.0, use Xalan-J instead From f91bb03db74907630824c37fc6b8fdcf5ba7ce99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:04:03 +0000 Subject: [PATCH 15/36] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log 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/import.log b/import.log deleted file mode 100644 index 38d0855..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -diveintopython-5_4-14_fc10:HEAD:diveintopython-5.4-14.fc10.src.rpm:1225888077 From 08767718da7074ad5b04eeb388df39e6df24dc39 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 08:03:09 -0600 Subject: [PATCH 16/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 86d7081..221f4ee 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Dive into Python - a python book @@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 5.4-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Jul 13 2010 Alexander Kurtakov 5.4-18 - Fix xalan patch. From 28475114810febca3d439d10bed35cad05e8ef15 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 18:41:50 -0600 Subject: [PATCH 17/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 221f4ee..c0044e0 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Dive into Python - a python book @@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 5.4-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 5.4-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 89b2a3a56f819a542fb9987b1bb50c305e77f922 Mon Sep 17 00:00:00 2001 From: Devrim GUNDUZ Date: Thu, 26 Apr 2012 00:02:13 +0300 Subject: [PATCH 18/36] Fix URL, per #816351. --- diveintopython.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/diveintopython.spec b/diveintopython.spec index c0044e0..9b7d0a8 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,14 +1,14 @@ Name: diveintopython Version: 5.4 -Release: 20%{?dist} +Release: 21%{?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 +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 26 2012 Devrim Gunduz - 5.4-21 +- Fix URL, per #816351. + * Fri Jan 13 2012 Fedora Release Engineering - 5.4-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 41777b6ba17955727bde3da97af511890b5d92ba Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 15:47:37 -0500 Subject: [PATCH 19/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 9b7d0a8..5a59aa5 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Dive into Python - a python book @@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 5.4-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Apr 26 2012 Devrim Gunduz - 5.4-21 - Fix URL, per #816351. From 66e5951eb23b04d71ce1373ec0b66c3d1817e822 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 13:46:36 -0600 Subject: [PATCH 20/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 5a59aa5..c00753a 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Dive into Python - a python book @@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 5.4-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 5.4-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 7c1e0dfc99b29c47e132dfd93356383472236e87 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Fri, 22 Feb 2013 23:31:55 -0500 Subject: [PATCH 21/36] 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 --- diveintopython.desktop.in | 1 - diveintopython.spec | 23 ++++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/diveintopython.desktop.in b/diveintopython.desktop.in index 4ac4d5c..6e60ee4 100644 --- a/diveintopython.desktop.in +++ b/diveintopython.desktop.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=Dive Into Python Comment=Open Dive Into Python book Exec=xdg-open @DOCDIR@/pdf/diveintopython.pdf diff --git a/diveintopython.spec b/diveintopython.spec index c00753a..ef21d4f 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Dive into Python - a python book @@ -11,7 +11,6 @@ Source0: http://www.diveintopython.net/download/%{name}-common-%{version} Source1: http://www.diveintopython.net/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 @@ -69,7 +68,6 @@ ant -Dxalan=1 popd %install -rm -rf $RPM_BUILD_ROOT pushd build/dist #cleanup unnecessary duplicates rm -rf pdf/*.png pdf/*.html pdf/images/ @@ -86,41 +84,36 @@ popd 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 \ +desktop-file-install \ --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,-) %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/html %files pdf -%defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/pdf -%{_datadir}/applications/fedora-diveintopython.desktop +%{_datadir}/applications/diveintopython.desktop %files single-html -%defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/htmlflat %files txt -%defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/txt - %changelog +* Fri Feb 22 2013 Rahul Sundaram - 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 - 5.4-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From ce792bcbf8813dd5fc49f0ba5b02906c9af7240c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 02:20:19 -0500 Subject: [PATCH 22/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index ef21d4f..743921f 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Dive into Python - a python book @@ -109,6 +109,9 @@ desktop-file-install \ %doc %{_docdir}/%{name}-%{version}/txt %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 5.4-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 22 2013 Rahul Sundaram - 5.4-24 - remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 - clean up spec to follow current guidelines From c3381c2d650c719b11faed92ec051c5142778fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 12 Dec 2013 21:12:22 +0200 Subject: [PATCH 23/36] Install to %{_pkgdocdir} where available (#993724). - Fix ant(-nodeps) build dependency (#992130). --- diveintopython.spec | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/diveintopython.spec b/diveintopython.spec index 743921f..1089761 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,8 @@ +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + Name: diveintopython Version: 5.4 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Dive into Python - a python book @@ -17,8 +19,8 @@ Patch0: diveintopython-build.xml.patch Patch1: diveintopython-build_common.xml.patch Patch2: diveintopython-xalan.patch -BuildRequires: desktop-file-utils, htmldoc, ant, jakarta-commons-net, ant-commons-net, xerces-j2, xml-commons-apis -BuildRequires: python, w3m, java, xalan-j2, ant-nodeps +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. @@ -74,15 +76,15 @@ 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}/'{}' \; +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%{_docdir}/%{name}-%{version}/'{}' \; + 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@|%{_docdir}/%{name}-%{version}/|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/diveintopython.desktop +cat %{SOURCE2}|sed "s|@DOCDIR@|%{_pkgdocdir}/|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/diveintopython.desktop desktop-file-install \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -92,23 +94,27 @@ desktop-file-install \ %files %files html -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/html +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/html %files pdf -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/pdf +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/pdf %{_datadir}/applications/diveintopython.desktop %files single-html -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/htmlflat +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/htmlflat %files txt -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/txt +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/txt %changelog +* Thu Dec 12 2013 Ville Skyttä - 5.4-26 +- Install to %%{_pkgdocdir} where available (#993724). +- Fix ant(-nodeps) build dependency (#992130). + * Sat Aug 03 2013 Fedora Release Engineering - 5.4-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 64c1d239266219e1a5cd418bb500464eeb91db71 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 02:31:48 -0500 Subject: [PATCH 24/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 1089761..03a721f 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -2,7 +2,7 @@ Name: diveintopython Version: 5.4 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Dive into Python - a python book @@ -111,6 +111,9 @@ desktop-file-install \ %doc %{_pkgdocdir}/txt %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 5.4-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Dec 12 2013 Ville Skyttä - 5.4-26 - Install to %%{_pkgdocdir} where available (#993724). - Fix ant(-nodeps) build dependency (#992130). From ecb96938fc73330c28fb43cdd77a533f081980ae Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 04:08:25 +0000 Subject: [PATCH 25/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 03a721f..4bdb228 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -2,7 +2,7 @@ Name: diveintopython Version: 5.4 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Dive into Python - a python book @@ -111,6 +111,9 @@ desktop-file-install \ %doc %{_pkgdocdir}/txt %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 5.4-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 5.4-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 52f448afcb21e5bb9b357cba8e7303438bff94b1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 18:47:16 +0000 Subject: [PATCH 26/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 4bdb228..0b9594b 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -2,7 +2,7 @@ Name: diveintopython Version: 5.4 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Dive into Python - a python book @@ -111,6 +111,9 @@ desktop-file-install \ %doc %{_pkgdocdir}/txt %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 5.4-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 5.4-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 9444245449aac04d23d48f274eb6d50672984133 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 08:26:40 +0000 Subject: [PATCH 27/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 0b9594b..8623d06 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -2,7 +2,7 @@ Name: diveintopython Version: 5.4 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Dive into Python - a python book @@ -111,6 +111,9 @@ desktop-file-install \ %doc %{_pkgdocdir}/txt %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 5.4-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 5.4-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 5706289f67b143153d70e6fdcdde1519671931f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 06:17:16 +0000 Subject: [PATCH 28/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 8623d06..7a0fbbb 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -2,7 +2,7 @@ Name: diveintopython Version: 5.4 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Dive into Python - a python book @@ -111,6 +111,9 @@ desktop-file-install \ %doc %{_pkgdocdir}/txt %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 5.4-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 5.4-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From e43f7bd73b436194fa6e54ad10b988233e194d4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 06:56:59 +0000 Subject: [PATCH 29/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 7a0fbbb..895d3f0 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -2,7 +2,7 @@ Name: diveintopython Version: 5.4 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Dive into Python - a python book @@ -111,6 +111,9 @@ desktop-file-install \ %doc %{_pkgdocdir}/txt %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 5.4-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 5.4-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 8ba2f988219da8057131d3a9323d324a4207428f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=BCnd=C3=BCz?= Date: Fri, 16 Mar 2018 11:27:27 +0000 Subject: [PATCH 30/36] Update BR, per #1555699 --- diveintopython.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/diveintopython.spec b/diveintopython.spec index 895d3f0..4f6da15 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -2,7 +2,7 @@ Name: diveintopython Version: 5.4 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Dive into Python - a python book @@ -19,7 +19,7 @@ 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: desktop-file-utils, htmldoc, ant >= 1.8.2, xerces-j2, xml-commons-apis BuildRequires: python, w3m, java, xalan-j2 %description @@ -111,6 +111,9 @@ desktop-file-install \ %doc %{_pkgdocdir}/txt %changelog +* Fri Mar 16 2018 Devrim Gündüz - 5.4-33 +- Update BR, per #1555699 + * Wed Feb 07 2018 Fedora Release Engineering - 5.4-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e54fdbe85fa1cc1d997c717ff76e8f22777a3e43 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mon, 19 Mar 2018 12:57:00 +0100 Subject: [PATCH 31/36] Update Python 2 dependency declarations to new packaging standards --- diveintopython.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/diveintopython.spec b/diveintopython.spec index 4f6da15..602d083 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -2,7 +2,7 @@ Name: diveintopython Version: 5.4 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Dive into Python - a python book @@ -20,7 +20,7 @@ Patch1: diveintopython-build_common.xml.patch Patch2: diveintopython-xalan.patch BuildRequires: desktop-file-utils, htmldoc, ant >= 1.8.2, xerces-j2, xml-commons-apis -BuildRequires: python, w3m, java, xalan-j2 +BuildRequires: python2, w3m, java, xalan-j2 %description Dive Into Python is a Python book for experienced programmers. @@ -111,6 +111,10 @@ desktop-file-install \ %doc %{_pkgdocdir}/txt %changelog +* Mon Mar 19 2018 Iryna Shcherbina - 5.4-34 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Mar 16 2018 Devrim Gündüz - 5.4-33 - Update BR, per #1555699 From 180ea4bd1ba3e4b9ab389ef3e39dbcb1d3e751c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:56:18 +0000 Subject: [PATCH 32/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 602d083..4935965 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -2,7 +2,7 @@ Name: diveintopython Version: 5.4 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Dive into Python - a python book @@ -111,6 +111,9 @@ desktop-file-install \ %doc %{_pkgdocdir}/txt %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 5.4-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Mar 19 2018 Iryna Shcherbina - 5.4-34 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 3beb8ed618b94fb0dbef7d2bb6c42a950bbc9e31 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:42 +0100 Subject: [PATCH 33/36] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- diveintopython.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/diveintopython.spec b/diveintopython.spec index 4935965..4090601 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -6,7 +6,6 @@ Release: 35%{?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 @@ -27,28 +26,24 @@ 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 From 0331af1a2b3e8da171ada1611f6df70107756e62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 17:18:33 +0000 Subject: [PATCH 34/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index 4090601..da25fe8 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -2,7 +2,7 @@ Name: diveintopython Version: 5.4 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Dive into Python - a python book @@ -106,6 +106,9 @@ desktop-file-install \ %doc %{_pkgdocdir}/txt %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 5.4-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 5.4-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From aa5041003121f36694ba80fc47a04ce2947385eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 22:05:28 +0000 Subject: [PATCH 35/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diveintopython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diveintopython.spec b/diveintopython.spec index da25fe8..2550bd9 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -2,7 +2,7 @@ Name: diveintopython Version: 5.4 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Dive into Python - a python book @@ -106,6 +106,9 @@ desktop-file-install \ %doc %{_pkgdocdir}/txt %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 5.4-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 5.4-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6372a73a598534d23d4697b2e3908ad615ce3c8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Aug 2019 13:39:28 +0000 Subject: [PATCH 36/36] diveintopython fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674814 --- .gitignore | 2 - dead.package | 1 + diveintopython-build.xml.patch | 11 -- diveintopython-build_common.xml.patch | 13 -- diveintopython-xalan.patch | 190 -------------------- diveintopython.desktop.in | 8 - diveintopython.spec | 242 -------------------------- sources | 2 - 8 files changed, 1 insertion(+), 468 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 diveintopython-build.xml.patch delete mode 100644 diveintopython-build_common.xml.patch delete mode 100644 diveintopython-xalan.patch delete mode 100644 diveintopython.desktop.in delete mode 100644 diveintopython.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ab506a1..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -diveintopython-common-5.4.zip -diveintopython-xml-5.4.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..452d8fe --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +diveintopython fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674814 diff --git a/diveintopython-build.xml.patch b/diveintopython-build.xml.patch deleted file mode 100644 index e3da6f5..0000000 --- a/diveintopython-build.xml.patch +++ /dev/null @@ -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 @@ - - - ]> -- -+ - - - diff --git a/diveintopython-build_common.xml.patch b/diveintopython-build_common.xml.patch deleted file mode 100644 index 57ee0db..0000000 --- a/diveintopython-build_common.xml.patch +++ /dev/null @@ -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 @@ - - - -- -- -+ -+ - - - diff --git a/diveintopython-xalan.patch b/diveintopython-xalan.patch deleted file mode 100644 index 5c3fd94..0000000 --- a/diveintopython-xalan.patch +++ /dev/null @@ -1,190 +0,0 @@ -From 00e7220d86517677f7e6b5bd2e8412da5ca8bb9f Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -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 @@ - - - -+ - - - -@@ -31,8 +32,53 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -- -+ - - - -@@ -140,22 +186,11 @@ - - - -- -- -- -- -- -- -- -+ - - - -- -- -- -- -- -- -+ - - - -@@ -168,13 +203,7 @@ - - - -- -- -- -- -- -- -- -+ - - - -@@ -201,12 +230,7 @@ - - - -- -- -- -- -- -- -+ - - - -@@ -220,12 +244,7 @@ - - - -- -- -- -- -- -- -+ - - - -@@ -247,12 +266,7 @@ - - - -- -- -- -- -- -- -+ - - - -@@ -275,12 +289,7 @@ - - - -- -- -- -- -- -- -+ - - - -@@ -305,12 +314,8 @@ - - - -- -- -- -- -- -- -+ - - - --- -1.6.5.2 - diff --git a/diveintopython.desktop.in b/diveintopython.desktop.in deleted file mode 100644 index 6e60ee4..0000000 --- a/diveintopython.desktop.in +++ /dev/null @@ -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; diff --git a/diveintopython.spec b/diveintopython.spec deleted file mode 100644 index 2550bd9..0000000 --- a/diveintopython.spec +++ /dev/null @@ -1,242 +0,0 @@ -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - -Name: diveintopython -Version: 5.4 -Release: 37%{?dist} - -Summary: Dive into Python - a python book - -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, xerces-j2, xml-commons-apis -BuildRequires: python2, w3m, java, xalan-j2 - -%description -Dive Into Python is a Python book for experienced programmers. - -%package pdf -Summary: Dive into Python - a python book -%description pdf -Dive Into Python is a Python book for experienced programmers. -The PDF version - -%package html -Summary: Dive into Python - a python book -%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 -%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 -%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 -* Wed Jul 24 2019 Fedora Release Engineering - 5.4-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 5.4-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 5.4-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Mar 19 2018 Iryna Shcherbina - 5.4-34 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Mar 16 2018 Devrim Gündüz - 5.4-33 -- Update BR, per #1555699 - -* Wed Feb 07 2018 Fedora Release Engineering - 5.4-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 5.4-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 5.4-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 5.4-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 5.4-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 5.4-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Dec 12 2013 Ville Skyttä - 5.4-26 -- Install to %%{_pkgdocdir} where available (#993724). -- Fix ant(-nodeps) build dependency (#992130). - -* Sat Aug 03 2013 Fedora Release Engineering - 5.4-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 22 2013 Rahul Sundaram - 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 - 5.4-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 5.4-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Apr 26 2012 Devrim Gunduz - 5.4-21 -- Fix URL, per #816351. - -* Fri Jan 13 2012 Fedora Release Engineering - 5.4-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 5.4-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jul 13 2010 Alexander Kurtakov 5.4-18 -- Fix xalan patch. - -* Wed Nov 25 2009 Lubomir Rintel - 5.4-17 -- Newer saxon no longer supports XSLT 1.0, use Xalan-J instead - -* Fri Jul 24 2009 Fedora Release Engineering - 5.4-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Feb 24 2009 Fedora Release Engineering - 5.4-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Nov 4 2008 Paul W. Frields - 5.4-14 -- Fix file location problem that breaks HTML version - -* Tue Sep 2 2008 Michael Schwendt - 5.4-13 -- Include /usr/share/doc/diveintopython-5.4 directory (in all pkgs) - -* 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 deleted file mode 100644 index a0e777e..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -722affd8054d667d66764c3c48a6490b diveintopython-common-5.4.zip -3e1c9e3d00fc912cb298b062bdac9002 diveintopython-xml-5.4.zip