[cups/f14] Detangle cups-serverbin-compat.patch from cups-lspp.patch.
Tim Waugh
twaugh at fedoraproject.org
Fri Dec 9 12:29:18 UTC 2011
commit da4557e1c0eac8cd5604907ef7b4a4a4c5e93a80
Author: Tim Waugh <twaugh at redhat.com>
Date: Fri Dec 9 12:03:27 2011 +0000
Detangle cups-serverbin-compat.patch from cups-lspp.patch.
cups-lspp.patch | 25 -------------------------
cups-serverbin-compat.patch | 6 +++---
cups.spec | 5 ++++-
3 files changed, 7 insertions(+), 29 deletions(-)
---
diff --git a/cups-lspp.patch b/cups-lspp.patch
index 56a171e..956bc5b 100644
--- a/cups-lspp.patch
+++ b/cups-lspp.patch
@@ -2362,31 +2362,6 @@ diff -up cups-1.4.7/scheduler/job.c.lspp cups-1.4.7/scheduler/job.c
if (Classification && !banner_page)
{
if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-@@ -1165,13 +1245,13 @@ cupsdContinueJob(cupsd_job_t *job) /* I
- if (access(command, F_OK))
- {
- snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat,
-- method);
-+ scheme);
- if (!access(command, F_OK))
- {
- /* Not in the correct directory, but we found it in the compat
- * directory. Issue a warning. */
- cupsdLogMessage(CUPSD_LOG_INFO,
-- "Backend '%s' not in %s/backend!", method,
-+ "Backend '%s' not in %s/backend!", scheme,
- ServerBin);
- }
- else
-@@ -1179,7 +1259,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I
- /* Not in the compat directory either; make any error
- messages use the correct directory name then. */
- snprintf(command, sizeof(command), "%s/backend/%s", ServerBin,
-- method);
-+ scheme);
- }
- }
- #endif /* __x86_64__ */
@@ -1634,6 +1714,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J
goto error;
}
diff --git a/cups-serverbin-compat.patch b/cups-serverbin-compat.patch
index 5e95509..bbc39ef 100644
--- a/cups-serverbin-compat.patch
+++ b/cups-serverbin-compat.patch
@@ -123,13 +123,13 @@ diff -up cups-1.4.7/scheduler/job.c.serverbin-compat cups-1.4.7/scheduler/job.c
+ if (access(command, F_OK))
+ {
+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat,
-+ method);
++ scheme);
+ if (!access(command, F_OK))
+ {
+ /* Not in the correct directory, but we found it in the compat
+ * directory. Issue a warning. */
+ cupsdLogMessage(CUPSD_LOG_INFO,
-+ "Backend '%s' not in %s/backend!", method,
++ "Backend '%s' not in %s/backend!", scheme,
+ ServerBin);
+ }
+ else
@@ -137,7 +137,7 @@ diff -up cups-1.4.7/scheduler/job.c.serverbin-compat cups-1.4.7/scheduler/job.c
+ /* Not in the compat directory either; make any error
+ messages use the correct directory name then. */
+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin,
-+ method);
++ scheme);
+ }
+ }
+#endif /* __x86_64__ */
diff --git a/cups.spec b/cups.spec
index ebb2599..86b48cc 100644
--- a/cups.spec
+++ b/cups.spec
@@ -8,7 +8,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.8
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -580,6 +580,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
+* Fri Dec 9 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-6
+- Detangle cups-serverbin-compat.patch from cups-lspp.patch.
+
* Wed Sep 28 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-5
- Fixed string manipulation in the dbus notifier (STR #3947, bug #741833).
More information about the scm-commits
mailing list