OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-May-2006 21:03:18
Branch: HEAD Handle: 2006051420031600
Modified files:
openpkg-src/cups cups.patch cups.spec
Log:
upgrading package: cups 1.1.23 -> 1.2.0
Summary:
Revision Changes Path
1.6 +4 -24 openpkg-src/cups/cups.patch
1.26 +10 -6 openpkg-src/cups/cups.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cups/cups.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 cups.patch
--- openpkg-src/cups/cups.patch 2 Nov 2004 18:53:57 -0000 1.5
+++ openpkg-src/cups/cups.patch 14 May 2006 19:03:16 -0000 1.6
@@ -1,6 +1,7 @@
---- scheduler/main.c.orig 2003-05-01 19:58:28.000000000 +0200
-+++ scheduler/main.c 2003-05-03 18:54:34.000000000 +0200
-@@ -250,6 +250,25 @@
+Index: scheduler/main.c
+--- scheduler/main.c.orig 2006-05-04 22:53:35 +0200
++++ scheduler/main.c 2006-05-14 20:26:13 +0200
+@@ -315,6 +315,25 @@
chdir("/");
@@ -26,24 +27,3 @@
#ifndef DEBUG
/*
* Disable core dumps...
---- backend/usb-unix.c.orig 2004-11-02 19:45:51 +0100
-+++ backend/usb-unix.c 2004-11-02 19:45:59 +0100
-@@ -50,6 +50,7 @@
- # ifdef __sparc
- # include <sys/ecppio.h>
- # else
-+# include <sys/ioctl.h>
- # include <sys/ioccom.h>
- # include <sys/ecppsys.h>
- # endif /* __sparc */
---- systemv/Makefile.orig 2004-09-20 20:45:52 +0200
-+++ systemv/Makefile 2004-09-20 20:47:30 +0200
-@@ -78,7 +78,7 @@
- $(INSTALL_BIN) lpoptions $(BINDIR)
- $(INSTALL_BIN) lpstat $(BINDIR)
- -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd
$(BINDIR)
-- if test ! -x $(BINDIR)/lppasswd; then \
-+ if -e $(BINDIR)/lppasswd -a test ! -x $(BINDIR)/lppasswd; then \
- chmod 755 $(BINDIR)/lppasswd; \
- fi
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cups/cups.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 cups.spec
--- openpkg-src/cups/cups.spec 1 Jan 2006 13:12:49 -0000 1.25
+++ openpkg-src/cups/cups.spec 14 May 2006 19:03:16 -0000 1.26
@@ -32,8 +32,8 @@
Class: EVAL
Group: Print
License: GPL/LGPL with exceptions
-Version: 1.1.23
-Release: 20050917
+Version: 1.2.0
+Release: 20060514
# package options
%option with_ssl no
@@ -88,14 +88,13 @@
-e 's;/spool/cups;/spool;g' \
config-scripts/cups-directories.m4 \
configure
- %{l_shtool} subst \
- -e 's;^\( $(LN)\) ../sbin/\(accept $(BINDIR)/.*\)$;\1 \2;' \
- systemv/Makefile
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O} %{l_cppflags}
-DPID_FILE='\"%{l_prefix}/var/cups/cupsd.pid\"'" \
CPPFLAGS="%{l_cppflags} -DPID_FILE='\"%{l_prefix}/var/cups/cupsd.pid\"'"
\
+ LDFLAGS="%{l_ldflags}" \
+ LIBS="-lz" \
./configure \
--prefix=%{l_prefix} \
--bindir=%{l_prefix}/libexec/cups \
@@ -116,7 +115,12 @@
--disable-ssl \
%endif
--disable-pam \
- --disable-shared
+ --disable-shared \
+ --without-java \
+ --without-perl \
+ --without-php \
+ --without-python
+
%{l_make} %{l_mflags -O}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
