rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Only warn about ACLs once (STR #1532).

Browse Source
This commit is contained in:
Tim Waugh 2006-04-07 15:12:06 +00:00
parent 91729eedae
commit 29eef2d44f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cups.spec
View File

@ -43,6 +43,7 @@ Patch19: cups-gnome.patch
Patch20: cups-direct-usb.patch Patch20: cups-direct-usb.patch
Patch21: cups-pstops.patch Patch21: cups-pstops.patch
Patch22: cups-dest-cache-v2.patch Patch22: cups-dest-cache-v2.patch
Patch23: cups-str1532.patch
Patch24: cups-maxlogsize.patch Patch24: cups-maxlogsize.patch
Patch28: cups-no-propagate-ipp-port.patch Patch28: cups-no-propagate-ipp-port.patch
Patch32: cups-pid.patch Patch32: cups-pid.patch
@ -62,7 +63,7 @@ Prereq: /usr/sbin/alternatives
Obsoletes: lpd lpr LPRng <= 3.8.15-3 Obsoletes: lpd lpr LPRng <= 3.8.15-3
Provides: lpd lpr LPRng = 3.8.15-3 Provides: lpd lpr LPRng = 3.8.15-3
BuildPrereq: pam-devel openssl-devel pkgconfig BuildPrereq: pam-devel pkgconfig
BuildPrereq: gnutls-devel BuildPrereq: gnutls-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: make >= 1:3.80 BuildRequires: make >= 1:3.80
@ -78,7 +79,6 @@ Requires: dbus >= 0.60
Summary: Common Unix Printing System - development environment Summary: Common Unix Printing System - development environment
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version} Requires: %{name}-libs = %{epoch}:%{version}
Requires: openssl-devel
%package libs %package libs
Summary: Common Unix Printing System - libraries Summary: Common Unix Printing System - libraries
@ -139,6 +139,7 @@ lpd emulation.
%patch20 -p1 -b .direct-usb %patch20 -p1 -b .direct-usb
%patch21 -p1 -b .pstops %patch21 -p1 -b .pstops
%patch22 -p1 -b .dest-cache-v2 %patch22 -p1 -b .dest-cache-v2
%patch23 -p1 -b .str1532
%patch24 -p1 -b .maxlogsize %patch24 -p1 -b .maxlogsize
%patch28 -p1 -b .no-propagate-ipp-port %patch28 -p1 -b .no-propagate-ipp-port
%patch32 -p1 -b .pid %patch32 -p1 -b .pid
@ -155,11 +156,7 @@ perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" cups-lpd.real
perl -pi -e "s,^.SILENT:,," Makedefs.in perl -pi -e "s,^.SILENT:,," Makedefs.in
%build %build
if pkg-config openssl ; then export CFLAGS="-DLDAP_DEPRECATED=1"
export CFLAGS=`pkg-config --cflags openssl`
export CPPFLAGS=`pkg-config --cflags-only-I openssl`
export LDFLAGS=`pkg-config --libs-only-L openssl`
fi
%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"
@ -388,6 +385,11 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Fri Apr 7 2006 Tim Waugh <twaugh@redhat.com>
- No longer need openssl-devel.
- Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
- Only warn about ACLs once (STR #1532).
* Thu Apr 6 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.2.rc1.7 * Thu Apr 6 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.2.rc1.7
- Build requires openldap-devel. - Build requires openldap-devel.
- Sync pstops.c with svn 5372. - Sync pstops.c with svn 5372.