rpms/cups/devel .cvsignore, 1.22, 1.23 cups-lspp.patch, 1.6, 1.7 cups.spec, 1.263, 1.264 sources, 1.24, 1.25 cups-str1968.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30693

Modified Files:
	.cvsignore cups-lspp.patch cups.spec sources 
Removed Files:
	cups-str1968.patch 
Log Message:
* Fri Sep 22 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.4-2
- 1.2.4 (bug #206763).  No longer need str1968 patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	30 Aug 2006 15:01:36 -0000	1.22
+++ .cvsignore	22 Sep 2006 16:32:57 -0000	1.23
@@ -13,3 +13,4 @@
 cups-1.2.1-source.tar.bz2
 cups-1.2.2-source.tar.bz2
 cups-1.2.3-source.tar.bz2
+cups-1.2.4-source.tar.bz2

cups-lspp.patch:
 Makedefs.in                     |    2 
 config-scripts/cups-lspp.m4     |   36 +++++
 config.h.in                     |    7 +
 configure.in                    |    2 
 cups-1.2.2/scheduler/printers.c |   44 ++++++
 cups/cups.h                     |    8 +
 data/Makefile                   |    5 
 data/mls                        |  277 ++++++++++++++++++++++++++++++++++++++++
 data/selinux                    |  277 ++++++++++++++++++++++++++++++++++++++++
 data/te                         |  277 ++++++++++++++++++++++++++++++++++++++++
 scheduler/Makefile              |    6 
 scheduler/client.c              |  101 ++++++++++++++
 scheduler/client.h              |   14 ++
 scheduler/conf.c                |   46 ++++++
 scheduler/conf.h                |    8 +
 scheduler/ipp.c                 |  271 +++++++++++++++++++++++++++++++++++++++
 scheduler/job.c                 |  155 ++++++++++++++++++++++
 scheduler/job.h                 |   11 +
 scheduler/lspp-access.c         |   56 ++++++++
 scheduler/main.c                |   32 ++++
 20 files changed, 1629 insertions(+), 6 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cups-lspp.patch	24 Aug 2006 15:50:51 -0000	1.6
+++ cups-lspp.patch	22 Sep 2006 16:32:57 -0000	1.7
@@ -1751,7 +1751,7 @@
 +      if (setexeccon(job->scon) != 0)
 +      {
 +        cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to setexeccon to %s", job->scon);
-+        cupsdCancelJob(job, 0);
++        cupsdCancelJob(job, 0, IPP_JOB_ABORTED);
 +        return;
 +      }
 +
@@ -1783,7 +1783,7 @@
 +              free(audit_message);
 +            }
 +
-+            cupsdCancelJob(job, 0);
++            cupsdCancelJob(job, 0, IPP_JOB_ABORTED);
 +
 +            return;
 +          }


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- cups.spec	13 Sep 2006 16:51:23 -0000	1.263
+++ cups.spec	22 Sep 2006 16:32:58 -0000	1.264
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.3
-Release: 5
+Version: 1.2.4
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -35,7 +35,6 @@
 Patch11: cups-paps.patch
 Patch12: cups-wbuffer.patch
 Patch13: cups-direct-usb.patch
-Patch14: cups-str1968.patch
 Patch15: cups-maxlogsize.patch
 Patch16: cups-pid.patch
 Patch17: cups-relro.patch
@@ -134,7 +133,6 @@
 %patch11 -p1 -b .paps
 %patch12 -p1 -b .wbuffer
 %patch13 -p1 -b .direct-usb
-%patch14 -p1 -b .str1968
 %patch15 -p1 -b .maxlogsize
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .relro
@@ -416,6 +414,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Sep 22 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.4-2
+- 1.2.4 (bug #206763).  No longer need str1968 patch.
+
 * Wed Sep 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-5
 - Fixed STR #1968 properly (bug #205619).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	30 Aug 2006 15:01:38 -0000	1.24
+++ sources	22 Sep 2006 16:32:58 -0000	1.25
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-7f65bae0054cd8335824942595d867ef  cups-1.2.3-source.tar.bz2
+528650aba3b56541f75370ef09541850  cups-1.2.4-source.tar.bz2


--- cups-str1968.patch DELETED ---