Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/splix.git#72fccdd07d0499e17e85d906e08ca22dd068e592

splix-cxx.patch

@@ -0,0 +1,18 @@
+diff -ruN splix.orig/rules.mk splix/rules.mk
+--- splix.orig/rules.mk	2020-11-17 15:29:33.504520423 +0100
++++ splix/rules.mk	2020-11-17 15:30:12.081410829 +0100
+@@ -6,12 +6,12 @@
+ 
+ $(rastertoqpdl_TARGET): $(rastertoqpdl_OBJ)
+ 	$(call printCmd, $(cmd_link))
+-	$(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) $(LDFLAGS) \
++	$(Q)$(CXX) -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) $(LDFLAGS) \
+ 		$(rastertoqpdl_LIBS)
+ 
+ $(pstoqpdl_TARGET): $(pstoqpdl_OBJ)
+ 	$(call printCmd, $(cmd_link))
+-	$(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) $(LDFLAGS) \
++	$(Q)$(CXX) -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) $(LDFLAGS) \
+ 		$(pstoqpdl_LIBS)
+ 
+ .PHONY: install installcms

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.43.%{checkout}%{?dist}
+Release: 0.44.%{checkout}%{?dist}
 License: GPLv2
 URL: http://splix.sourceforge.net/
 
@@ -16,6 +16,7 @@ Source0: splix-%{version}.%{checkout}.tar.bz2
 Patch0:  splix-deviceID.patch
 # rules.mk misses LDFLAGS
 Patch1:  splix-ldflags.patch
+Patch2:  splix-cxx.patch
 
 Requires: cups
 
@@ -52,6 +53,7 @@ popd
 
 %patch0 -p1 -b .deviceID
 %patch1 -p1 -b .ldflags
+%patch2 -p1 -b .cxx
 
 %build
 %set_build_flags
@@ -59,7 +61,7 @@ popd
 %make_build drv
 
 CXXFLAGS="%{optflags} -fno-strict-aliasing" \
-%make_build all V=1 DRV_ONLY=1
+%make_build all V=1 DRV_ONLY=1 LDFLAGS="%{build_ldflags} -pie"
 
 %install
 %make_install DRV_ONLY=1 CUPSDRV=%{_datadir}/cups/drv/splix
@@ -72,6 +74,9 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" \
 %{_datadir}/cups/drv/splix
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-0.44.20130902svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.0.1-0.43.20130902svn
 - make is no longer in buildroot by default