rpms/tex-zfuzz/F-9 import.log, NONE, 1.1 tex-zfuzz-20070911-ctype.patch, NONE, 1.1 tex-zfuzz-20070911-destdir.patch, NONE, 1.1 tex-zfuzz-20070911-read-decl.patch, NONE, 1.1 tex-zfuzz.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Wed Jul 2 02:08:28 UTC 2008

Author: dwheeler

Update of /cvs/pkgs/rpms/tex-zfuzz/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7060/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tex-zfuzz-20070911-ctype.patch 
	tex-zfuzz-20070911-destdir.patch 
	tex-zfuzz-20070911-read-decl.patch tex-zfuzz.spec 
Log Message:


* TUe Jul 01 2008 David A. Wheeler - 0-0.20070911.2
- Initial submission to Fedora repository.

--- NEW FILE import.log ---
tex-zfuzz-0-0_20070911_2_fc9:F-9:tex-zfuzz-0-0.20070911.2.fc9.src.rpm:1214963719

tex-zfuzz-20070911-ctype.patch:

--- NEW FILE tex-zfuzz-20070911-ctype.patch ---
--- src/error.c.orig	2008-06-25 21:23:10.000000000 -0400
+++ src/error.c	2008-06-25 21:23:39.000000000 -0400
@@ -33,6 +33,7 @@
 #include "fuzz.h"
 #include "symbol.h"
 #include <string.h>
+#include <ctype.h>
 
 EXTERN char *yytext;
 EXTERN int yychar;

tex-zfuzz-20070911-destdir.patch:

--- NEW FILE tex-zfuzz-20070911-destdir.patch ---
--- Makefile.orig	2008-06-25 17:02:43.000000000 -0400
+++ Makefile	2008-06-25 17:04:08.000000000 -0400
@@ -38,16 +38,18 @@
 
 INSTALL = install
 
+DESTDIR =
+
 all: src
 
 test: force
 	$(MAKE) -C test test
 
 install: src
-	$(INSTALL) -m 755 src/fuzz $(BINDIR)
-	$(INSTALL) -m 644 src/fuzzlib $(LIBDIR)
-	$(INSTALL) -m 644 tex/fuzz.sty $(TEXDIR)
-	$(INSTALL) -m 644 tex/*.mf $(MFDIR)
+	$(INSTALL) -m 755 src/fuzz $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 644 src/fuzzlib $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -m 644 tex/fuzz.sty $(DESTDIR)$(TEXDIR)
+	$(INSTALL) -m 644 tex/*.mf $(DESTDIR)$(MFDIR)
 
 SUBDIRS = src doc
 

tex-zfuzz-20070911-read-decl.patch:

--- NEW FILE tex-zfuzz-20070911-read-decl.patch ---
--- src/zscan.l.orig	2008-06-24 00:14:20.000000000 -0400
+++ src/zscan.l	2008-06-24 00:16:31.000000000 -0400
@@ -35,7 +35,9 @@
 #include "symbol.h"
 #include <string.h>
 
-EXTERN int read(int handle, void *buf, unsigned len);
+/* Get definition of read() */
+#include <unistd.h>
+
 
 PRIVATE int token;
 PRIVATE int lookup(int v);


--- NEW FILE tex-zfuzz.spec ---
%define version_date 2007-09-11

Name:		tex-zfuzz
Version:	0
Release:	0.20070911.2%{?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
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
Requires(post): tex(tex)
Requires(postun): tex(tex)

# Ubuntu and Debian have a different package named "fuzz", which is
# better-known and Fedora may include someday, so the command is renamed as
# "zfuzz" per upstream (Mike Spivey) recommendation.  The package is named
# "tex-zfuzz", to follow Fedora naming conventions for TeX packages. The
# 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.
# The LaTeX style and type-checker COULD be separately packaged, but that also
# 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

%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).

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).

