rpms/lout/EL-5 makefile.patch, NONE, 1.1 lout.spec, 1.4, 1.5 sources, 1.2, 1.3

Tom Callaway (spot) fedora-extras-commits at redhat.com
Tue Feb 19 21:45:50 UTC 2008


Author: spot

Update of /cvs/extras/rpms/lout/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8323/EL-5

Modified Files:
	lout.spec sources 
Added Files:
	makefile.patch 
Log Message:

epel


makefile.patch:

--- NEW FILE makefile.patch ---
--- lout-3.36/makefile.orig	2008-02-02 22:15:48.000000000 -0500
+++ lout-3.36/makefile	2008-02-03 10:00:56.000000000 -0500
@@ -355,7 +355,7 @@
 	chmod 755 $(BINDIR)/prg2lout
 	@echo ""
 	@echo "(b) Installing library files into LOUTLIBDIR $(LOUTLIBDIR)"
-	mkdir $(LOUTLIBDIR)
+	mkdir -p $(LOUTLIBDIR)
 	chmod 755 $(LOUTLIBDIR)
 	@echo ""
 	mkdir $(LOUTLIBDIR)/$(LIBINCL)
@@ -387,7 +387,7 @@
 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)
 	@echo ""
 	@echo "(c) Initializing run (should be silent, no errors expected)"
-	$(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init
+	$(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init -I $(LOUTLIBDIR)/$(LIBINCL) -H $(LOUTLIBDIR)/$(LIBHYPH) -D $(LOUTLIBDIR)/$(LIBDATA)
 	@echo ""
 	@echo "(d) Changing mode of files just created by initializing run"
 	chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*


Index: lout.spec
===================================================================
RCS file: /cvs/extras/rpms/lout/EL-5/lout.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lout.spec	23 Aug 2007 23:23:00 -0000	1.4
+++ lout.spec	19 Feb 2008 21:45:10 -0000	1.5
@@ -1,15 +1,14 @@
 Name:		lout
 Summary: 	A document formatting system
-Version: 	3.30
-Release: 	6%{?dist}
+Version: 	3.36
+Release: 	1%{?dist}
 License: 	GPLv2+
 Group: 		Applications/Publishing
-URL:		http://lout.sourceforge.net/
-Source0:	http://dl.sourceforge.net/lout/%{name}-%{version}.tar.gz
-Source1:	http://snark.ptc.spbu.ru/~uwe/lout/user.ps.gz
-Patch0:		lout-3.30-Fedora-makefile-new.patch
+URL:		ftp://ftp.cs.usyd.edu.au/jeff/lout/
+Source0:	ftp://ftp.cs.usyd.edu.au/jeff/lout/lout-%{version}.tar.gz
+Patch0:		makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	zlib-devel
+BuildRequires:	ghostscript
 
 %description
 Lout is a document formatting system designed and implemented by Jeffrey 
@@ -25,23 +24,57 @@
 %patch0 -p1
 
 %build
-make BINDIR=%{_bindir} LIBDIR=%{_datadir}/%{name} DOCDIR=%{_datadir}/%{name}/doc \
-     MANDIR=%{_mandir}/man1 prg2lout lout
+make COPTS="$RPM_OPT_FLAGS" \
+     BINDIR=%{_bindir} \
+     LOUTLIBDIR=%{_datadir}/%{name} \
+     LOUTDOCDIR=%{_datadir}/%{name}/doc \
+     MANDIR=%{_mandir}/man1 \
+     prg2lout lout
+
+function render_docs {
+    subdir=$1
+    pdf_file=$2
+    passes=$3
+
+    curdir=$(pwd)
+    pushd doc/$subdir
+
+    # We need to set the PATH variable here, because lout eventually exec's
+    #   prg2lout.  In order for lout to find the latter, we have to set the
+    #   PATH.
+    # We also need to tell lout where to find its files, since we haven't
+    #   installed them in their final location under /usr/share/lout/ yet.
+    PATH=$curdir lout \
+       -I $curdir/include \
+       -D $curdir/data \
+       -F $curdir/font \
+       -H $curdir/hyph \
+       -C $curdir/maps \
+       -r${passes} all > outfile.ps
+    # Note that the above clobbers the prebuilt file outfile.ps that is
+    # included in Lout's source tarball.
+    ps2pdf14 outfile.ps ../${pdf_file}.pdf
+    rm *.li *.ld outfile.ps
+    popd
+}
+
+render_docs design design.pdf       3
+render_docs expert expert-guide.pdf 4
+render_docs slides slides.pdf       2
+render_docs user   user-guide.pdf   6
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-make DESTDIR=$RPM_BUILD_ROOT \
-     BINDIR=%{_bindir} \
-     LIBDIR=%{_datadir}/%{name} \
-     DOCDIR=%{_datadir}/%{name}/doc \
-     MANDIR=%{_mandir}/man1 \
+make BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+     LOUTLIBDIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \
+     LOUTDOCDIR=$RPM_BUILD_ROOT%{_datadir}/%{name}/doc \
+     MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
      install installman installdoc
-cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc
-gunzip $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc/user.ps.gz
-# looks like a vim dump, just taking up space
+
+# Looks like vim dump?
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/user/.pie_intr.swp
 
 %clean
@@ -49,7 +82,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc gnu.gpl README READMEPDF
+%doc gpl.txt README READMEPDF
 %{_bindir}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
@@ -57,6 +90,13 @@
 
 
 %changelog
+* Tue Feb 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.36-1
+- Update to lout-3.36.  Render PDF versions of the Lout documentation.
+  Thanks to Vadim Nasardinov <vnasardinov at gmail.com> for the fixes.
+
+* Thu Aug 23 2007 Tom "spot" Callaway <tcallawa at redhat.com> 3.30-7
+- fix license (GPLv2+), rebuild in devel for BuildID
+
 * Tue Sep 12 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.30-6
 - bump for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lout/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jul 2005 13:42:20 -0000	1.2
+++ sources	19 Feb 2008 21:45:10 -0000	1.3
@@ -1,2 +1 @@
-770930dec05f136a29ff078e66e59881  lout-3.30.tar.gz
-7786e5363c5716a22fc5bd7666a24826  user.ps.gz
+9fb418e5db4cb242f7ab1c6e8c59a1c2  lout-3.36.tar.gz




More information about the fedora-extras-commits mailing list