[packages/muttprint] - updated to 0.73 - missing pictures added in muttprint-missing-files.tar.xz - added docbook-fixes p

draenog draenog at pld-linux.org
Sun Jul 8 17:41:50 CEST 2012 

commit 97ce43eb924ce9b009562852877f5a7efaca4a38
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 8 09:05:02 2012 +0000

    - updated to 0.73
    - missing pictures added in muttprint-missing-files.tar.xz
    - added docbook-fixes patch to fix doc build
    
    Changed files:
        muttprint-docbook-fixes.patch -> 1.1
        muttprint.spec -> 1.35

 muttprint-docbook-fixes.patch | 187 ++++++++++++++++++++++++++++++++++++++++++
 muttprint.spec                |  68 ++++++++-------
 2 files changed, 226 insertions(+), 29 deletions(-)
---
diff --git a/muttprint-docbook-fixes.patch b/muttprint-docbook-fixes.patch
new file mode 100644
index 0000000..1ef53f6
--- /dev/null
+++ b/muttprint-docbook-fixes.patch
@@ -0,0 +1,187 @@
+--- muttprint-0.73/doc/manual/en/Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ muttprint-0.73/doc/manual/en/Makefile.am	2012-07-08 09:55:12.583302373 +0200
+@@ -18,23 +18,23 @@ manual-en-sed.sgml : manual-en.sgml
+ 	$(do_subst) < $(srcdir)/manual-en.sgml > manual-en-sed.sgml
+ 
+ manual-en.pdf : manual-en-sed.sgml
+-	db2pdf -s ../stylesheet.dsl manual-en-sed.sgml
++	db2pdf -d ../stylesheet.dsl manual-en-sed.sgml
+ 	mv manual-en-sed.pdf manual-en.pdf
+ 
+ manual-en.ps : manual-en-sed.sgml
+-	db2ps -s ../stylesheet.dsl manual-en-sed.sgml
++	db2ps -d ../stylesheet.dsl manual-en-sed.sgml
+ 	mv manual-en-sed.ps manual-en.ps
+ 
+ manual-en.dvi : manual-en-sed.sgml
+-	db2dvi -s ../stylesheet.dsl manual-en-sed.sgml
++	db2dvi -d ../stylesheet.dsl manual-en-sed.sgml
+ 	mv manual-en-sed.dvi manual-en.dvi
+ 
+ manual-en.rtf : manual-en-sed.sgml
+-	db2rtf -s ../stylesheet.dsl manual-en-sed.sgml
++	db2rtf -d ../stylesheet.dsl manual-en-sed.sgml
+ 	mv manual-en-sed.rtf manual-en.rtf
+ 
+ manual-en.html : manual-en-sed.sgml
+-	db2html -u -s ../stylesheet.dsl manual-en-sed.sgml
++	db2html -u -d ../stylesheet.dsl manual-en-sed.sgml
+ 	mv manual-en-sed/manual-en-sed.html manual-en.html
+ 	rm -rf manual-en-sed
+ 	rm -rf manual-en-sed.junk
+--- muttprint-0.73/doc/manual/en/manual-en.sgml.orig	2005-05-16 14:38:51.000000000 +0200
++++ muttprint-0.73/doc/manual/en/manual-en.sgml	2012-07-08 09:58:52.639959802 +0200
+@@ -189,7 +189,7 @@
+ 				favourite editor.</para>
+ 
+ 			<para>As mentioned above, there must be a small C program compiled. If you use Perl
+-				5.8 and/or Linux, you could skip this step. For this, just execute 
++				5.8 and/or Linux, you could skip this step. For this, just execute</para>
+ 
+ 			<para>
+ 				<prompt>$ </prompt>
+@@ -1023,7 +1023,8 @@ set printer_name "muttprint"
+ 			<para>For this, you can assign the variable <literal>BACKGROUND</literal>
+ 				the value <literal>on</literal>. In the debug mode (see <xref
+ 				linkend="debug">) this option has no effect.</para>
+-		
++    </sect3>
++
+ 		<sect3 id="debug">
+ 			<title>Error messages</title>
+ 			
+--- muttprint-0.73/doc/manual/es/Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ muttprint-0.73/doc/manual/es/Makefile.am	2012-07-08 09:55:27.973301726 +0200
+@@ -18,23 +18,23 @@ manual-es-sed.sgml : manual-es.sgml
+ 	$(do_subst) < $(srcdir)/manual-es.sgml > manual-es-sed.sgml
+ 
+ manual-es.pdf : manual-es-sed.sgml
+-	db2pdf -s ../stylesheet.dsl manual-es-sed.sgml
++	db2pdf -d ../stylesheet.dsl manual-es-sed.sgml
+ 	mv manual-es-sed.pdf manual-es.pdf
+ 
+ manual-es.ps : manual-es-sed.sgml
+-	db2ps -s ../stylesheet.dsl manual-es-sed.sgml
++	db2ps -d ../stylesheet.dsl manual-es-sed.sgml
+ 	mv manual-es-sed.ps manual-es.ps
+ 
+ manual-es.dvi : manual-es-sed.sgml
+-	db2dvi -s ../stylesheet.dsl manual-es-sed.sgml
++	db2dvi -d ../stylesheet.dsl manual-es-sed.sgml
+ 	mv manual-es-sed.dvi manual-es.dvi
+ 
+ manual-es.rtf : manual-es-sed.sgml
+-	db2rtf -s ../stylesheet.dsl manual-es-sed.sgml
++	db2rtf -d ../stylesheet.dsl manual-es-sed.sgml
+ 	mv manual-es-sed.rtf manual-es.rtf
+ 
+ manual-es.html : manual-es-sed.sgml
+-	db2html -u -s ../stylesheet.dsl manual-es-sed.sgml
++	db2html -u -d ../stylesheet.dsl manual-es-sed.sgml
+ 	mv manual-es-sed/manual-es-sed.html manual-es.html
+ 	rm -rf manual-es-sed
+ 	rm -rf manual-es-sed.junk
+--- muttprint-0.73/doc/manual/de/Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ muttprint-0.73/doc/manual/de/Makefile.am	2012-07-08 09:52:13.919976533 +0200
+@@ -18,23 +18,23 @@ manual-de-sed.sgml : manual-de.sgml
+ 	$(do_subst) < $(srcdir)/manual-de.sgml > manual-de-sed.sgml
+ 
+ manual-de.pdf : manual-de-sed.sgml
+-	db2pdf -s ../stylesheet.dsl manual-de-sed.sgml
++	db2pdf -d ../stylesheet.dsl manual-de-sed.sgml
+ 	mv manual-de-sed.pdf manual-de.pdf
+ 
+ manual-de.ps : manual-de-sed.sgml
+-	db2ps -s ../stylesheet.dsl manual-de-sed.sgml
++	db2ps -d ../stylesheet.dsl manual-de-sed.sgml
+ 	mv manual-de-sed.ps manual-de.ps
+ 
+ manual-de.dvi : manual-de-sed.sgml
+-	db2dvi -s ../stylesheet.dsl manual-de-sed.sgml
++	db2dvi -d ../stylesheet.dsl manual-de-sed.sgml
+ 	mv manual-de-sed.dvi manual-de.dvi
+ 
+ manual-de.rtf : manual-de-sed.sgml
+-	db2rtf -s ../stylesheet.dsl manual-de-sed.sgml
++	db2rtf -d ../stylesheet.dsl manual-de-sed.sgml
+ 	mv manual-de-sed.rtf manual-de.rtf
+ 
+ manual-de.html : manual-de-sed.sgml
+-	db2html -u -s ../stylesheet.dsl manual-de-sed.sgml
++	db2html -u -d ../stylesheet.dsl manual-de-sed.sgml
+ 	mv manual-de-sed/manual-de-sed.html manual-de.html
+ 	rm -rf manual-de-sed
+ 	rm -rf manual-de-sed.junk
+--- muttprint-0.73/doc/manual/it/Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ muttprint-0.73/doc/manual/it/Makefile.am	2012-07-08 09:55:39.439967910 +0200
+@@ -18,23 +18,23 @@ manual-it-sed.sgml : manual-it.sgml
+ 	$(do_subst) < $(srcdir)/manual-it.sgml > manual-it-sed.sgml
+ 
+ manual-it.pdf : manual-it-sed.sgml
+-	db2pdf -s ../stylesheet.dsl manual-it-sed.sgml
++	db2pdf -d ../stylesheet.dsl manual-it-sed.sgml
+ 	mv manual-it-sed.pdf manual-it.pdf
+ 
+ manual-it.ps : manual-it-sed.sgml
+-	db2ps -s ../stylesheet.dsl manual-it-sed.sgml
++	db2ps -d ../stylesheet.dsl manual-it-sed.sgml
+ 	mv manual-it-sed.ps manual-it.ps
+ 
+ manual-it.dvi : manual-it-sed.sgml
+-	db2dvi -s ../stylesheet.dsl manual-it-sed.sgml
++	db2dvi -d ../stylesheet.dsl manual-it-sed.sgml
+ 	mv manual-it-sed.dvi manual-it.dvi
+ 
+ manual-it.rtf : manual-it-sed.sgml
+-	db2rtf -s ../stylesheet.dsl manual-it-sed.sgml
++	db2rtf -d ../stylesheet.dsl manual-it-sed.sgml
+ 	mv manual-it-sed.rtf manual-it.rtf
+ 
+ manual-it.html : manual-it-sed.sgml
+-	db2html -u -s ../stylesheet.dsl manual-it-sed.sgml
++	db2html -u -d ../stylesheet.dsl manual-it-sed.sgml
+ 	mv manual-it-sed/manual-it-sed.html manual-it.html
+ 	rm -rf manual-it-sed
+ 	rm -rf manual-it-sed.junk
+--- muttprint-0.73/doc/manual/it/manual-it.sgml.orig	2005-05-16 14:38:51.000000000 +0200
++++ muttprint-0.73/doc/manual/it/manual-it.sgml	2012-07-08 10:01:25.813286708 +0200
+@@ -1079,7 +1079,7 @@ stampato.
+             <row>
+               <entry>ISO-8859-4</entry>
+               <entry><literal>latin4</literal></entry>
+-              <entry>Lingue Europa sud-orientale ed altre lingue/entry>
++							<entry>Lingue Europa sud-orientale ed altre lingue</entry>
+             </row>
+             <row>
+               <entry>ISO-8859-9</entry>
+--- muttprint-0.73/doc/manual/sl/Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ muttprint-0.73/doc/manual/sl/Makefile.am	2012-07-08 09:55:51.186634085 +0200
+@@ -18,23 +18,23 @@ manual-sl-sed.sgml : manual-sl.sgml
+ 	$(do_subst) < $(srcdir)/manual-sl.sgml > manual-sl-sed.sgml
+ 
+ manual-sl.pdf : manual-sl-sed.sgml
+-	db2pdf -s ../stylesheet.dsl manual-sl-sed.sgml
++	db2pdf -d ../stylesheet.dsl manual-sl-sed.sgml
+ 	mv manual-sl-sed.pdf manual-sl.pdf
+ 
+ manual-sl.ps : manual-sl-sed.sgml
+-	db2ps -s ../stylesheet.dsl manual-sl-sed.sgml
++	db2ps -d ../stylesheet.dsl manual-sl-sed.sgml
+ 	mv manual-sl-sed.ps manual-sl.ps
+ 
+ manual-sl.dvi : manual-sl-sed.sgml
+-	db2dvi -s ../stylesheet.dsl manual-sl-sed.sgml
++	db2dvi -d ../stylesheet.dsl manual-sl-sed.sgml
+ 	mv manual-sl-sed.dvi manual-sl.dvi
+ 
+ manual-sl.rtf : manual-sl-sed.sgml
+-	db2rtf -s ../stylesheet.dsl manual-sl-sed.sgml
++	db2rtf -d ../stylesheet.dsl manual-sl-sed.sgml
+ 	mv manual-sl-sed.rtf manual-sl.rtf
+ 
+ manual-sl.html : manual-sl-sed.sgml
+-	db2html -u -s ../stylesheet.dsl manual-sl-sed.sgml
++	db2html -u -d ../stylesheet.dsl manual-sl-sed.sgml
+ 	mv manual-sl-sed/manual-sl-sed.html manual-sl.html
+ 	rm -rf manual-sl-sed
+ 	rm -rf manual-sl-sed.junk
diff --git a/muttprint.spec b/muttprint.spec
index 9b2fa5f..5e3413f 100644
--- a/muttprint.spec
+++ b/muttprint.spec
@@ -1,13 +1,24 @@
 Summary:	Formats the output of mail clients to a good-looking printing
 Summary(pl.UTF-8):	Program formatujący wyjście klientów pocztowych w dobrze wyglądający wydruk
 Name:		muttprint
