Hello community, here is the log from the commit of package splix for openSUSE:Factory checked in at 2017-04-20 20:54:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/splix (Old) and /work/SRC/openSUSE:Factory/.splix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "splix" Thu Apr 20 20:54:47 2017 rev:15 rq:487802 version:2.0.0.315 Changes: -------- --- /work/SRC/openSUSE:Factory/splix/splix.changes 2015-03-25 21:33:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.splix.new/splix.changes 2017-04-20 20:54:52.578652214 +0200 @@ -1,0 +2,23 @@ +Thu Apr 6 00:35:25 UTC 2017 - dev+nov...@devmotion.de + +- Disable jbigkit for SLE11. + +------------------------------------------------------------------- +Wed Apr 5 23:19:10 UTC 2017 - dev+nov...@devmotion.de + +- Change of conditional to build with jbigkit by default. + +------------------------------------------------------------------- +Thu Nov 24 22:37:49 UTC 2016 - psim...@suse.com + +- Update to latest SVN revision 315 of Splix. That version -- which + was unfortunately never released -- brings support for many new + printers and solves bsc#1007864. The update obsoletes + splix-2.0.0-gcc45.patch, which was applied upstream. Also, + splix-add-debuginfo.patch has been partially applied upstream and + could be simplified. Note that the new version of SpliX has + bumped an internal version number and therefore requires users to + re-register their printer in CUPS. If this is not done, then CUPS + will complain about a version number mismatch. + +------------------------------------------------------------------- Old: ---- splix-2.0.0-gcc45.patch splix-2.0.0.tar.bz2 New: ---- splix-2.0.0.315.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ splix.spec ++++++ --- /var/tmp/diff_new_pack.ZtVluG/_old 2017-04-20 20:54:53.346543625 +0200 +++ /var/tmp/diff_new_pack.ZtVluG/_new 2017-04-20 20:54:53.346543625 +0200 @@ -15,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%bcond_with jbigkit +%if 0%{?suse_version} > 1110 +%bcond_without jbigkit +%endif Name: splix Summary: Driver for Samsung Printer Language printers License: GPL-2.0 Group: Hardware/Printing -Version: 2.0.0 +Version: 2.0.0.315 Release: 0 Url: http://splix.ap2c.org/ -Source0: http://downloads.sourceforge.net/project/splix/splix/%{version}/%{name}-%{version}.tar.bz2 +# revision 315 from svn://svn.code.sf.net/p/splix/code/splix +Source0: splix-2.0.0.315.tar.bz2 Source1: http://splix.ap2c.org/samsung_cms.tar.bz2 Source2: README.SUSE -Patch0: %name-2.0.0-gcc45.patch Patch1: %name-libs.patch Patch2: %name-add-debuginfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,8 +55,8 @@ # for the printer drivers supported by the package, # see https://bugzilla.novell.com/show_bug.cgi?id=735865 BuildRequires: python-cups -%if %{with jbigkit} -BuildRequires: jbigkit-devel +%if (0%{?suse_version} > 1110) && ! %{without jbigkit} +BuildRequires: libjbig-devel %endif Requires: cups # The Splix driver PPDs contain either @@ -82,18 +83,26 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 %__cp %SOURCE2 . +mv -v *.ppd ppd/ %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%__make %{!?_with_jbigkit:DISABLE_JBIG=1} %{?jobs:-j%{jobs}} V=1 +%if 0%{?suse_version} > 1110 +%__make %{?_without_jbigkit:DISABLE_JBIG=1} %{?jobs:-j%{jobs}} V=1 +%else +%__make DISABLE_JBIG=1 %{?jobs:-j%{jobs}} V=1 +%endif %install -%makeinstall %{!?_with_jbigkit:DISABLE_JBIG=1} +%if 0%{?suse_version} > 1110 +%makeinstall %{?_without_jbigkit:DISABLE_JBIG=1} +%else +%makeinstall DISABLE_JBIG=1 +%endif pushd $RPM_BUILD_ROOT%_datadir/cups/model/samsung/ %__tar xjvf "%{SOURCE1}" popd @@ -144,6 +153,8 @@ %dir %_datadir/cups/model/dell %dir %_datadir/cups/model/samsung %dir %_datadir/cups/model/xerox +%dir %_datadir/cups/model/lexmark +%dir %_datadir/cups/model/toshiba %if 0%{?suse_version} == 1110 # On SLE11 with its CUPS 1.3.9 there is still /usr/lib64/cups/ used on x86_64. # For suse_version values see https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto @@ -164,5 +175,7 @@ %_datadir/cups/model/samsung/*.ppd.gz %_datadir/cups/model/samsung/cms %_datadir/cups/model/xerox/*.ppd.gz +%_datadir/cups/model/lexmark/*.ppd.gz +%_datadir/cups/model/toshiba/*.ppd.gz %changelog ++++++ splix-2.0.0.tar.bz2 -> splix-2.0.0.315.tar.bz2 ++++++ ++++ 78552 lines of diff (skipped) ++++++ splix-add-debuginfo.patch ++++++ --- /var/tmp/diff_new_pack.ZtVluG/_old 2017-04-20 20:54:54.018448610 +0200 +++ /var/tmp/diff_new_pack.ZtVluG/_new 2017-04-20 20:54:54.018448610 +0200 @@ -1,10 +1,10 @@ SLE needs debugging information even for optimized binaries. Signed-off-by: Libor Pechacek <lpecha...@suse.cz> -Index: splix-2.0.0/Makefile +Index: splix-2.0.0.315/Makefile =================================================================== ---- splix-2.0.0.orig/Makefile -+++ splix-2.0.0/Makefile +--- splix-2.0.0.315.orig/Makefile 2016-11-25 14:36:14.303965938 +0100 ++++ splix-2.0.0.315/Makefile 2016-11-25 14:36:21.779850424 +0100 @@ -74,8 +74,8 @@ comma := , DEBUG_CFLAGS := -O0 -g @@ -16,19 +16,3 @@ ARCHI := $(shell uname -s) -Index: splix-2.0.0/rules.mk -=================================================================== ---- splix-2.0.0.orig/rules.mk -+++ splix-2.0.0/rules.mk -@@ -21,9 +21,9 @@ cmd_install_cms = INSTALL col - install: $(rastertoqpdl_TARGET) $(pstoqpdl_TARGET) - $(Q)mkdir -p $(DESTDIR)${CUPSFILTER} - $(call printCmd, $(cmd_install_raster)) -- $(Q)install -m 755 -s $(rastertoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} -+ $(Q)install -m 755 $(rastertoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} - $(call printCmd, $(cmd_install_ps)) -- $(Q)install -m 755 -s $(pstoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} -+ $(Q)install -m 755 $(pstoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} - $(Q)$(MAKE) --no-print-directory -C ppd install Q=$(Q) \ - DESTDIR=$(abspath $(DESTDIR)) DISABLE_JBIG=$(DISABLE_JBIG) - @echo ""