From 60f9e682f6a6d6793e680cf3224aff7d1ee0108a Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 20 Dec 2024 13:38:36 +0300 Subject: [PATCH] import netpbm-11.02.00-10.el10 --- SOURCES/netpbm-shlib-ldflags.patch | 13 +++++++++++++ SPECS/netpbm.spec | 14 +++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 SOURCES/netpbm-shlib-ldflags.patch diff --git a/SOURCES/netpbm-shlib-ldflags.patch b/SOURCES/netpbm-shlib-ldflags.patch new file mode 100644 index 0000000..ffad115 --- /dev/null +++ b/SOURCES/netpbm-shlib-ldflags.patch @@ -0,0 +1,13 @@ +diff --git a/config.mk.in b/config.mk.in +index 50687ba..d35c982 100644 +--- a/config.mk.in ++++ b/config.mk.in +@@ -250,7 +250,7 @@ EXE = + + # Here, $(SONAME) resolves to the soname for the shared library being created. + # The following are gcc options. This works on GNU libc systems. +-LDSHLIB = -shared -Wl,-soname,$(SONAME) ++LDSHLIB = $(LDFLAGS) -shared -Wl,-soname,$(SONAME) + # You need -nostart instead of -shared on BeOS. Though the BeOS compiler is + # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc + # documentation and doesn't exist in at least one non-BeOS installation. diff --git a/SPECS/netpbm.spec b/SPECS/netpbm.spec index 888de71..d7bc176 100644 --- a/SPECS/netpbm.spec +++ b/SPECS/netpbm.spec @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats Name: netpbm Version: 11.02.00 -Release: 8%{?dist} +Release: 10%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain URL: http://netpbm.sourceforge.net/ @@ -29,7 +29,8 @@ Patch15: netpbm-manfix.patch Patch16: netpbm-jasper.patch Patch17: netpbm-libdir-so.patch Patch18: netpbm-c99.patch -Patch19: netpbm-c99-2.patch +Patch19: netpbm-c99-2.patch +Patch20: netpbm-shlib-ldflags.patch BuildRequires: make BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex, gcc, jbigkit-devel @@ -120,7 +121,7 @@ TOP=`pwd` make \ CC="%{__cc}" \ - LDFLAGS="$LD_FLAGS -L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \ + LDFLAGS="$LDFLAGS -L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \ CFLAGS="$CFLAGS -fPIC -flax-vector-conversions -fno-strict-aliasing" \ CFLAGS_CONFIG="$CFLAGS" \ LADD="-lm" \ @@ -230,6 +231,13 @@ popd %doc userguide/* %changelog +* Wed Dec 11 2024 Lukáš Zaoral - 11.02.00-10 +- build netpbm with correct LDFLAGS (RHEL-70899) + +* Tue Oct 29 2024 Troy Dawson - 11.02.00-9 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + * Fri Oct 25 2024 MSVSphere Packaging Team - 11.02.00-8 - Rebuilt for MSVSphere 10