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

Merge branch 'f14' into f15

Browse Source
This commit is contained in:
Tim Waugh 2011-12-09 12:15:38 +00:00
commit 9bd0730a7e
3 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cups-lspp.patch
View File

@ -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 (Classification && !banner_page)
{ {
if ((attr = ippFindAttribute(job->attrs, "job-sheets", 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 @@ -1634,6 +1714,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J
goto error; goto error;
} }

6
cups-serverbin-compat.patch
View File

@ -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)) + if (access(command, F_OK))
+ { + {
+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat, + snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat,
+ method); + scheme);
+ if (!access(command, F_OK)) + if (!access(command, F_OK))
+ { + {
+ /* Not in the correct directory, but we found it in the compat + /* Not in the correct directory, but we found it in the compat
+ * directory. Issue a warning. */ + * directory. Issue a warning. */
+ cupsdLogMessage(CUPSD_LOG_INFO, + cupsdLogMessage(CUPSD_LOG_INFO,
+ "Backend '%s' not in %s/backend!", method, + "Backend '%s' not in %s/backend!", scheme,
+ ServerBin); + ServerBin);
+ } + }
+ else + 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 + /* Not in the compat directory either; make any error
+ messages use the correct directory name then. */ + messages use the correct directory name then. */
+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, + snprintf(command, sizeof(command), "%s/backend/%s", ServerBin,
+ method); + scheme);
+ } + }
+ } + }
+#endif /* __x86_64__ */ +#endif /* __x86_64__ */

5
cups.spec
View File

@ -13,7 +13,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.8 Version: 1.4.8
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -639,6 +639,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Fri Dec 9 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.8-6
- Detangle cups-serverbin-compat.patch from cups-lspp.patch.
* Wed Sep 28 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.8-5 * Wed Sep 28 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.8-5
- Fixed string manipulation in the dbus notifier (STR #3947, bug #741833). - Fixed string manipulation in the dbus notifier (STR #3947, bug #741833).