From 4423236685fb3fd2677d86f240ae4817b273af3b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mar 02 2018 14:57:52 +0000 Subject: 1549741 - foomatic: Partial build flags injection --- diff --git a/foomatic-ldflags.patch b/foomatic-ldflags.patch new file mode 100644 index 0000000..f230dd8 --- /dev/null +++ b/foomatic-ldflags.patch @@ -0,0 +1,16 @@ +diff -up foomatic-db-engine-4.0.12/Makefile.in.ldflags foomatic-db-engine-4.0.12/Makefile.in +--- foomatic-db-engine-4.0.12/Makefile.in.ldflags 2018-03-02 15:44:15.956764348 +0100 ++++ foomatic-db-engine-4.0.12/Makefile.in 2018-03-02 15:47:18.815459860 +0100 +@@ -231,10 +231,10 @@ lib/Makefile: lib/Makefile.PL + ( cd lib && $(PERL) Makefile.PL verbose INSTALLDIRS=$(PERL_INSTALLDIRS) ) + + foomatic-combo-xml: foomatic-combo-xml.c +- $(CC) $(CFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c + + foomatic-perl-data: foomatic-perl-data.c +- $(CC) $(CFLAGS) $(XML_CFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_LIBS) ++ $(CC) $(CFLAGS) $(XML_CFLAGS) $(LDFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_LIBS) + + man: lib/Foomatic/Defaults.pm + chmod a+rx ./makeMan diff --git a/foomatic.spec b/foomatic.spec index 3de95ec..a862b1e 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -1,7 +1,7 @@ Summary: Tools for using the foomatic database of printers and printer drivers Name: foomatic Version: 4.0.12 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ # printer-filters package has gone (bug #967316, bug #1035450). @@ -13,6 +13,7 @@ Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{vers ## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200) Patch101: foomatic-manpages.patch +Patch102: foomatic-ldflags.patch ## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300) @@ -64,6 +65,8 @@ The site http://www.linuxprinting.org/ is based on this database. # Ship more manpages. %patch101 -p1 -b .manpages +# use LDFLAGS during linking +%patch102 -p1 -b .ldflags chmod a+x mkinstalldirs @@ -141,6 +144,9 @@ exit 0 %{_var}/cache/foomatic %changelog +* Fri Mar 02 2018 Zdenek Dohnal - 4.0.12-23 +- 1549741 - foomatic: Partial build flags injection + * Wed Feb 28 2018 Zdenek Dohnal - 4.0.12-22 - Rebuilt for new foomatic-db snapshot