Sync from SUSE:SLFO:Main sgmltool revision 871bdb2a629be3dfef5f9461845a3bce
This commit is contained in:
parent
b5a50dfad3
commit
01b007d91d
@ -1,17 +1,37 @@
|
|||||||
--- sgml-tools-1.0.9/Makefile.in.~1~ 2005-10-10 11:46:17.000000000 +0200
|
--- sgml-tools-1.0.9/Makefile.in.~1~ 2005-10-10 11:46:17.000000000 +0200
|
||||||
+++ sgml-tools-1.0.9/Makefile.in 2005-10-10 14:05:24.000000000 +0200
|
+++ sgml-tools-1.0.9/Makefile.in 2005-10-10 14:05:24.000000000 +0200
|
||||||
|
--- sgml-tools-1.0.9.orig/Makefile.in
|
||||||
|
+++ sgml-tools-1.0.9/Makefile.in
|
||||||
|
@@ -34,7 +34,7 @@ all: gen
|
||||||
|
ifeq ($(BUILD_SGMLSASP), true)
|
||||||
|
@echo "Compiling the SGML parsing tools (in sgmls-1.1/)..."
|
||||||
|
( cd sgmls-1.1 ; \
|
||||||
|
- $(MAKE) OPTIMIZE="$(OPTIMIZE)" sgmlsasp )
|
||||||
|
+ $(MAKE) CFLAGS="$(CFLAGS)" OPTIMIZE="$(OPTIMIZE)" sgmlsasp )
|
||||||
|
endif
|
||||||
|
ifeq ($(BUILD_NSGMLS), true)
|
||||||
|
@echo "Compiling the SGML parsing tools (in sp/)..."
|
||||||
@@ -49,10 +49,10 @@
|
@@ -49,10 +49,10 @@
|
||||||
endif
|
endif
|
||||||
@echo "Compiling preprocessor (in sgmlpre/)..."
|
@echo "Compiling preprocessor (in sgmlpre/)..."
|
||||||
( cd sgmlpre ; \
|
( cd sgmlpre ; \
|
||||||
- $(MAKE) CFLAGS="$(OPTIMIZE)" LEX=flex sgmlpre || exit -1 )
|
- $(MAKE) CFLAGS="$(OPTIMIZE)" LEX=flex sgmlpre || exit -1 )
|
||||||
+ $(MAKE) OPTIMIZE="$(OPTIMIZE)" LEX=flex sgmlpre || exit -1 )
|
+ $(MAKE) CFLAGS="$(CFLAGS)" OPTIMIZE="$(OPTIMIZE)" LEX=flex sgmlpre || exit -1 )
|
||||||
@echo "Compiling RTF conversion tools (in rtf-fix/)..."
|
@echo "Compiling RTF conversion tools (in rtf-fix/)..."
|
||||||
( cd rtf-fix ; \
|
( cd rtf-fix ; \
|
||||||
- $(MAKE) CFLAGS="$(OPTIMIZE)" || exit -1 )
|
- $(MAKE) CFLAGS="$(OPTIMIZE)" || exit -1 )
|
||||||
+ $(MAKE) OPTIMIZE="$(OPTIMIZE)" || exit -1 )
|
+ $(MAKE) CFLAGS="$(CFLAGS)" OPTIMIZE="$(OPTIMIZE)" || exit -1 )
|
||||||
|
|
||||||
install::
|
install::
|
||||||
@echo "Installing binaries in $(bindir) ..."
|
@echo "Installing binaries in $(bindir) ..."
|
||||||
|
--- sgml-tools-1.0.9.orig/sgmls-1.1/Makefile
|
||||||
Diff finished. Mon Oct 10 14:05:44 2005
|
+++ sgml-tools-1.0.9/sgmls-1.1/Makefile
|
||||||
|
@@ -21,7 +21,7 @@ INCLUDE=
|
||||||
|
OPTIMIZE=-O
|
||||||
|
DEBUG=
|
||||||
|
WARN=
|
||||||
|
-CFLAGS=$(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
|
||||||
|
+CFLAGS=$(CFLAGS) $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
|
||||||
|
LDFLAGS=$(DEBUG) $(PROFILE)
|
||||||
|
# Additional libraries needed.
|
||||||
|
# Ultrix needs -li
|
||||||
|
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 15 11:08:21 UTC 2024 - Martin Jambor <mjambor@suse.com>
|
||||||
|
|
||||||
|
- Fix up cflags-sgml-tools-1.0.9.diff so that %optflags are not
|
||||||
|
completely lost. Added -fpermissive to %optflags in order to
|
||||||
|
make GCC 14 treat a number of C99 violations as mere warnings
|
||||||
|
by default. [boo#1225928]
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 26 13:08:20 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Use %patch -P N instead of deprecated %patchN.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Sep 30 10:16:15 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
Mon Sep 30 10:16:15 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package sgmltool
|
# spec file for package sgmltool
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -80,18 +80,19 @@ This package contains the LaTeX generator (sgml2latex) from sgmltool.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n sgml-tools-%{version} -a1
|
%setup -q -n sgml-tools-%{version} -a1
|
||||||
%patch0
|
%patch -P 0
|
||||||
%patch1 -p1
|
%patch -P 1 -p1
|
||||||
%patch2 -p1
|
%patch -P 2 -p1
|
||||||
%patch3 -p1
|
%patch -P 3 -p1
|
||||||
%patch4 -p1
|
%patch -P 4 -p1
|
||||||
%patch5
|
%patch -P 5
|
||||||
%patch6 -p1
|
%patch -P 6 -p1
|
||||||
%patch7 -p1
|
%patch -P 7 -p1
|
||||||
%patch8
|
%patch -P 8
|
||||||
%patch9
|
%patch -P 9
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
#%global optflags %{optflags} -fpermissive
|
||||||
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||||
%configure \
|
%configure \
|
||||||
--prefix="%{buildroot}/%{_prefix}" \
|
--prefix="%{buildroot}/%{_prefix}" \
|
||||||
|
Loading…
Reference in New Issue
Block a user