commit sgmltool for openSUSE:Factory

30 Jul 2012

Hello community,

here is the log from the commit of package sgmltool for openSUSE:Factory checked in at 2012-07-30 20:40:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sgmltool (Old)
 and      /work/SRC/openSUSE:Factory/.sgmltool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "sgmltool", Maintainer is "ke@suse.com"

Changes:
--------

--- /work/SRC/openSUSE:Factory/sgmltool/sgmltool.changes	2011-09-23 12:46:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sgmltool.new/sgmltool.changes	2012-07-30 20:40:56.000000000 +0200
@@ -1,0 +2,13 @@
+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 
+
+-------------------------------------------------------------------

New:
----
  sgml-tools-1.0.9-latex.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sgmltool.spec ++++++
--- /var/tmp/diff_new_pack.iG8o2e/_old	2012-07-30 20:41:00.000000000 +0200
+++ /var/tmp/diff_new_pack.iG8o2e/_new	2012-07-30 20:41:00.000000000 +0200
@@ -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
+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 @@
 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 @@
 %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 @@
 %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 @@
 %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

++++++ sgml-tools-1.0.9-latex.diff ++++++
--- 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
++++++ sgml-tools-1.0.9.dif ++++++
--- /var/tmp/diff_new_pack.iG8o2e/_old	2012-07-30 20:41:00.000000000 +0200
+++ /var/tmp/diff_new_pack.iG8o2e/_new	2012-07-30 20:41:00.000000000 +0200
@@ -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"

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)