diff --git a/splix-ldflags.patch b/splix-ldflags.patch new file mode 100644 index 0000000..6a51982 --- /dev/null +++ b/splix-ldflags.patch @@ -0,0 +1,18 @@ +diff -up splix/rules.mk.ldflags splix/rules.mk +--- splix/rules.mk.ldflags 2018-03-02 16:27:57.144794476 +0100 ++++ splix/rules.mk 2018-03-02 16:29:01.268292764 +0100 +@@ -6,12 +6,12 @@ + + $(rastertoqpdl_TARGET): $(rastertoqpdl_OBJ) + $(call printCmd, $(cmd_link)) +- $(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \ ++ $(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) $(LDFLAGS) \ + $(rastertoqpdl_LIBS) + + $(pstoqpdl_TARGET): $(pstoqpdl_OBJ) + $(call printCmd, $(cmd_link)) +- $(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \ ++ $(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) $(LDFLAGS) \ + $(pstoqpdl_LIBS) + + .PHONY: install installcms diff --git a/splix.spec b/splix.spec index f9b54ae..afb4540 100644 --- a/splix.spec +++ b/splix.spec @@ -3,7 +3,7 @@ Summary: Driver for QPDL/SPL2 printers (Samsung and several Xerox printers) Name: splix Version: 2.0.1 -Release: 0.35.%{checkout}%{?dist} +Release: 0.36.%{checkout}%{?dist} License: GPLv2 URL: http://splix.sourceforge.net/ @@ -14,6 +14,8 @@ Source0: splix-%{version}.%{checkout}.tar.bz2 # IEEE 1284 Device IDs Patch0: splix-deviceID.patch +# rules.mk misses LDFLAGS +Patch1: splix-ldflags.patch Requires: cups @@ -47,8 +49,10 @@ make distclean popd %patch0 -p1 -b .deviceID +%patch1 -p1 -b .ldflags %build +%set_build_flags # *.drv.in -> *.drv make drv @@ -66,6 +70,9 @@ make install DRV_ONLY=1 CUPSDRV=%{_datadir}/cups/drv/splix DESTDIR=%{buildroot} %{_datadir}/cups/drv/splix %changelog +* Fri Mar 02 2018 Zdenek Dohnal - 2.0.1-0.36.20130902svn +- 1550554 - splix: Partial Fedora build flags injection + * Mon Feb 19 2018 Zdenek Dohnal - 2.0.1-0.35.20130902svn - gcc-c++ is no longer in buildroot by default