rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Apply Matt Anderson's LSPP patch.

Browse Source
This commit is contained in:
Tim Waugh 2006-07-21 12:00:05 +00:00
parent 814726b781
commit 75d0e82215
2 changed files with 1984 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1961
cups-lspp.patch Normal file
View File

File diff suppressed because it is too large Load Diff

25
cups.spec
View File

@ -1,11 +1,12 @@
%define initdir /etc/rc.d/init.d %define initdir /etc/rc.d/init.d
%define use_alternatives 1 %define use_alternatives 1
%define lspp 1
%define cups_serverbin %{_exec_prefix}/lib/cups %define cups_serverbin %{_exec_prefix}/lib/cups
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.2.2 Version: 1.2.2
Release: 2 Release: 3
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -37,6 +38,7 @@ Patch14: cups-dest-cache-v2.patch
Patch15: cups-maxlogsize.patch Patch15: cups-maxlogsize.patch
Patch16: cups-pid.patch Patch16: cups-pid.patch
Patch17: cups-relro.patch Patch17: cups-relro.patch
Patch100: cups-lspp.patch
Epoch: 1 Epoch: 1
Url: http://www.cups.org/ Url: http://www.cups.org/
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
@ -63,6 +65,13 @@ BuildRequires: libjpeg-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
%if %lspp
BuildPrereq: libselinux-devel >= 1.23
BuildPrereq: audit-libs-devel >= 1.1
Requires: audit-libs-devel >= 1.1
Requires: libselinux >= 1.23
%endif
# -fstack-protector-all requires GCC 4.0.1 # -fstack-protector-all requires GCC 4.0.1
BuildRequires: gcc >= 4.0.1 BuildRequires: gcc >= 4.0.1
@ -130,6 +139,11 @@ lpd emulation.
%patch15 -p1 -b .maxlogsize %patch15 -p1 -b .maxlogsize
%patch16 -p1 -b .pid %patch16 -p1 -b .pid
%patch17 -p1 -b .relro %patch17 -p1 -b .relro
%if %lspp
%patch100 -p1 -b .lspp
%endif
perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
aclocal -I config-scripts aclocal -I config-scripts
autoconf autoconf
@ -144,6 +158,9 @@ perl -pi -e "s,^.SILENT:,," Makedefs.in
export CFLAGS="-DLDAP_DEPRECATED=1" export CFLAGS="-DLDAP_DEPRECATED=1"
%configure --with-docdir=%{_docdir}/cups-%{version} \ %configure --with-docdir=%{_docdir}/cups-%{version} \
--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \ --with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \
%if %lspp
--enable-lspp \
%endif
--with-log-file-perm=0700 --enable-pie --with-log-file-perm=0700 --enable-pie
# If we got this far, all prerequisite libraries must be here. # If we got this far, all prerequisite libraries must be here.
@ -341,6 +358,9 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/backend %{cups_serverbin}/backend
%{cups_serverbin}/cgi-bin %{cups_serverbin}/cgi-bin
%dir %{cups_serverbin}/daemon %dir %{cups_serverbin}/daemon
%if %lspp
%{cups_serverbin}/daemon/access
%endif
%{cups_serverbin}/daemon/cups-polld %{cups_serverbin}/daemon/cups-polld
%{cups_serverbin}/daemon/cups-deviced %{cups_serverbin}/daemon/cups-deviced
%{cups_serverbin}/daemon/cups-driverd %{cups_serverbin}/daemon/cups-driverd
@ -389,7 +409,8 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Fri Jul 21 2006 Tim Waugh <twaugh@redhat.com> * Fri Jul 21 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.2-3
- Apply Matt Anderson's LSPP patch.
- Renumbered patches. - Renumbered patches.
* Thu Jul 20 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.2-2 * Thu Jul 20 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.2-2