[tex-zfuzz] New upstream version. Drop upstreamed ctype and read-decl patches. Drop unnecessary spec file elemen

Thu Jun 23 18:53:33 UTC 2011

commit 74f8ecca7972fde29a5b042bfed9e7e7f60b52d1
Author: Jerry James <loganjerry at gmail.com>
Date:   Thu Jun 23 12:52:54 2011 -0600

    New upstream version.
    Drop upstreamed ctype and read-decl patches.
    Drop unnecessary spec file elements (BuildRoot, etc.).
    Add the zscan patch to eliminate compiler errors and warnings.

 .gitignore                         |    2 +-
 sources                            |    2 +-
 tex-zfuzz-20070911-ctype.patch     |   10 ----
 tex-zfuzz-20070911-read-decl.patch |   13 -----
 tex-zfuzz-3.4.1-zscan.patch        |   21 ++++++++
 tex-zfuzz.spec                     |   89 ++++++++++++++++-------------------
 6 files changed, 64 insertions(+), 73 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 72e7ad2..0438146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-fuzz-2007-09-11.tar.gz
 fuzzman-2up.pdf
 fuzzman.pdf
 refcard-2up.pdf
 refcard-3up.pdf
 refcard.pdf
+/fuzz-3.4.1.tgz
diff --git a/sources b/sources
index 7810a90..2fc13c8 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-9f021c0e68f8f4616095f57ff2192c6f  fuzz-2007-09-11.tar.gz
+abb703a693e024aa2aa8b27abafeeded  fuzz-3.4.1.tgz
 4e4d00d8571b14919f95f041a927f71b  fuzzman-2up.pdf
 e3eb1467804bf4bf5b8dcf8eed773c69  fuzzman.pdf
 c3145cea9c6f16fb02e068fd1ea669a9  refcard-2up.pdf
