commit e9b5728047ff2484deef460a05b9bfa5691ba4f4
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date:   Mon Jun 24 20:25:59 2024 +0200

    - up to 3.0.3

 sgml2info.1.pl                   | 46 ------------------------
 sgml2txt.1.pl                    | 68 -----------------------------------
 sgmltools-lite-Makefile.in.patch | 55 ++++++++++++++--------------
 sgmltools-lite.spec              | 77 +++++++++++-----------------------------
 4 files changed, 48 insertions(+), 198 deletions(-)
---
diff --git a/sgmltools-lite.spec b/sgmltools-lite.spec
index 4223908..a5bc53d 100644
--- a/sgmltools-lite.spec
+++ b/sgmltools-lite.spec
@@ -5,18 +5,15 @@ Summary(nl.UTF-8):    Tekstformateringssysteem welke door het 
Linux Documentatie Pr
 Summary(pl.UTF-8):     Narzędzia konwertujące do linuxdoc-dtd
 Summary(tr.UTF-8):     GNU belge biçimlendirme sistemi
 Name:          sgmltools-lite
-Version:       3.0.2
+Version:       3.0.3
 Release:       0.1
-License:       GPL
+License:       GPL v2+
 Group:         Applications/Publishing/SGML
-Source0:       
http://dl.sourceforge.net/sgmltools-lite/%{name}-%{version}.tar.gz
-# Source0-md5: 9f88d015eacf4c1be33711723b53ac43
-Source1:       sgml2info.1.pl
-Source2:       sgml2txt.1.pl
+Source0:       
https://downloads.sourceforge.net/sgmltools-lite/%{name}-%{version}.tar.gz
+# Source0-md5: dab77d3d751ca381a95ccebd88480a85
 Patch0:                %{name}-Makefile.in.patch
 Patch1:                %{name}-configure.patch
-
-URL:           http://sgmltools-lite.sourceforge.net
+URL:           https://sgmltools-lite.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: groff
 BuildRequires: openjade
@@ -76,42 +73,23 @@ LinuxDoc DTD.
 %description dtd -l pl.UTF-8
 LinuxDoc DTD.
 
-%package -n sgmls
-Summary:       sgmls
-Summary(pl.UTF-8):     sgmls
-Version:       1.1
-Group:         Applications/Publishing/SGML
-
-%description -n sgmls
-sgmls - a validating SGML parser.
-
-%description -n sgmls -l pl.UTF-8
-sgmls - parser sprawdzający poprawność SGML.
-
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1 
-rm config.cache
-rm config.status
 
 %build
-#%%{__aclocal}
-#%%{__autoconf}
-#%%{__automake}
+export PYTHON=%{__python}
 %configure2_13
+
 %{__make} 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
