Accepting request 986720 from Base:System

- Do not unset various variables when calling make (only CFLAGS
  should be set).

OBS-URL: https://build.opensuse.org/request/show/986720
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/par_text?expand=0&rev=3

par-1.53-i18n.1.patch

@@ -6,11 +6,11 @@
  errmsg.c      |   12 +
  errmsg.h      |   12 +
  par.c         |  444 ++++++++++++++++++++++++++++++----------------------------
- protoMakefile |    2 
+ protoMakefile |    8 -
  reformat.c    |  168 +++++++++++++--------
  reformat.h    |    6 
  releasenotes  |   16 ++
- 11 files changed, 419 insertions(+), 324 deletions(-)
+ 12 files changed, 423 insertions(+), 328 deletions(-)
 
 --- a/buffer.c
 +++ b/buffer.c
@@ -1244,15 +1244,28 @@
    return *errmsg ? EXIT_FAILURE : EXIT_SUCCESS;
 --- a/protoMakefile
 +++ b/protoMakefile
-@@ -47,7 +47,7 @@
+@@ -45,9 +45,9 @@
+ # Example (for Solaris 2.x with SPARCompiler C):
+ # CC = cc -c -O -s -Xc -DDONTFREE
  
- CPPFLAGS =
- CFLAGS =
+-CPPFLAGS =
+-CFLAGS =
 -CC = cc $(CPPFLAGS) $(CFLAGS) -c
++CPPFLAGS ?=
++CFLAGS ?=
 +CC = cc -std=c99 $(CPPFLAGS) $(CFLAGS) -c
  
  # Define LINK1 and LINK2 so that the command
  #
+@@ -62,7 +62,7 @@ CC = cc $(CPPFLAGS) $(CFLAGS) -c
+ # LINK2 = -o
+ 
+ LINK1 = cc
+-LINK2 = -o
++LINK2 = $(CFLAGS) $(CPPFLAGS) -o
+ 
+ # Define RM so that the command
+ #
 --- a/reformat.c
 +++ b/reformat.c
 @@ -3,6 +3,7 @@ reformat.c

par_text.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  4 18:11:38 UTC 2022 - Matej Cepl <mcepl@suse.com>
+
+- Do not unset various variables when calling make (only CFLAGS
+  should be set).
+
 -------------------------------------------------------------------
 Tue Jun 28 10:12:55 UTC 2022 - Matej Cepl <mcepl@suse.com>
 

par_text.spec

@@ -57,7 +57,7 @@ end in the same column.
 %autosetup -p1 -n %{upname}-%{version}
 
 %build
-make -f protoMakefile CC="cc -c" LINK1="cc" LINK2="-o" RM="rm" JUNK="" %{?_smp_mflags} CFLAGS="%{optflags}"$*
+make -f protoMakefile %{?_smp_mflags} CFLAGS="%{optflags}" $*
 
 %install
 install -D -t %{buildroot}/%{_bindir} par