[packages/nickle] - updated to 2.77 - added doc patch (docbook/sgml fixes), package pdf tutorial
qboosh
qboosh at pld-linux.org
Sat Nov 10 08:47:06 CET 2012
commit 377e311ba3091a2614bb084d4830ca4365dece33
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Nov 10 08:47:00 2012 +0100
- updated to 2.77
- added doc patch (docbook/sgml fixes), package pdf tutorial
nickle-doc.patch | 21 +++++++++++++++++++++
nickle.spec | 17 ++++++++++++++---
2 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/nickle.spec b/nickle.spec
index 8d10543..58c3170 100644
--- a/nickle.spec
+++ b/nickle.spec
@@ -1,17 +1,24 @@
Summary: Desk calculator language, similar to C
Summary(pl.UTF-8): Język kalkulatora biurkowego podobny do C
Name: nickle
-Version: 2.76
+Version: 2.77
Release: 1
License: MIT
Group: Development/Languages
Source0: http://nickle.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: c432569de6cfd6e2867c5f2804041a4c
+# Source0-md5: 22f9775f069be403d110c72c8e888a55
+Patch0: %{name}-doc.patch
URL: http://nickle.org/
BuildRequires: bison
+BuildRequires: docbook-dtd41-sgml
+BuildRequires: docbook-style-dsssl
+BuildRequires: docbook-utils
BuildRequires: flex
BuildRequires: ncurses-devel
BuildRequires: readline-devel
+# mathpazo/fplmr.tfm
+BuildRequires: texlive-fonts-other
+BuildRequires: texlive-latex
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -47,6 +54,7 @@ tekstowo, takich jak AWK czy PERL.
%prep
%setup -q
+%patch0 -p1
%build
%configure
@@ -61,12 +69,15 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_examplesdir}
mv -f $RPM_BUILD_ROOT%{_datadir}/nickle/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/nickle/nickle-tutorial.pdf
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README README.name TODO
+%doc AUTHORS COPYING ChangeLog NEWS README README.name TODO doc/tutorial/nickle-tutorial.pdf
%attr(755,root,root) %{_bindir}/nickle
%{_includedir}/nickle
%{_datadir}/nickle
diff --git a/nickle-doc.patch b/nickle-doc.patch
new file mode 100644
index 0000000..0e576bf
--- /dev/null
+++ b/nickle-doc.patch
@@ -0,0 +1,21 @@
+--- nickle-2.77/doc/tutorial/advanced/concurrency.sgml.orig 2012-11-05 06:42:49.000000000 +0100
++++ nickle-2.77/doc/tutorial/advanced/concurrency.sgml 2012-11-09 21:55:30.982986528 +0100
+@@ -222,6 +222,7 @@
+ <literal>wait</literal> merely decrements the count of <literal>s</literal>, which starts with the initial value specified by <literal>new</literal>.
+ If the count, after the decrement, is positive, the thread continues to run; if it is negative, it blocks until the count becomes positive again.
+ This will occur when one of the running threads calls <literal>signal</literal>, which increments the count of <literal>s</literal> and wakes up another thread if any are waiting.
++</para>
+ </sect3>
+
+ <sect3><title>Negative initial counts</title>
+--- nickle-2.77/doc/tutorial/intro/variables.sgml.orig 2012-11-05 06:42:49.000000000 +0100
++++ nickle-2.77/doc/tutorial/intro/variables.sgml 2012-11-09 21:54:48.236321654 +0100
+@@ -297,7 +297,7 @@
+ separate key from value. Eliding the key specifies the
+ "default" value -- used to instantiate newly created elements in the hash.
+ </para>
+-
++</sect3>
+ <sect3><title>Pointers</title>
+ <para>
+ Pointers hold a reference to a separate object; multiple pointers may point at the same object and changes to the referenced object are reflected both in the underlying object as well as in any other references to the same object.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nickle.git/commitdiff/377e311ba3091a2614bb084d4830ca4365dece33
More information about the pld-cvs-commit
mailing list