This commit is contained in:
Zdenek Dohnal 2018-03-05 18:22:31 +01:00
parent 4423236685
commit 8df32f8fe8
4 changed files with 7 additions and 22 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@
/foomatic-filters-4.0.17-clean.tar.gz
/foomatic-db-engine-4.0.11.tar.gz
/foomatic-db-engine-4.0.12.tar.gz
/foomatic-db-engine-4.0.13.tar.gz

View File

@ -1,16 +0,0 @@
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

View File

@ -1,7 +1,7 @@
Summary: Tools for using the foomatic database of printers and printer drivers
Name: foomatic
Version: 4.0.12
Release: 23%{?dist}
Version: 4.0.13
Release: 1%{?dist}
License: GPLv2+
# printer-filters package has gone (bug #967316, bug #1035450).
@ -13,7 +13,6 @@ 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)
@ -65,8 +64,6 @@ 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
@ -144,6 +141,9 @@ exit 0
%{_var}/cache/foomatic
%changelog
* Mon Mar 05 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0.13-1
- 4.0.13
* Fri Mar 02 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0.12-23
- 1549741 - foomatic: Partial build flags injection

View File

@ -1 +1 @@
b8049e61a3dad76044e83dde0087e0a0 foomatic-db-engine-4.0.12.tar.gz
SHA512 (foomatic-db-engine-4.0.13.tar.gz) = da6a0dd9c0d7935d59a4bdd5454c1b7dcb81508f17a98ebfb9fd50fb6b5ed593f4b226715030f22c082c5328c7f7e99d775eeadcb444db5c8ad1441a11a179bf