Merge branch 'f17' into f18

This commit is contained in:
Jiri Popelka 2012-11-28 16:21:27 +01:00
commit 7e7d5d98df
3 changed files with 9 additions and 10 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/splix-2.0.1.20111121svn.tar.gz
/splix-2.0.1.20120419svn.tar.gz
/splix-2.0.1.20121128svn.tar.gz

View File

@ -1 +1 @@
cad40fe27e21d9b7b0c2a4d88b7f3b47 splix-2.0.1.20120419svn.tar.gz
fc763d24f5d1bcdf5d8a633cd51f4b6b splix-2.0.1.20121128svn.tar.gz

View File

@ -1,9 +1,9 @@
%global checkout 20120419svn
%global checkout 20121128svn
Summary: Driver for QPDL/SPL2 printers (Samsung and several Xerox printers)
Name: splix
Version: 2.0.1
Release: 0.12.%{checkout}%{?dist}
Release: 0.13.%{checkout}%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://splix.sourceforge.net/
@ -50,16 +50,11 @@ pushd ppd
make drv
popd
V=1 \
DRV_ONLY=1 \
CXXFLAGS="%{optflags} -fno-strict-aliasing" \
make %{?_smp_mflags}
make all V=1 DRV_ONLY=1 %{?_smp_mflags}
%install
DRV_ONLY=1 \
CUPSDRV=%{_datadir}/cups/drv/splix \
DESTDIR=%{buildroot} \
make install
make install DRV_ONLY=1 CUPSDRV=%{_datadir}/cups/drv/splix DESTDIR=%{buildroot}
%files
%doc COPYING AUTHORS ChangeLog THANKS
@ -68,6 +63,9 @@ make install
%{_datadir}/cups/drv/splix
%changelog
* Wed Nov 28 2012 Jiri Popelka <jpopelka@redhat.com> - 2.0.1-0.13.20121128svn
- latest svn snapshot
* Wed Oct 17 2012 Jiri Popelka <jpopelka@redhat.com> - 2.0.1-0.12.20120419svn
- Add Device ID for Xerox Phaser 3124 (#867392).