From 170a3c44e37079b3ed9653e5df3fd2b0c32aa9e1276e0bcf0af5026f6d940cfa Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 30 Jul 2012 18:40:13 +0000 Subject: [PATCH] Accepting request 129332 from Publishing - Move styles where they belong to - Require packages for sgml2latex - Use texlive infrastructure - Quote brackets of the babel language mapping otherwise the sgml2latex tool ignores it OBS-URL: https://build.opensuse.org/request/show/129332 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sgmltool?expand=0&rev=14 --- sgml-tools-1.0.9-latex.diff | 22 +++++++++++++++ sgml-tools-1.0.9.dif | 8 +++--- sgmltool.changes | 13 +++++++++ sgmltool.spec | 55 ++++++++++++++++++++++++++++++------- 4 files changed, 84 insertions(+), 14 deletions(-) create mode 100644 sgml-tools-1.0.9-latex.diff diff --git a/sgml-tools-1.0.9-latex.diff b/sgml-tools-1.0.9-latex.diff new file mode 100644 index 0000000..c8a6049 --- /dev/null +++ b/sgml-tools-1.0.9-latex.diff @@ -0,0 +1,22 @@ +--- Makefile.in ++++ Makefile.in 2012-07-30 15:03:23.136010100 +0000 +@@ -24,6 +24,7 @@ BUILD_SGMLSASP=@BUILD_SGMLSASP@ + BUILD_NSGMLS=@BUILD_NSGMLS@ + BUILD_ENTITY_MAP=@BUILD_ENTITY_MAP@ + BUILD_ISO_ENTITIES=@BUILD_ISO_ENTITIES@ ++TEXMFMAIN=$(shell kpsewhich '-var-value=TEXMFMAIN') + + GENFILES := bin/sgmltools + progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2rtf \ +@@ -83,6 +84,11 @@ endif + if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi + chmod 755 $(DESTDIR)$(libdir) + cp -r lib/* $(DESTDIR)$(libdir) ++ mkdir -p $(DESTDIR)$(TEXMFMAIN)/tex/latex/sgml-tools ++ mv $(DESTDIR)$(libdir)/*.sty $(DESTDIR)$(TEXMFMAIN)/tex/latex/sgml-tools/ ++ mv $(DESTDIR)$(libdir)/*.tex $(DESTDIR)$(TEXMFMAIN)/tex/latex/sgml-tools/ ++ rm -f $(DESTDIR)$(TEXMFMAIN)/tex/latex/sgml-tools/epsf.* ++ rm -f $(DESTDIR)$(TEXMFMAIN)/tex/latex/sgml-tools/url.* + cp VERSION $(DESTDIR)$(libdir) + @echo "Installing man pages in $(mandir1) ..." + if [ ! -d $(DESTDIR)$(mandir1) ]; then mkdir -p $(DESTDIR)$(mandir1) ; fi diff --git a/sgml-tools-1.0.9.dif b/sgml-tools-1.0.9.dif index ee77a38..d93ae61 100644 --- a/sgml-tools-1.0.9.dif +++ b/sgml-tools-1.0.9.dif @@ -49,7 +49,7 @@ "\\usepackage\[latin1\]{inputenc}\n" "\\usepackage{t1enc}\n" - "\\usepackage{babel}\n" -+ "\\usepackage[english]{babel}\n" ++ "\\usepackage\[english\]{babel}\n" "\\usepackage{epsfig}\n" "\\usepackage{[OPTS]}\n" "\\def\\addbibtoc{\n" @@ -58,7 +58,7 @@ "\\usepackage\[latin1\]{inputenc}\n" "\\usepackage{t1enc}\n" - "\\usepackage{babel}\n" -+ "\\usepackage[english]{babel}\n" ++ "\\usepackage\[english\]{babel}\n" "\\usepackage{epsfig}\n" "\\usepackage{[OPTS]}\n" "\\def\\addbibtoc{\n" @@ -67,7 +67,7 @@ "\\usepackage\[latin1\]{inputenc}\n" "\\usepackage{t1enc}\n" - "\\usepackage{babel}\n" -+ "\\usepackage[english]{babel}\n" ++ "\\usepackage\[english\]{babel}\n" "\\usepackage{epsfig}\n" "\\usepackage{[OPTS]}\n" "\\def\\addbibtoc{\n" @@ -76,7 +76,7 @@ "\\usepackage\[latin1\]{inputenc}\n" "\\usepackage{t1enc}\n" - "\\usepackage{babel}\n" -+ "\\usepackage[english]{babel}\n" ++ "\\usepackage\[english\]{babel}\n" "\\usepackage{epsfig}\n" "\\usepackage{[OPTS]}\n" "\\def\\title#1{\n" diff --git a/sgmltool.changes b/sgmltool.changes index 66a3361..a2075f6 100644 --- a/sgmltool.changes +++ b/sgmltool.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jul 30 15:06:54 UTC 2012 - werner@suse.de + +- Move styles where they belong to +- Require packages for sgml2latex +- Use texlive infrastructure + +------------------------------------------------------------------- +Mon Jul 30 14:26:29 UTC 2012 - werner@suse.de + +- Quote brackets of the babel language mapping otherwise the + sgml2latex tool ignores it + ------------------------------------------------------------------- Tue Dec 15 20:24:31 CET 2009 - jengelh@medozas.de diff --git a/sgmltool.spec b/sgmltool.spec index 62ded98..b3f3ba5 100644 --- a/sgmltool.spec +++ b/sgmltool.spec @@ -1,7 +1,7 @@ # -# spec file for package sgmltool (Version 1.0.9) +# spec file for package sgmltool # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,33 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: sgmltool -BuildRequires: flex opensp -License: SUSE-Public-Domain -Group: Productivity/Publishing/SGML -Provides: sgml-tools +BuildRequires: flex +BuildRequires: opensp +%if 0%{suse_version} > 1220 +BuildRequires: texlive-kpathsea +%endif +Provides: sgml-tools Requires: opensp Requires: perl = %perl_version Requires: perl(Text::EntityMap) +%if 0%{suse_version} > 1220 +Requires: texlive-epsf +Requires: texlive-latex +Requires: texlive-url +%define _texmfmaindir %{_libexecdir}/texmf +Requires(post): coreutils +Requires(postun): coreutils +Requires(postun): texlive >= %{texlive_version} +Requires(posttrans): texlive >= %{texlive_version} +%endif Conflicts: linuxdoc -AutoReqProv: on Summary: SGML-Tools - a Text-Formatting Package +License: SUSE-Public-Domain +Group: Productivity/Publishing/SGML Version: 1.0.9 -Release: 1052 +Release: 0 Source: ftp://ftp.nllgg.nl/pub2/SGMLtools/v1.0/sgml-tools-%{version}.tar.bz2 Source1: lnd-1.0.tar.bz2 Patch: sgml-tools-1.0.9.dif @@ -42,6 +53,7 @@ Patch5: sgml-tools-retval.diff Patch6: cflags-sgml-tools-1.0.9.diff Patch7: sgml-tools-1.0.9-sgmlpre.diff Patch8: sgml-tools-1.0.9-strip.diff +Patch9: sgml-tools-1.0.9-latex.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -102,6 +114,9 @@ Authors: %patch6 -p 1 %patch7 -p 1 %patch8 +%if 0%{suse_version} > 1220 +%patch9 +%endif %build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -133,6 +148,23 @@ mv $RPM_BUILD_ROOT/usr/lib/perl5/Text/EntityMap.pm $RPM_BUILD_ROOT$perlpath/ %clean rm -fr $RPM_BUILD_ROOT +%if 0%{suse_version} > 1220 +%post +mkdir -p /var/run/texlive +> /var/run/texlive/run-mktexlsr + +%postun +if test $1 = 0; then + %{_bindir}/mktexlsr 2> /dev/null || : + exit 0 +fi +mkdir -p /var/run/texlive +> /var/run/texlive/run-mktexlsr + +%posttrans +VERBOSE=false %{_texmfmaindir}/texconfig/update || : +%endif + %files %defattr(-,root,root) %doc lnd-1.0 @@ -157,6 +189,9 @@ rm -fr $RPM_BUILD_ROOT %dir /usr/lib/sgml /usr/lib/sgml-tools /usr/lib/sgml/iso-entities-8879.1986 +%if 0%{suse_version} > 1220 +/usr/lib/texmf/tex/latex/sgml-tools +%endif %{_mandir}/man1/sgml2html.1.gz %{_mandir}/man1/sgml2info.1.gz %{_mandir}/man1/sgml2latex.1.gz