rpms/lout/devel lout-3.30-Fedora-makefile-new.patch, NONE, 1.1 lout.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tom Callaway (spot) fedora-extras-commits at redhat.com
Fri Jul 1 13:42:22 UTC 2005


Author: spot

Update of /cvs/extras/rpms/lout/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lout-3.30-Fedora-makefile-new.patch lout.spec 
Log Message:
auto-import lout-3.30-4 on branch devel from lout-3.30-4.src.rpm

lout-3.30-Fedora-makefile-new.patch:

--- NEW FILE lout-3.30-Fedora-makefile-new.patch ---
--- lout-3.30/makefile.BAD	2005-06-30 07:55:49.000000000 -0500
+++ lout-3.30/makefile	2005-06-30 08:14:29.000000000 -0500
@@ -280,15 +280,15 @@
 
 COLLATE	= 1
 
-PDF_COMPRESSION	= 0
-ZLIB		=
-ZLIBPATH	=
+PDF_COMPRESSION	= 1
+ZLIB		= -lz
+ZLIBPATH	= 
 
 CC	= gcc
 
 RCOPY	= cp -r
 
-COPTS	= -ansi -pedantic -Wall -O3
+COPTS	= $(RPM_OPT_FLAGS)
 
 CFLAGS	= -DOS_UNIX=$(OSUNIX)					\
 	  -DOS_DOS=$(OSDOS)					\
@@ -336,91 +336,91 @@
 install: lout prg2lout
 	@echo ""
 	@echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)"
-	cp lout $(BINDIR)/lout
-	chmod 755 $(BINDIR)/lout
-	cp prg2lout $(BINDIR)/prg2lout
-	chmod 755 $(BINDIR)/prg2lout
+	cp lout $(DESTDIR)$(BINDIR)/lout
+	chmod 755 $(DESTDIR)$(BINDIR)/lout
+	cp prg2lout $(DESTDIR)$(BINDIR)/prg2lout
+	chmod 755 $(DESTDIR)$(BINDIR)/prg2lout
 	@echo ""
 	@echo "(b) Installing library files into LIBDIR $(LIBDIR)"
-	mkdir $(LIBDIR)
-	chmod 755 $(LIBDIR)
+	mkdir $(DESTDIR)$(LIBDIR)
+	chmod 755 $(DESTDIR)$(LIBDIR)
 	@echo ""
-	mkdir $(LIBDIR)/$(LIBINCL)
-	chmod 755 $(LIBDIR)/$(LIBINCL)
-	cp include/* $(LIBDIR)/$(LIBINCL)
-	chmod 644 $(LIBDIR)/$(LIBINCL)/*
-	@echo ""
-	mkdir $(LIBDIR)/$(LIBDATA)
-	chmod 755 $(LIBDIR)/$(LIBDATA)
-	cp data/* $(LIBDIR)/$(LIBDATA)
-	chmod 644 $(LIBDIR)/$(LIBDATA)/*
-	@echo ""
-	mkdir $(LIBDIR)/$(LIBHYPH)
-	chmod 755 $(LIBDIR)/$(LIBHYPH)
-	cp hyph/* $(LIBDIR)/$(LIBHYPH)
-	chmod 644 $(LIBDIR)/$(LIBHYPH)/*
-	@echo ""
-	mkdir $(LIBDIR)/$(LIBFONT)
-	chmod 755 $(LIBDIR)/$(LIBFONT)
-	cp font/* $(LIBDIR)/$(LIBFONT)
-	chmod 644 $(LIBDIR)/$(LIBFONT)/*
-	@echo ""
-	mkdir $(LIBDIR)/$(LIBMAPS)
-	chmod 755 $(LIBDIR)/$(LIBMAPS)
-	cp maps/* $(LIBDIR)/$(LIBMAPS)
-	chmod 644 $(LIBDIR)/$(LIBMAPS)/*
+	mkdir $(DESTDIR)$(LIBDIR)/$(LIBINCL)
+	chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBINCL)
+	cp include/* $(DESTDIR)$(LIBDIR)/$(LIBINCL)
+	chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBINCL)/*
+	@echo ""
+	mkdir $(DESTDIR)$(LIBDIR)/$(LIBDATA)
+	chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBDATA)
+	cp data/* $(DESTDIR)$(LIBDIR)/$(LIBDATA)
+	chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBDATA)/*
+	@echo ""
+	mkdir $(DESTDIR)$(LIBDIR)/$(LIBHYPH)
+	chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBHYPH)
+	cp hyph/* $(DESTDIR)$(LIBDIR)/$(LIBHYPH)
+	chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBHYPH)/*
+	@echo ""
+	mkdir $(DESTDIR)$(LIBDIR)/$(LIBFONT)
+	chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBFONT)
+	cp font/* $(DESTDIR)$(LIBDIR)/$(LIBFONT)
+	chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBFONT)/*
+	@echo ""
+	mkdir $(DESTDIR)$(LIBDIR)/$(LIBMAPS)
+	chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBMAPS)
+	cp maps/* $(DESTDIR)$(LIBDIR)/$(LIBMAPS)
+	chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBMAPS)/*
 	@echo ""
-	mkdir $(LIBDIR)/$(LIBLOCA)
-	chmod 755 $(LIBDIR)/$(LIBLOCA)
+	mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)
+	chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)
 	@echo ""
 	@echo "(c) Initializing run (should be silent, no errors expected)"
-	$(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init
+	$(DESTDIR)$(BINDIR)/lout -x -s $(DESTDIR)$(LIBDIR)/$(LIBINCL)/init -I $(DESTDIR)$(LIBDIR)/$(LIBINCL) -H $(DESTDIR)$(LIBDIR)/$(LIBHYPH) -D $(DESTDIR)$(LIBDIR)/$(LIBDATA) 
 	@echo ""
 	@echo "(d) Changing mode of files just created by initializing run"
-	chmod 644 $(LIBDIR)/$(LIBDATA)/*
-	chmod 644 $(LIBDIR)/$(LIBHYPH)/*
+	chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBDATA)/*
+	chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBHYPH)/*
 
 installman:
 	@echo ""
 	@echo "Installing manual entries into MANDIR $(MANDIR)"
 	sed -e "s@<BINDIR>@$(BINDIR)@" -e "s@<LIBDIR>@$(LIBDIR)@"	\
 	    -e "s@<DOCDIR>@$(DOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@"	\
-	man/lout.1 > $(MANDIR)/lout.1
-	chmod 644 $(MANDIR)/lout.1
-	cp man/prg2lout.1 $(MANDIR)/prg2lout.1
-	chmod 644 $(MANDIR)/prg2lout.1
+	man/lout.1 > $(DESTDIR)$(MANDIR)/lout.1
+	chmod 644 $(DESTDIR)$(MANDIR)/lout.1
+	cp man/prg2lout.1 $(DESTDIR)$(MANDIR)/prg2lout.1
+	chmod 644 $(DESTDIR)$(MANDIR)/prg2lout.1
 
 installdoc:
 	@echo ""
 	@echo "Creating DOCDIR $(DOCDIR) and copying documentation into it"
-	$(RCOPY) doc $(DOCDIR)
-	chmod 755 $(DOCDIR)
-	chmod 755 $(DOCDIR)/*
-	chmod 644 $(DOCDIR)/*/*
+	$(RCOPY) doc $(DESTDIR)$(DOCDIR)
+	chmod 755 $(DESTDIR)$(DOCDIR)
+	chmod 755 $(DESTDIR)$(DOCDIR)/*
+	chmod 644 $(DESTDIR)$(DOCDIR)/*/*
 
 installfr:
 	@echo ""
 	@echo "Putting French error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)"
