[egoboo-data] Include odt manuals from upstream svn
Bruno Wolff III
bruno at fedoraproject.org
Tue Mar 13 03:13:19 UTC 2012
commit 55ac97b12c7bfc1c9bfee47d3ac23cb2177d599e
Author: Bruno Wolff III <bruno at wolff.to>
Date: Mon Mar 12 21:44:47 2012 -0500
Include odt manuals from upstream svn
These were probably the sources of the PDF files that were in
the original tarball, but it is hard to say if the versions
match up. So these are a safer replacement.
.gitignore | 1 +
egoboo-data.spec | 18 ++++++++++++++----
sources | 1 +
3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 93c2ca8..d771a91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
egoboo-data-clean-2.7.5.tar.gz
/egoboo-clean-2.8.1.tar.gz
+/egoboo-doc.tar.gz
diff --git a/egoboo-data.spec b/egoboo-data.spec
index 3456ab8..2fab096 100644
--- a/egoboo-data.spec
+++ b/egoboo-data.spec
@@ -14,6 +14,10 @@ Source0: %{name}-clean-%{version}.tar.gz
# The following script is used to make a clean tarball
# Set the version in the script and then run it
Source1: generate-tarball.sh
+# The following was pulled from rev 1689 of the 2.8.x branch of upstream's
+# svn repo. It contains odt doc files, that we are using as replacment
+# for the pdf files included in the original 2.8.1 tarball.
+Source2: egoboo-doc.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ImageMagick
@@ -30,6 +34,7 @@ Data files for the Egoboo RPG.
%prep
%setup -q -n egoboo-%{version}
+%setup -T -D -a 2
%build
convert egoboo2.ico egoboo2.png
@@ -68,10 +73,12 @@ install -m 644 egoboo2-3.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/ap
# Doc files should go to the same place as the main package
mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/egoboo-%{version}
# Copy in docs replacing spaces with underlines
-install -m 644 doc/"Egoboo Development Guide.pdf" $RPM_BUILD_ROOT%{_datadir}/doc/egoboo-%{version}/Egoboo_Development_Guide.pdf
-install -m 644 doc/"Egoboo Player Manual.pdf" $RPM_BUILD_ROOT%{_datadir}/doc/egoboo-%{version}/Egoboo_Player_Manual.pdf
-install -m 644 doc/peoguide.pdf $RPM_BUILD_ROOT%{_datadir}/doc/egoboo-%{version}/peoguide.pdf
-install -m 644 doc/"Quickstart Guide.pdf" $RPM_BUILD_ROOT%{_datadir}/doc/egoboo-%{version}/Quickstart_Guide.pdf
+install -m 644 doc/"Egoboo Development Guide.odt" $RPM_BUILD_ROOT%{_datadir}/doc/egoboo-%{version}/Egoboo_Development_Guide.odt
+install -m 644 doc/"Egoboo Player Manual.odt" $RPM_BUILD_ROOT%{_datadir}/doc/egoboo-%{version}/Egoboo_Player_Manual.odt
+install -m 644 doc/peoguide.odt $RPM_BUILD_ROOT%{_datadir}/doc/egoboo-%{version}/peoguide.odt
+install -m 644 doc/"Quickstart Guide.odt" $RPM_BUILD_ROOT%{_datadir}/doc/egoboo-%{version}/Quickstart_Guide.odt
+install -m 644 doc/"Egomap Tutorial.odt" $RPM_BUILD_ROOT%{_datadir}/doc/egoboo-%{version}/Egomap_Tutorial.odt
+install -m 644 doc/"egoboo manual.odt" $RPM_BUILD_ROOT%{_datadir}/doc/egoboo-%{version}/egoboo_manual.odt
%post
@@ -97,6 +104,8 @@ fi
%doc %{_datadir}/doc/egoboo-%{version}/Egoboo_Player_Manual.pdf
%doc %{_datadir}/doc/egoboo-%{version}/peoguide.pdf
%doc %{_datadir}/doc/egoboo-%{version}/Quickstart_Guide.pdf
+%doc %{_datadir}/doc/egoboo-%{version}/Egomap_Tutorial.pdf
+%doc %{_datadir}/doc/egoboo-%{version}/egoboo_manual.pdf
%changelog
@@ -104,6 +113,7 @@ fi
- Update to upstream 2.8.1
- Use a cleaned tarball
- Replace included font files
+- Include odt doc files from upstream svn repo
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 3c7e0a5..78d6be1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+40e72021bdad567cc8a9529eb880a00f egoboo-doc.tar.gz
51f5d8d664ac41e6995df03e4f049b2f egoboo-clean-2.8.1.tar.gz
More information about the scm-commits
mailing list