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: 22-Oct-2006 16:33:15
Branch: HEAD Handle: 2006102215331500
Modified files:
openpkg-src/cups cups.patch cups.spec
Log:
merge a contributed patch and the substitutions into a new patch;
cleanup the headers and %description
Summary:
Revision Changes Path
1.7 +47 -2 openpkg-src/cups/cups.patch
1.34 +7 -17 openpkg-src/cups/cups.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cups/cups.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 cups.patch
--- openpkg-src/cups/cups.patch 14 May 2006 19:03:16 -0000 1.6
+++ openpkg-src/cups/cups.patch 22 Oct 2006 14:33:15 -0000 1.7
@@ -1,6 +1,51 @@
+Index: Makedefs.in
+--- Makedefs.in.orig 2006-08-03 02:54:38 +0200
++++ Makedefs.in 2006-10-22 16:24:14 +0200
+@@ -238,7 +238,7 @@
+ # Rules...
+ #
+
+-.SILENT:
++
+ .SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h
.man .o .32.o .64.o .gz
+
+ .c.o:
+Index: configure
+--- configure.orig 2006-10-20 17:11:43 +0200
++++ configure 2006-10-22 16:24:28 +0200
+@@ -7636,7 +7636,7 @@
+
+ if test x$cachedir = x; then
+ if test "x$uname" = xDarwin; then
+- CUPS_CACHEDIR="$localstatedir/spool/cups/cache"
++ CUPS_CACHEDIR="$localstatedir/spool/cache"
+ else
+ CUPS_CACHEDIR="$localstatedir/cache/cups"
+ fi
+@@ -7750,9 +7750,9 @@
+
+
+ # Longer-term spool data
+-CUPS_REQUESTS="$localstatedir/spool/cups"
++CUPS_REQUESTS="$localstatedir/spool"
+ cat >>confdefs.h <<_ACEOF
+-#define CUPS_REQUESTS "$localstatedir/spool/cups"
++#define CUPS_REQUESTS "$localstatedir/spool"
+ _ACEOF
+
+
+@@ -12458,7 +12458,7 @@
+ # Solaris requires _POSIX_PTHREAD_SEMANTICS to
+ # be POSIX-compliant... :(
+ if test $uname = SunOS; then
+- PTHREAD_FLAGS="$PTHREAD_FLAGS
_POSIX_PTHREAD_SEMANTICS"
++ PTHREAD_FLAGS="$PTHREAD_FLAGS
-D_POSIX_PTHREAD_SEMANTICS"
+ fi
+ break
+ fi
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
+--- scheduler/main.c.orig 2006-08-24 17:55:42 +0200
++++ scheduler/main.c 2006-10-22 16:24:14 +0200
@@ -315,6 +315,25 @@
chdir("/");
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cups/cups.spec
============================================================================
$ cvs diff -u -r1.33 -r1.34 cups.spec
--- openpkg-src/cups/cups.spec 21 Oct 2006 07:29:34 -0000 1.33
+++ openpkg-src/cups/cups.spec 22 Oct 2006 14:33:15 -0000 1.34
@@ -24,16 +24,16 @@
# package information
Name: cups
-Summary: Common Unix Printing System
+Summary: Common Unix Printing System (CUPS)
URL: http://www.cups.org/
Vendor: Easy Software Products
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
Class: EVAL
Group: Print
-License: GPL/LGPL with exceptions
+License: GPL/LGPL (with exceptions)
Version: 1.2.5
-Release: 20061021
+Release: 20061022
# package options
%option with_ssl no
@@ -60,12 +60,10 @@
%description
CUPS provides a portable printing layer for Unix-based operating
- systems. It has been developed by Easy Software Products to promote
- a standard printing solution for all Unix vendors and users.
-
- CUPS provides the System V and Berkeley command-line interfaces and
- uses the Internet Printing Protocol (IPP) as the basis for managing
- print jobs and queues.
+ systems. It has been developed to promote a standard printing
+ solution for all Unix vendors and users. CUPS provides the System V
+ and Berkeley command-line interfaces and uses the Internet Printing
+ Protocol (IPP) as the basis for managing print jobs and queues.
%track
prog cups = {
@@ -77,14 +75,6 @@
%prep
%setup -q
%patch -p0
- %{l_shtool} subst \
- -e 's;^.SILENT:.*$;;' \
- Makedefs.in
- %{l_shtool} subst \
- -e 's;$libdir/cups;$exec_prefix/libexec/cups;g' \
- -e 's;/spool/cups;/spool;g' \
- config-scripts/cups-directories.m4 \
- configure
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