-%makeinstall \
-       libdir=$RPM_BUILD_ROOT%{_datadir}/sgml-tools \
-       perl5libdir=$RPM_BUILD_ROOT%{perl_vendorlib} \
+%{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -125,33 +103,18 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/{html,guide*,example*,Makedoc.sh,README}
-%{_datadir}/sgml-tools
-%{perl_vendorlib}/Text/EntityMap.pm
-%attr(755,root,root) %{_bindir}/rtf2rtf
-%attr(755,root,root) %{_bindir}/sgmlpre
-%attr(755,root,root) %{_bindir}/sgml2*
-%attr(755,root,root) %{_bindir}/sgmltools.v1
-%attr(755,root,root) %{_bindir}/sgmlcheck
-
-%{_mandir}/man1/sgml2*.1*
-%{_mandir}/man1/sgmlcheck.1*
-%{_mandir}/man1/sgmltools.1*
-%lang(pl) %{_mandir}/pl/man1/sgml2*.1*
-
-%files -n sgmls
-%defattr(644,root,root,755)
-%doc sgmls-1.1/LICENSE sgmls-1.1/NEWS
-%attr(755,root,root) %{_bindir}/rast
-%attr(755,root,root) %{_bindir}/sgmls
-%attr(755,root,root) %{_bindir}/sgmlsasp
-%attr(755,root,root) %{_bindir}/sgmls.pl
-
-%{_mandir}/man1/rast.1*
-%{_mandir}/man1/sgmls.1*
-%{_mandir}/man1/sgmlsasp.1*
+%doc ChangeLog POSTINSTALL README
+%attr(755,root,root) %{_bindir}/buildcat
+%attr(755,root,root) %{_bindir}/gensgmlenv
+%attr(755,root,root) %{_bindir}/sgmltools
+%attr(755,root,root) %{_bindir}/sgmlwhich
+%{_mandir}/man1/sgmltools-lite.1*
 
 %files dtd
 %defattr(644,root,root,755)
-%{_datadir}/sgml/sgml-tools
-%{_datadir}/entity-map
+%dir %{_datadir}/sgml/dtd
+%{_datadir}/sgml/dtd/sgmltools
+%dir %{_datadir}/sgml/misc
+%{_datadir}/sgml/misc/sgmltools
+%dir %{_datadir}/sgml/stylesheets
+%{_datadir}/sgml/stylesheets/sgmltools
diff --git a/sgml2info.1.pl b/sgml2info.1.pl
deleted file mode 100644
index fb4bb16..0000000
--- a/sgml2info.1.pl
+++ /dev/null
@@ -1,46 +0,0 @@
-.\" {PTM/WK/2000-VI}
-.\" Process this file with
-.\" groff -man -Tascii sgml2info.1
-.\"
-.TH SGML2INFO 1 "10 listopada 1997"
-.SH NAZWA
-sgml2info \- tw�rz wyj�cie GNU info z pliku �r�d�owego SGML
-.SH SK�ADNIA
-.B sgml2info
-.RB [ opcja og�lna ...]
-.IR plik [\fB.sgml\fP]
-.SH OPIS
-.B sgml2info
-konwertuje plik �r�d�owy z formatu SGML na format GNU info.
-Wynik pojawi si� w
-.IR plik.info ,
-gdzie
-.I plik
-jest nazw� pliku �r�d�owego SGML.
-.LP
-Do ustawie� warunkowych (conditionals) ustawiana jest para atrybut/warto��
-"output=info".
-.SH OPCJE
-.B sgml2info
-przyjmuje wszystkie opcje og�lne opisane w
-.BR sgmltools (1).
-.IP plik
-okre�la plik �r�d�owy SGML, o nazwie albo
-.I plik
-albo
-.I plik.sgml
-.SH PLIKI
-Wykorzystywanych jest wiele plik�w z
-.BR $LINUXDOCLIB .
-.SH AUTOR
-Christian Schwarz <schw...@monet.m.isar.de>,
-Greg Hankins <greg.hank...@cc.gatech.edu>,
-Cees de Groot <c...@pobox.com>.
-.SH "ZOBACZ TAK�E"
-.BR sgmltools (1),
-.BR sgml2html (1),
-.BR sgml2latex (1), 
-.BR sgml2lyx (1), 
-.BR sgml2rtf (1), 
-.BR sgml2txt (1),
-.BR sgmlcheck (1). 
diff --git a/sgml2txt.1.pl b/sgml2txt.1.pl
deleted file mode 100644
index 4315a3e..0000000
--- a/sgml2txt.1.pl
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" {PTM/WK/2000-VI}
-.\" Process this file with
-.\" groff -man -Tascii sgml2txt.1
-.\"
-.TH SGML2TXT 1 "10 listopada 1997"
-.SH NAZWA
-sgml2txt \- tw�rz zwyk�y tekst z pliku �r�d�owego SGML
-.SH SK�ADNIA
-.B sgml2txt
-.RB [ opcja-og�lna ...]
-.RB [ --man ]
-.RB [ --filter ]
-.IR plik [\fB.sgml\fP]
-.SH OPIS
-.B sgml2txt
-konwertuje plik �r�d�owy SGML na wyj�cie w ASCII lub ISO-8859-1.
-Wynik pojawi si� w
-.IR plik.txt ,
-gdzie
-.I plik
-jest nazw� pliku �r�d�owego SGML.
-.LP
-Do ustawie� warunkowych (conditionals) ustawiana jest para atrybut/warto��
-"output=txt".
-.SH OPCJE
-.B sgml2info
-przyjmuje wszystkie opcje og�lne opisane w
-.B sgmltools (1)
-oraz nast�puj�ce opcje charakterystyczne:
-.TP
-.BR --man ", " -m
-Daje w wyniku plik �r�d�owy groff, odpowiedni do utworzenia przez
-.B groff -man
-sformatowanych stron podr�cznika systemowego man.
-.TP
-.BR --filter ", " -f
-Usuwa z postaci po�redniej utworzonej przez
-.BR groff (1)
-nadpisania wykonane z u�yciem backspace.
-.TP
-.BR --pass ", " -P
-Argument opcji pass (przeka�) dodawany jest do opcji wiersza polece�
-obs�ugiwanej przez
-.BR groff (1).
-.IP plik
-okre�la plik �r�d�owy SGML, o nazwie albo
-.I plik
-albo
-.I plik.sgml
-.SH PLIKI
-Wykorzystywanych jest wiele plik�w z
-.B $LINUXDOCLIB
-i
-.BR $LINUXDOCBIN .
-.SH B��DY
-Nie znaleziono.
-.SH AUTOR
-Greg Hankins <greg.hank...@cc.gatech.edu>, w oparciu o skrypty
-Toma Gordona i Alexandra Horza.
-Napisane ponownie przez Cees de Groot <c...@pobox.com>.
-.SH "ZOBACZ TAK�E"
-.BR sgmltools (1),
-.BR sgml2html (1),
-.BR sgml2info (1),
-.BR sgml2latex (1),
-.BR sgml2lyx (1),
-.BR sgml2rtf (1),
-.BR sgmlcheck (1).
diff --git a/sgmltools-lite-Makefile.in.patch b/sgmltools-lite-Makefile.in.patch
index da406e0..dd8c21d 100644
--- a/sgmltools-lite-Makefile.in.patch
+++ b/sgmltools-lite-Makefile.in.patch
@@ -1,6 +1,6 @@
---- sgmltools-lite-3.0.2/Makefile.in~  2004-10-12 03:55:31.695575848 +0200
-+++ sgmltools-lite-3.0.2/Makefile.in   2004-10-12 03:55:31.697575544 +0200
-@@ -46,41 +46,41 @@
+--- sgmltools-lite-3.0.3/Makefile.in.orig      2024-06-24 19:26:42.269157360 
+0200
++++ sgmltools-lite-3.0.3/Makefile.in   2024-06-24 19:46:05.352856395 +0200
+@@ -46,41 +46,41 @@ all: VERSION
  
  .PHONY: install
  install: all
@@ -11,56 +11,57 @@
 -      $(INSTALL_PROGRAM) bin/gensgmlenv $(bindir)/gensgmlenv
 -      $(INSTALL_PROGRAM) bin/sgmlwhich $(bindir)/sgmlwhich
 -      -umask 022;$(MKDIRHIER) $(stylesheets)
-+      -$(MKDIRHIER) ${DESTDIR}/$(bindir)
-+      -$(MKDIRHIER) ${DESTDIR}/$(etcdir)/catalog.d
-+      $(INSTALL_PROGRAM) bin/sgmltools ${DESTDIR}/$(bindir)/sgmltools
-+      $(INSTALL_PROGRAM) bin/buildcat ${DESTDIR}/$(bindir)/buildcat
-+      $(INSTALL_PROGRAM) bin/gensgmlenv ${DESTDIR}/$(bindir)/gensgmlenv
-+      $(INSTALL_PROGRAM) bin/sgmlwhich ${DESTDIR}/$(bindir)/sgmlwhich
-+      -umask 022;$(MKDIRHIER) ${DESTDIR}/$(stylesheets)
++      -$(MKDIRHIER) $(DESTDIR)$(bindir)
++      -$(MKDIRHIER) $(DESTDIR)$(etcdir)/catalog.d
++      $(INSTALL_PROGRAM) bin/sgmltools $(DESTDIR)$(bindir)/sgmltools
++      $(INSTALL_PROGRAM) bin/buildcat $(DESTDIR)$(bindir)/buildcat
++      $(INSTALL_PROGRAM) bin/gensgmlenv $(DESTDIR)$(bindir)/gensgmlenv
++      $(INSTALL_PROGRAM) bin/sgmlwhich $(DESTDIR)$(bindir)/sgmlwhich
++      -umask 022;$(MKDIRHIER) $(DESTDIR)$(stylesheets)
          set -e; for i in dsssl/*.dsl dsssl/*.cat; do \
 -          $(INSTALL_DATA) $$i $(stylesheets); \
-+          $(INSTALL_DATA) $$i ${DESTDIR}/$(stylesheets); \
++          $(INSTALL_DATA) $$i $(DESTDIR)$(stylesheets); \
          done;
 -      -umask 022;$(MKDIRHIER) $(dtds)
-+      -umask 022;$(MKDIRHIER) ${DESTDIR}/$(dtds)
++      -umask 022;$(MKDIRHIER) $(DESTDIR)$(dtds)
          set -e; for i in dtd/[a-z]*; do \
 -          $(INSTALL_DATA) $$i $(dtds); \
-+          $(INSTALL_DATA) $$i ${DESTDIR}/$(dtds); \
++          $(INSTALL_DATA) $$i $(DESTDIR)$(dtds); \
          done;
 -      -umask 022;$(MKDIRHIER) $(mandir)/man1
--      $(INSTALL_DATA) man/sgmltools.1 $(mandir)/man1
+-      $(INSTALL_DATA) man/sgmltools-lite.1 $(mandir)/man1
 -      -umask 022;$(MKDIRHIER) $(SHAREDIR)/misc/sgmltools/site-backends
 -      -umask 022;$(MKDIRHIER) $(SHAREDIR)/misc/sgmltools/python/backends
-+      -umask 022;$(MKDIRHIER) ${DESTDIR}/$(mandir)/man1
-+      $(INSTALL_DATA) man/sgmltools.1 ${DESTDIR}/$(mandir)/man1
-+      -umask 022;$(MKDIRHIER) 
${DESTDIR}/$(SHAREDIR)/misc/sgmltools/site-backends
-+      -umask 022;$(MKDIRHIER) 
${DESTDIR}/$(SHAREDIR)/misc/sgmltools/python/backends
++      -umask 022;$(MKDIRHIER) $(DESTDIR)$(mandir)/man1
++      $(INSTALL_DATA) man/sgmltools-lite.1 $(DESTDIR)$(mandir)/man1
++      -umask 022;$(MKDIRHIER) 
$(DESTDIR)$(SHAREDIR)/misc/sgmltools/site-backends
++      -umask 022;$(MKDIRHIER) 
$(DESTDIR)$(SHAREDIR)/misc/sgmltools/python/backends
          set -e; for i in python/*.py; do \
 -          $(INSTALL_DATA) $$i $(SHAREDIR)/misc/sgmltools/python; \
-+          $(INSTALL_DATA) $$i ${DESTDIR}/$(SHAREDIR)/misc/sgmltools/python; \
++          $(INSTALL_DATA) $$i $(DESTDIR)$(SHAREDIR)/misc/sgmltools/python; \
          done
          set -e; for i in python/backends/*.py; do \
 -          $(INSTALL_DATA) $$i $(SHAREDIR)/misc/sgmltools/python/backends; \
-+          $(INSTALL_DATA) $$i 
${DESTDIR}/$(SHAREDIR)/misc/sgmltools/python/backends; \
++          $(INSTALL_DATA) $$i 
$(DESTDIR)$(SHAREDIR)/misc/sgmltools/python/backends; \
          done; 
 -      -umask 022;$(MKDIRHIER) $(etcdir)
-+      -umask 022;$(MKDIRHIER) ${DESTDIR}/$(etcdir)
++      -umask 022;$(MKDIRHIER) $(DESTDIR)$(etcdir)
        set -e; for i in catalog.rh62 catalog.suse aliases; do \
 -          if test -f $(etcdir)/$$i; then \
 -              $(INSTALL_DATA) $$i $(etcdir)/$$i.new; \
-+          if test -f ${DESTDIR}/$(etcdir)/$$i; then \
-+              $(INSTALL_DATA) $$i ${DESTDIR}/$(etcdir)/$$i.new; \
-               echo "** Installed distributed $$i as $(etcdir)/$$i.new"; \
+-              echo "** Installed distributed $$i as $(etcdir)/$$i.new"; \
++          if test -f $(DESTDIR)$(etcdir)/$$i; then \
++              $(INSTALL_DATA) $$i $(DESTDIR)$(etcdir)/$$i.new; \
++              echo "** Installed distributed $$i as 
$(DESTDIR)$(etcdir)/$$i.new"; \
            else \
 -              $(INSTALL_DATA) $$i $(etcdir); \
-+              $(INSTALL_DATA) $$i ${DESTDIR}/$(etcdir); \
++              $(INSTALL_DATA) $$i $(DESTDIR)$(etcdir); \
            fi; \
        done
 -      $(INSTALL_DATA) VERSION $(SHAREDIR)/misc/sgmltools
 -      #$(INSTALL_DATA) ../../../COPYING $(SHAREDIR)/misc/sgmltools
-+      $(INSTALL_DATA) VERSION ${DESTDIR}/$(SHAREDIR)/misc/sgmltools
-+      #$(INSTALL_DATA) ../../../COPYING ${DESTDIR}/$(SHAREDIR)/misc/sgmltools
++      $(INSTALL_DATA) VERSION $(DESTDIR)$(SHAREDIR)/misc/sgmltools
++      #$(INSTALL_DATA) ../../../COPYING $(DESTDIR)$(SHAREDIR)/misc/sgmltools
        @echo ""
        @echo ""
        @echo ""
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sgmltools-lite.git/commitdiff/e9b5728047ff2484deef460a05b9bfa5691ba4f4

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to