Compare commits

..

No commits in common. "c8s" and "c9s" have entirely different histories.
c8s ... c9s

5 changed files with 63 additions and 6 deletions

3
.gitignore vendored
View File

@ -1 +1,4 @@
/splix-2.0.1.20111121svn.tar.gz
/splix-2.0.1.20120419svn.tar.gz
/splix-2.0.1.20121128svn.tar.gz
/splix-2.0.1.20130902svn.tar.bz2 /splix-2.0.1.20130902svn.tar.bz2

View File

@ -1,7 +1,8 @@
--- !Policy --- !Policy
product_versions: product_versions:
- rhel-8 - rhel-9
decision_context: osci_compose_gate decision_context: osci_compose_gate
rules: rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation} - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}

View File

@ -1 +1 @@
SHA512 (splix-2.0.1.20130902svn.tar.bz2) = b814bb9554059b9e5716ee026bbdfd69dea1a78ff595f59ff8c73e6ab3a83af007cd71c71f63358cbe176137db947bfa2c80dbf16242ffce609c3242189927aa 2901e9482dd1a7c44f7b730696868e09 splix-2.0.1.20130902svn.tar.bz2

18
splix-cxx.patch Normal file
View File

@ -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

View File

@ -3,7 +3,7 @@
Summary: Driver for QPDL/SPL2 printers (Samsung and several Xerox printers) Summary: Driver for QPDL/SPL2 printers (Samsung and several Xerox printers)
Name: splix Name: splix
Version: 2.0.1 Version: 2.0.1
Release: 0.36.%{checkout}%{?dist} Release: 0.46.%{checkout}%{?dist}
License: GPLv2 License: GPLv2
URL: http://splix.sourceforge.net/ URL: http://splix.sourceforge.net/
@ -16,11 +16,14 @@ Source0: splix-%{version}.%{checkout}.tar.bz2
Patch0: splix-deviceID.patch Patch0: splix-deviceID.patch
# rules.mk misses LDFLAGS # rules.mk misses LDFLAGS
Patch1: splix-ldflags.patch Patch1: splix-ldflags.patch
Patch2: splix-cxx.patch
Requires: cups Requires: cups
# gcc-c++ is no longer in buildroot by default # gcc-c++ is no longer in buildroot by default
BuildRequires: gcc-c++ BuildRequires: gcc-c++
# uses make
BuildRequires: make
# _cups_serverbin macro # _cups_serverbin macro
BuildRequires: cups-devel BuildRequires: cups-devel
@ -50,17 +53,18 @@ popd
%patch0 -p1 -b .deviceID %patch0 -p1 -b .deviceID
%patch1 -p1 -b .ldflags %patch1 -p1 -b .ldflags
%patch2 -p1 -b .cxx
%build %build
%set_build_flags %set_build_flags
# *.drv.in -> *.drv # *.drv.in -> *.drv
make drv %make_build drv
CXXFLAGS="%{optflags} -fno-strict-aliasing" \ CXXFLAGS="%{optflags} -fno-strict-aliasing" \
make all V=1 DRV_ONLY=1 %{?_smp_mflags} %make_build all V=1 DRV_ONLY=1 LDFLAGS="%{build_ldflags} -pie"
%install %install
make install DRV_ONLY=1 CUPSDRV=%{_datadir}/cups/drv/splix DESTDIR=%{buildroot} %make_install DRV_ONLY=1 CUPSDRV=%{_datadir}/cups/drv/splix
%files %files
%license COPYING %license COPYING
@ -70,6 +74,37 @@ make install DRV_ONLY=1 CUPSDRV=%{_datadir}/cups/drv/splix DESTDIR=%{buildroot}
%{_datadir}/cups/drv/splix %{_datadir}/cups/drv/splix
%changelog %changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.1-0.46.20130902svn
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.1-0.45.20130902svn
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* 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
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-0.42.20130902svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jun 24 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.0.1-0.41.20130902svn
- use a proper build macros
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-0.40.20130902svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-0.39.20130902svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-0.38.20130902svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-0.37.20130902svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Mar 02 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2.0.1-0.36.20130902svn * Fri Mar 02 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2.0.1-0.36.20130902svn
- 1550554 - splix: Partial Fedora build flags injection - 1550554 - splix: Partial Fedora build flags injection