diff --git a/tex-zfuzz-3.4.1-zscan.patch b/tex-zfuzz-3.4.1-zscan.patch
new file mode 100644
index 0000000..5786802
--- /dev/null
+++ b/tex-zfuzz-3.4.1-zscan.patch
@@ -0,0 +1,21 @@
+--- src/zscan.l.orig	2008-10-27 02:45:39.000000000 -0600
++++ src/zscan.l	2011-06-22 16:49:37.566390666 -0600
+@@ -77,6 +77,9 @@
+ PUBLIC int yywrap(void) { return 1; }
+ %}
+ 
++%option noinput
++%option nounput
++
+ %START				PROSE MATH COMMENT SKIP
+ 
+ name				[A-Za-z]([A-Za-z0-9]|\\_)*
+@@ -288,8 +291,6 @@
+      }
+ }
+ 
+-EXTERN char *strncpy();
+-
+ /* get_string -- save a $"..." string */
+ PRIVATE void get_string(int length)
+ {
diff --git a/tex-zfuzz.spec b/tex-zfuzz.spec
index 17326f0..312581e 100644
--- a/tex-zfuzz.spec
+++ b/tex-zfuzz.spec
@@ -1,24 +1,24 @@
-%define version_date 2007-09-11
-
 Name:		tex-zfuzz
-Version:	0
-Release:	0.20070914.3%{?dist}
+Version:	3.4.1
+Release:	1%{?dist}
 Summary:	Type-checker and LaTeX style for Z spec language
 Group:		Applications/Engineering
 License:	BSD
 URL:		http://spivey.oriel.ox.ac.uk/mike/fuzz/
-Source0:	http://spivey.oriel.ox.ac.uk/mike/fuzz/fuzz-%{version_date}.tar.gz
+Source0:	http://spivey.oriel.ox.ac.uk/mike/fuzz/fuzz-%{version}.tgz
 Source1:	http://spivey.oriel.ox.ac.uk/mike/fuzz/fuzzman.pdf
 Source2:	http://spivey.oriel.ox.ac.uk/mike/fuzz/refcard.pdf
 Source3:	http://spivey.oriel.ox.ac.uk/mike/fuzz/fuzzman-2up.pdf
 Source4:	http://spivey.oriel.ox.ac.uk/mike/fuzz/refcard-2up.pdf
 Source5:	http://spivey.oriel.ox.ac.uk/mike/fuzz/refcard-3up.pdf
-Patch0 :	tex-zfuzz-20070911-read-decl.patch
-Patch1 :	tex-zfuzz-20070911-destdir.patch
-Patch2 :	tex-zfuzz-20070911-ctype.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	tex(tex), tex(latex)
-BuildRequires:	tex(tex), tex(latex), bison, flex
+# Add DESTDIR support to the makefile
+Patch0 :	tex-zfuzz-20070911-destdir.patch
+# Remove a superfluous (and wrong) prototype, and don't generate the unused
+# input() and unput() functions
+Patch1:		tex-zfuzz-3.4.1-zscan.patch
+
+Requires:	tex(latex)
+BuildRequires:	tex(latex), bison, flex
 Requires(post): tex(tex)
 Requires(postun): tex(tex)
 
@@ -29,10 +29,6 @@ Requires(postun): tex(tex)
 # LaTeX style is still "fuzz", preserving an upstream request: "please don't
 # rename the LaTeX style option, or existing documents will break."
 
-# Upstream uses dates as version numbers for _final_ releases, not just
-# pre-release interim releases. After discussion, 0.20070911.X%{?dist} format
-# agreed upon for Release: value.
-
 # The package contains a few glyphs, but creating a separate font
 # subpackage seemed unnecessary and confusing (it's the only package using
 # them). Thus, it's been packaged as a single package, as upstream does.
@@ -40,37 +36,36 @@ Requires(postun): tex(tex)
 # seems pointless; they are intended to be used together.
 
 # Dirs for LaTeX styles, metafont, .tfm (root/specific), *pk (root/specific):
-%define texdir	%{_texmf_main}/tex/latex/%{name}
-%define mfdir	%{_texmf_main}/metafont/%{name}
-%define tfmdirr	%{_texmf_main}/fonts/tfm/%{name}
-%define pkdirr	%{_texmf_main}/fonts/pk/%{name}
-%define tfmdir	%{tfmdirr}/oxsz
-%define pkdir	%{pkdirr}/oxsz
+%global texdir	%{_texmf_main}/tex/latex/%{name}
+%global mfdir	%{_texmf_main}/metafont/%{name}
+%global tfmdirr	%{_texmf_main}/fonts/tfm/%{name}
+%global pkdirr	%{_texmf_main}/fonts/pk/%{name}
+%global tfmdir	%{tfmdirr}/oxsz
+%global pkdir	%{pkdirr}/oxsz
 
 %description
-This package (formerly named "fuzz")
-is a collection of tools that help you to
-(1) format and print good-looking specifications in the Z ("zed")
-formal specification language using LaTeX (through a new LaTeX style), and
-(2) check them for compliance with the Z scope and type rules.
-It includes a few font definitions for Z’s special symbols.
-
-This package is useful if you want to create formal specifications
-using the Z specification language.
-The Z language accepted is that of the Z Reference Manual,
-second edition, which is not exactly the same as the Z ISO standard
-(see http://www.cs.york.ac.uk/hise/cadiz/standard.html for the differences).
+This package (formerly named "fuzz") is a collection of tools that help
+you to:
+(1) format and print good-looking specifications in the Z ("zed") formal
+    specification language using LaTeX (through a new LaTeX style), and
+(2) check them for compliance with the Z scope and type rules.  It
+    includes a few font definitions for Z’s special symbols.
+
+This package is useful if you want to create formal specifications using
+the Z specification language.  The Z language accepted is that of the Z
+Reference Manual, second edition, which is not exactly the same as the Z
+ISO standard (see http://www.cs.york.ac.uk/hise/cadiz/standard.html for
+the differences).
 
 Historically, this package was called "fuzz", but there is another
 program ALSO called fuzz, so the command-line type-checker's has been
-changed to "zfuzz".  The LaTeX style itself is still
-named "fuzz" (so LaTeX documents will keep working).
+changed to "zfuzz".  The LaTeX style itself is still named "fuzz" (so
+LaTeX documents will keep working).
 
 %prep
-%setup -q -n fuzz-%{version_date}
+%setup -q -n fuzz-%{version}
 %patch0
 %patch1
-%patch2
 
 # The source for some documents are in ./doc as LaTeX, but as upstream says:
 # "The fuzz manual and reference card are written with LaTeX 2.09.
@@ -81,11 +76,10 @@ cp -p %SOURCE3 .
 cp -p %SOURCE4 .
 cp -p %SOURCE5 .
 
-%build
-# No "configure" script.
-
+# Fix the default path
 sed -i 's!/usr/local/lib/!%{_datadir}/%{name}/!g' src/param.c
 
+%build
 # The "lib" is really shared data, so we'll put it in %%_datadir (/usr/share)
 # instead of /usr/lib to meet the File Hierarchy Standard (FHS).
 make %{?_smp_mflags} CFLAGS="%{optflags}" \
@@ -101,7 +95,7 @@ pushd tex
  mktexpk --destdir `pwd` --mfmode / --bdpi 600 --mag 1+120/600 --dpi 720 oxsz10
  pdflatex example.tex
  # Run latex twice on the tutorial (to get the cross-references correct):
- latex tut.tex
+ pdflatex tut.tex
  pdflatex tut.tex
  mv example.tex example.pdf tut.pdf ..
 popd
@@ -110,8 +104,6 @@ popd
 make test
 
 %install
-rm -rf %{buildroot}
-
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_datadir}/%{name}
 install -d %{buildroot}%{texdir}
@@ -129,14 +121,10 @@ make install DESTDIR=%{buildroot} \
 cp -p tex/*.tfm %{buildroot}%{tfmdir}
 cp -p tex/*pk %{buildroot}%{pkdir}
 
-%clean
-rm -rf %{buildroot}
-
 # The "INSTALL" file includes the license text, so install as doc.
 # TeX file installation follows the "info tds" rules of texlive-texmf.
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{texdir}/
@@ -160,6 +148,12 @@ mktexlsr >/dev/null 2>&1 || :
 mktexlsr >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jun 22 2011 Jerry James <loganjerry at gmail.com> - 3.4.1-1
+- New upstream version
+- Drop upstreamed ctype and read-decl patches
+- Drop unnecessary spec file elements (BuildRoot, etc.)
+- Add the zscan patch to eliminate compiler errors and warnings
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.20070914.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -189,4 +183,3 @@ mktexlsr >/dev/null 2>&1 || :
 - Patch error.c to eliminate compiler warning for undefined isupper/islower
 - Simplified CFLAGS argument
 - Patched so would compile on 64-bit
-