-Version:	0.72c
+Version:	0.73
 Release:	1
-License:	GPL
+License:	GPL v2+
 Group:		Applications/Printing
-Source0:	http://dl.sourceforge.net/muttprint/%{name}-%{version}.tar.gz
-# Source0-md5:	b3e99f8f6f37c0711f6e20f8cf3ef6cb
+Source0:	http://downloads.sourceforge.net/muttprint/%{name}-%{version}.tar.gz
+# Source0-md5:	39b76058b838e3078df93236eda2c316
+Source1:	%{name}-missing-files.tar.xz
+# Source1-md5:	c3d4a8796b85445bc378233c6203e4f2
+Patch0:		%{name}-docbook-fixes.patch
 URL:		http://muttprint.sourceforge.net/
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake
+BuildRequires:	docbook-utils
+BuildRequires:	perl-tools-pod
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	texlive-fonts-stmaryrd
+BuildRequires:	texlive-latex-marvosym
+BuildRequires:	xz
 Requires:	perl-Text-Iconv
 Requires:	psutils
 Requires:	tetex-latex
@@ -22,41 +33,45 @@ Muttprint formatuje wyjście klientów pocztowych w dobrze wyglądający
 wydruk.
 
 %prep
-%setup -q
-
-%{__make} -C langinfo clean
+%setup -q -a1
+%patch0 -p1
 
 %build
