rpms/diveintopython/F-8 diveintopython-build.xml.patch, NONE, 1.1 diveintopython-html.desktop, NONE, 1.1 diveintopython-index.xml.patch, NONE, 1.1 diveintopython-pdf.desktop, NONE, 1.1 diveintopython-single-html.desktop, NONE, 1.1 diveintopython-txt.desktop, NONE, 1.1 diveintopython.png, NONE, 1.1 diveintopython.spec, NONE, 1.1 diveintopython.xml.patch, NONE, 1.1 make.sh.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Marc Wiriadisastra (mwiriadi)
fedora-extras-commits at redhat.com
Thu Jan 10 21:06:34 UTC 2008
- Previous message (by thread): rpms/diveintopython/devel diveintopython-build.xml.patch, NONE, 1.1 diveintopython-html.desktop, NONE, 1.1 diveintopython-index.xml.patch, NONE, 1.1 diveintopython-pdf.desktop, NONE, 1.1 diveintopython-single-html.desktop, NONE, 1.1 diveintopython-txt.desktop, NONE, 1.1 diveintopython.png, NONE, 1.1 diveintopython.spec, NONE, 1.1 diveintopython.xml.patch, NONE, 1.1 make.sh.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/jabbim/devel .cvsignore, 1.3, 1.4 jabbim.spec, 1.10, 1.11 sources, 1.10, 1.11 jabbim-svn.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mwiriadi
Update of /cvs/pkgs/rpms/diveintopython/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224/F-8
Modified Files:
.cvsignore sources
Added Files:
diveintopython-build.xml.patch diveintopython-html.desktop
diveintopython-index.xml.patch diveintopython-pdf.desktop
diveintopython-single-html.desktop diveintopython-txt.desktop
diveintopython.png diveintopython.spec
diveintopython.xml.patch make.sh.patch
Log Message:
diveintopython-build.xml.patch:
--- NEW FILE diveintopython-build.xml.patch ---
--- 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 @@
[
<!ENTITY % version SYSTEM "xml/version.xml">
%version;
-<!ENTITY common "../common">
-<!ENTITY buildcommon SYSTEM "../common/build_common.xml">
+<!ENTITY common "xml/common">
+<!ENTITY buildcommon SYSTEM "xml/common/build_common.xml">
]>
-<project name="diveintopython" default="html" basedir=".">
+<project name="diveintopython" default="all" basedir=".">
<property name="lang" value=""/>
<property name="ftpdir" value=""/>
--- NEW FILE diveintopython-html.desktop ---
[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;
diveintopython-index.xml.patch:
--- NEW FILE diveintopython-index.xml.patch ---
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-"../../common/docbook/dtd/docbookx.dtd"
+"common/docbook/dtd/docbookx.dtd"
[
<!--
"http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
--- NEW FILE diveintopython-pdf.desktop ---
[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;
--- NEW FILE diveintopython-single-html.desktop ---
[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;
--- NEW FILE diveintopython-txt.desktop ---
[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;
--- NEW FILE diveintopython.spec ---
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 <marc at mwiriadi.id.au> - 5.4-6
- Fix ownership of folders
- Fix spec file for spaces and tabs again :(
* Sun Jan 6 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> - 5.4-5
- Fixed build requires - added iced-tea, python, w3m and htmldoc
* Fri Jan 4 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> - 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 <marc at mwiriadi.id.au> - 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 <marc at mwiriadi.id.au> - 5.4-2
- Fixed line encoding (Jerry James)
- Fixed owning of directories in spec file
* Fri Nov 16 2007 Marc Wiriadisastra <marc at mwiriadi.id.au> - 5.4-1
- new install
diveintopython.xml.patch:
--- NEW FILE diveintopython.xml.patch ---
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-"../../common/docbook/dtd/docbookx.dtd"
+"common/docbook/dtd/docbookx.dtd"
[
<!ENTITY % entities SYSTEM "entities.xml">
%entities;
make.sh.patch:
--- NEW FILE make.sh.patch ---
--- 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/diveintopython/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 10 Jan 2008 16:38:51 -0000 1.1
+++ .cvsignore 10 Jan 2008 21:05:33 -0000 1.2
@@ -0,0 +1,2 @@
+diveintopython-common-5.4.zip
+diveintopython-xml-5.4.zip
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/diveintopython/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 10 Jan 2008 16:38:51 -0000 1.1
+++ sources 10 Jan 2008 21:05:33 -0000 1.2
@@ -0,0 +1,2 @@
+722affd8054d667d66764c3c48a6490b diveintopython-common-5.4.zip
+3e1c9e3d00fc912cb298b062bdac9002 diveintopython-xml-5.4.zip
- Previous message (by thread): rpms/diveintopython/devel diveintopython-build.xml.patch, NONE, 1.1 diveintopython-html.desktop, NONE, 1.1 diveintopython-index.xml.patch, NONE, 1.1 diveintopython-pdf.desktop, NONE, 1.1 diveintopython-single-html.desktop, NONE, 1.1 diveintopython-txt.desktop, NONE, 1.1 diveintopython.png, NONE, 1.1 diveintopython.spec, NONE, 1.1 diveintopython.xml.patch, NONE, 1.1 make.sh.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/jabbim/devel .cvsignore, 1.3, 1.4 jabbim.spec, 1.10, 1.11 sources, 1.10, 1.11 jabbim-svn.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list