From 191c52a69640231328dcff65a243041736583cd2 Mon Sep 17 00:00:00 2001 From: José Abílio Oliveira Matos Date: Oct 16 2008 20:02:28 +0000 Subject: - use lyx to generate the pdf documentation and ignore its warnings (for now) --- diff --git a/sdcc-2.8.0-doc-lyx.diff b/sdcc-2.8.0-doc-lyx.diff new file mode 100644 index 0000000..52ce57d --- /dev/null +++ b/sdcc-2.8.0-doc-lyx.diff @@ -0,0 +1,26 @@ +--- sdcc/doc/Makefile.in.orig 2006-06-17 22:40:28.000000000 +0100 ++++ sdcc/doc/Makefile.in 2008-10-16 20:29:34.000000000 +0100 +@@ -117,15 +117,14 @@ + # # the glossary, not implemented yet + # # $(MAKEINDEX) -s l2hglo.ist -o $@ $< + +-%.pdf: %.tex +- $(PDFLATEX) $* +- -$(MAKEINDEX) $* +- $(PDFLATEX) $* +- -$(MAKEINDEX) $* +- $(PDFLATEX) $* +- $(PDFOPT) $*.pdf tmp.pdf +- rm $*.pdf +- mv tmp.pdf $*.pdf ++%.pdf: %.lyx ++ if [ "$(srcdir)" != "." ] ; then \ ++ cp $< . ; \ ++ $(LYX) -e pdf2 $(notdir $<) || echo "LyX gave a warning"; \ ++ rm $(notdir $<) ; \ ++ else \ ++ $(LYX) -e pdf2 $< || echo "LyX gave a warning"; \ ++ fi + + archive: all + rm -rf sdcc-doc sdcc-doc.tar.bz2 diff --git a/sdcc.spec b/sdcc.spec index 3e711b0..b719beb 100644 --- a/sdcc.spec +++ b/sdcc.spec @@ -1,6 +1,6 @@ Name: sdcc Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Small Device C Compiler Group: Applications/Engineering License: GPLv2+ @@ -9,6 +9,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}. Source1: README.fedora Patch0: sdcc-2.8.0-configure.diff Patch1: sdcc-2.8.0-debugger-makefile.diff +Patch2: sdcc-2.8.0-doc-lyx.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex @@ -40,6 +41,7 @@ if you want to modify the C library or as reference of how it works. %setup -q -n sdcc %patch0 -p1 %patch1 -p0 +%patch2 -p1 find -name '*.[ch]' -exec chmod -x '{}' \; @@ -61,7 +63,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_libexecdir}/sdcc # Create launch scripts in %{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for x in ../libexec/sdcc/*; do +for x in ../libexec/sdcc/*; do echo "#!/bin/sh PATH=/usr/libexec/sdcc:\$PATH /usr/libexec/%{name}/$(basename $x) \"\$@\"" > %{name}-$(basename $x) @@ -91,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/lib/*/*.asm %changelog +* Thu Oct 16 2008 José Matos - 2.8.0-2 +- use lyx to generate the pdf documentation and ignore its warnings (for now) + * Tue Sep 9 2008 Conrad Meyer - 2.8.0-1 - Bump to 2.8.0. - Patch configure to not mess up CFLAGS. @@ -133,7 +138,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Feb 26 2007 Ralf Corsépius - 2.6.0-4 - Add sdcc-2.6.0-configure.diff. - Pass Q= to make to make building verbose. -- Add __os_install_post post-hacks to prevent brp-strip from processing +- Add __os_install_post post-hacks to prevent brp-strip from processing foreign binaries. * Mon Feb 26 2007 Trond Danielsen - 2.6.0-3 @@ -142,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Feb 5 2007 Trond Danielsen - 2.6.0-2 - Emacs scripts moved to the correct folder. - Moved binaries to /urs/libexec/sdcc, added symlinks with sdcc- prefix in /usr/bin. -- Various rpmlint errors fixed. +- Various rpmlint errors fixed. * Thu Feb 1 2007 Trond Danielsen - 2.6.0-1 - Initial version.