-%{__make} -C langinfo \
-	CC="%{__cc}" \
-	CCFLAGS="%{rpmcflags}"
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	prefix=$RPM_BUILD_ROOT%{_prefix} \
-	mandir=$RPM_BUILD_ROOT%{_mandir} \
-	sharedir=$RPM_BUILD_ROOT%{_datadir} \
-	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+	DESTDIR=$RPM_BUILD_ROOT
+
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/muttprint
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README* CHANGES
+%doc AUTHORS CHANGES NEWS README README.{Gnus,Latex,translations} doc/manual/en/manual-en.html sample-muttprintrc-en
+%lang(de) %doc doc/manual/de/manual-de.html sample-muttprintrc-de
+%lang(es) %doc README.es doc/manual/es/manual-es.html sample-muttprintrc-es
+%lang(fr) %doc sample-muttprintrc-fr
+%lang(it) %doc doc/manual/it/manual-it.html sample-muttprintrc-it
+%lang(nl) %doc sample-muttprintrc-nl
+%lang(sl) %doc doc/manual/sl/manual-sl.html sample-muttprintrc-si
 %attr(755,root,root) %{_bindir}/muttprint
 %attr(755,root,root) %{_bindir}/muttprint-langinfo
 %dir %{_datadir}/muttprint
 %{_datadir}/muttprint/*.eps
+%{_datadir}/muttprint/*.jpg
+%{_datadir}/muttprint/*.png
 %{_datadir}/muttprint/README.pics
 
-%doc sample-muttprintrc-en
-%lang(de) %doc sample-muttprintrc-de
-%lang(es) %doc sample-muttprintrc-es
-%lang(it) %doc sample-muttprintrc-it
-
 %dir %{_datadir}/muttprint/translations
 %lang(cs) %{_datadir}/muttprint/translations/translation-cs.pl
 %lang(de) %{_datadir}/muttprint/translations/translation-de.pl
@@ -73,12 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sv) %{_datadir}/muttprint/translations/translation-sv.pl
 %{_datadir}/muttprint/translations/translation-example.pl
 
-%doc doc/manual/en/manual-en
-%lang(de) %doc doc/manual/de/manual-de
-%lang(es) %doc doc/manual/es/manual-es
-%lang(it) %doc doc/manual/it/manual-it
-
-%{_mandir}/man1/*
-%lang(de) %{_mandir}/de/man1/*
-%lang(es) %{_mandir}/es/man1/*
-%lang(it) %{_mandir}/it/man1/*
+%{_mandir}/man1/muttprint.1*
+%lang(de) %{_mandir}/de/man1/muttprint.1*
+%lang(es) %{_mandir}/es/man1/muttprint.1*
+%lang(it) %{_mandir}/it/man1/muttprint.1*

More information about the test mailing list