%prep
%setup -q -n fuzz-%{version_date}
%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.
# Good luck unearthing a copy of that if you want to reformat it."
cp -p %SOURCE1 .
cp -p %SOURCE2 .
cp -p %SOURCE3 .
cp -p %SOURCE4 .
cp -p %SOURCE5 .

%build
# No "configure" script.

sed -i 's!/usr/local/lib/!%{_datadir}/%{name}/!g' src/param.c

# 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}" \
 BINDIR=%{_bindir} LIBDIR=%{_datadir}/%{name} \
 TEXDIR=%{texdir} MFDIR=%{mfdir}

# Generate docs and pregenerated .tfm/*pk files:
pushd tex
 for file in oxsz[1-9]*.mf
 do
  mktextfm --destdir `pwd` `basename $file .mf`
 done
 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
 mv example.tex example.pdf tut.pdf ..
popd

%check
make test

%install
rm -rf %{buildroot}

install -d %{buildroot}%{_bindir}
install -d %{buildroot}%{_datadir}/%{name}
install -d %{buildroot}%{texdir}
install -d %{buildroot}%{mfdir}
install -d %{buildroot}%{tfmdir}
install -d %{buildroot}%{pkdir}

make install DESTDIR=%{buildroot} \
 BINDIR=%{_bindir} LIBDIR=%{_datadir}/%{name} \
 TEXDIR=%{texdir} MFDIR=%{mfdir} INSTALL="install -p"

(cd %{buildroot}%{_bindir} ; mv fuzz zfuzz)

# Install pre-built .tfm and *pk files (speeds use):
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}/
%{mfdir}/
%{tfmdirr}/
%{pkdirr}/
%doc INSTALL
%doc fuzzman.pdf
%doc refcard.pdf
%doc fuzzman-2up.pdf
%doc refcard-2up.pdf
%doc refcard-3up.pdf
%doc example.tex
%doc example.pdf
%doc tut.pdf

%post
mktexlsr >/dev/null 2>&1 || :

%postun
mktexlsr >/dev/null 2>&1 || :

%changelog
* Mon Jun 30 2008 David A. Wheeler - 0-0.20070911.2
- Added more information to Changelog (combined due to rev number change)

* Sat Jun 29 2008 David A. Wheeler - 0-0.20070911.1
- Initial packaging.
- Did not name it "fuzz" because of conflict with other program named fuzz
- Handled reviewer comments https://bugzilla.redhat.com/show_bug.cgi?id=452559
- Named package as tex-zfuzz (per Fedora naming guidelines)
- Came to agreement on version/revision convention
- Depend on virtual packages tex(tex) and tex(latex) instead of specific pkgs
- Shortened comments and description
- Renamed patch file names to clarify what upstream version they apply to
- Fixed .spec so it can build even when it's already installed
- Summary and description don't repeat package name
- Patch error.c to eliminate compiler warning for undefined isupper/islower
- Simplified CFLAGS argument
- Patched so would compile on 64-bit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tex-zfuzz/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jul 2008 16:53:55 -0000	1.1
+++ .cvsignore	2 Jul 2008 02:07:38 -0000	1.2
@@ -0,0 +1,6 @@
+fuzz-2007-09-11.tar.gz
+fuzzman-2up.pdf
+fuzzman.pdf
+refcard-2up.pdf
+refcard-3up.pdf
+refcard.pdf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tex-zfuzz/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Jul 2008 16:53:55 -0000	1.1
+++ sources	2 Jul 2008 02:07:38 -0000	1.2
@@ -0,0 +1,6 @@
+9f021c0e68f8f4616095f57ff2192c6f  fuzz-2007-09-11.tar.gz
+4e4d00d8571b14919f95f041a927f71b  fuzzman-2up.pdf
+e3eb1467804bf4bf5b8dcf8eed773c69  fuzzman.pdf
+c3145cea9c6f16fb02e068fd1ea669a9  refcard-2up.pdf
+082297daa993c97d8e35fb75f8bb2810  refcard-3up.pdf
+be69ba14a3b997bcde65828a34909e67  refcard.pdf