-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
-	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
-	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
-	cp locale/msgs.fr $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
-	gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR)	\
-	       $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
-	chmod 644 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/*
+	mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
+	chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
+	mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
+	chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
+	cp locale/msgs.fr $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
+	gencat $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR)	\
+	       $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
+	chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/*
 
 installde:
 	@echo ""
 	@echo "Putting German error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)"
-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
-	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
-	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
-	cp locale/msgs.de $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
-	gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE)	\
-	       $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
-	chmod 644 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/*
+	mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
+	chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
+	mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
+	chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
+	cp locale/msgs.de $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
+	gencat $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE)	\
+	       $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
+	chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/*
 
 uninstall:
 	-rm -f  $(BINDIR)/lout $(BINDIR)/prg2lout


--- NEW FILE lout.spec ---
Name:		lout
Summary: 	A document formatting system
Version: 	3.30
Release: 	4%{?dist}
License: 	GPL
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
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	zlib-devel

%description
Lout is a document formatting system designed and implemented by Jeffrey 
Kingston at the Basser Department of Computer Science, University of 
Sydney, Australia. The system reads a high-level description of a document 
similar in style to LaTeX and produces a PostScript file which can be 
printed on most laser printers and graphic display devices. Plain text 
output is also available, PDF output is limited but working (e.g. no 
graphics). Lout is inherently multilingual. Adding new languages is easy. 

%prep
%setup -q
%patch0 -p1

%build
make BINDIR=%{_bindir} LIBDIR=%{_datadir}/%{name} DOCDIR=%{_datadir}/%{name}/doc \
     MANDIR=%{_mandir}/man1 prg2lout lout

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
make DESTDIR=$RPM_BUILD_ROOT \
     BINDIR=%{_bindir} \
     LIBDIR=%{_datadir}/%{name} \
     DOCDIR=%{_datadir}/%{name}/doc \
     MANDIR=%{_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
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/user/.pie_intr.swp

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root, 0755)
%doc gnu.gpl README READMEPDF
%{_bindir}/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_mandir}/man1/*.1*


%changelog
* Fri Jul  1 2005 Tom "spot" Callaway <tcallawa at redhat.com> 3.30-4
- delete hidden trash file

* Thu Jun 30 2005 Tom "spot" Callaway <tcallawa at redhat.com> 3.30-3
- cleanups, macro consistency

* Thu Jun 30 2005 Tom "spot" Callaway <tcallawa at redhat.com> 3.30-2
- remove hardcoded directory definitions
- link with shared zlib, not static

* Thu Jun 30 2005 Tom "spot" Callaway <tcallawa at redhat.com> 3.30-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lout/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jul 2005 13:40:56 -0000	1.1
+++ .cvsignore	1 Jul 2005 13:42:20 -0000	1.2
@@ -0,0 +1,2 @@
+lout-3.30.tar.gz
+user.ps.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lout/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Jul 2005 13:40:56 -0000	1.1
+++ sources	1 Jul 2005 13:42:20 -0000	1.2
@@ -0,0 +1,2 @@
+770930dec05f136a29ff078e66e59881  lout-3.30.tar.gz
+7786e5363c5716a22fc5bd7666a24826  user.ps.gz




More information about the fedora-extras-commits mailing list