Merge branch 'f18' into f19
This commit is contained in:
Tim Waugh
commit
75066ab94b
@ -1,18 +1,18 @@
|
||||
diff -up hplip-3.13.2/fax/backend/hpfax.py.logdir hplip-3.13.2/fax/backend/hpfax.py
|
||||
--- hplip-3.13.2/fax/backend/hpfax.py.logdir 2013-02-13 17:38:40.000000000 +0100
|
||||
+++ hplip-3.13.2/fax/backend/hpfax.py 2013-02-14 11:41:25.147140459 +0100
|
||||
--- hplip-3.13.2/fax/backend/hpfax.py.logdir 2013-02-13 16:38:40.000000000 +0000
|
||||
+++ hplip-3.13.2/fax/backend/hpfax.py 2013-03-05 11:17:47.556317964 +0000
|
||||
@@ -244,7 +244,7 @@ else:
|
||||
input_fd = 0
|
||||
|
||||
# REVISIT:
|
||||
- tmp_dir = '/var/log/hp/tmp'
|
||||
+ tmp_dir = os.environ.get ('TMPDIR', '/var/log/hp/tmp')
|
||||
+ tmp_dir = "/var/run/hplip"
|
||||
|
||||
|
||||
pipe_name = os.path.join(tmp_dir, "hpfax-pipe-%d" % job_id)
|
||||
diff -up hplip-3.13.2/logcapture.py.logdir hplip-3.13.2/logcapture.py
|
||||
--- hplip-3.13.2/logcapture.py.logdir 2013-02-13 17:38:51.000000000 +0100
|
||||
+++ hplip-3.13.2/logcapture.py 2013-02-14 11:43:52.314127962 +0100
|
||||
--- hplip-3.13.2/logcapture.py.logdir 2013-02-13 16:38:51.000000000 +0000
|
||||
+++ hplip-3.13.2/logcapture.py 2013-03-05 11:14:46.071519071 +0000
|
||||
@@ -39,7 +39,7 @@ CUPS_BACKUP_FILE='/etc/cups/cupsd.conf_o
|
||||
LOG_FOLDER_PATH='./'
|
||||
LOG_FOLDER_NAME='hplip_troubleshoot_logs'
|
||||
@ -32,8 +32,8 @@ diff -up hplip-3.13.2/logcapture.py.logdir hplip-3.13.2/logcapture.py
|
||||
sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES))
|
||||
if sts != 0:
|
||||
diff -up hplip-3.13.2/prnt/filters/hplipjs.c.logdir hplip-3.13.2/prnt/filters/hplipjs.c
|
||||
--- hplip-3.13.2/prnt/filters/hplipjs.c.logdir 2013-02-13 17:34:05.000000000 +0100
|
||||
+++ hplip-3.13.2/prnt/filters/hplipjs.c 2013-02-14 11:41:25.148140445 +0100
|
||||
--- hplip-3.13.2/prnt/filters/hplipjs.c.logdir 2013-02-13 16:34:05.000000000 +0000
|
||||
+++ hplip-3.13.2/prnt/filters/hplipjs.c 2013-03-05 11:14:46.072519075 +0000
|
||||
@@ -275,7 +275,8 @@ int main (int argc, char **argv)
|
||||
{
|
||||
fprintf (stderr, "DEBUG: HPLIPJS: argv[%d] = %s\n", i, argv[i]);
|
||||
@ -45,8 +45,8 @@ diff -up hplip-3.13.2/prnt/filters/hplipjs.c.logdir hplip-3.13.2/prnt/filters/hp
|
||||
HPFp = fopen (szPSFile, "w");
|
||||
#endif
|
||||
diff -up hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp
|
||||
--- hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir 2013-02-14 11:41:25.139140568 +0100
|
||||
+++ hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp 2013-02-14 11:48:14.507501338 +0100
|
||||
--- hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir 2013-03-05 11:14:46.062519032 +0000
|
||||
+++ hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp 2013-03-05 11:14:46.073519080 +0000
|
||||
@@ -31,7 +31,9 @@
|
||||
\*****************************************************************************/
|
||||
|
||||
@ -113,8 +113,8 @@ diff -up hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.2/prnt/hpcu
|
||||
if (kfp)
|
||||
{
|
||||
diff -up hplip-3.13.2/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.13.2/prnt/hpcups/LJZjStream.cpp
|
||||
--- hplip-3.13.2/prnt/hpcups/LJZjStream.cpp.logdir 2013-02-13 17:32:39.000000000 +0100
|
||||
+++ hplip-3.13.2/prnt/hpcups/LJZjStream.cpp 2013-02-14 11:41:25.149140432 +0100
|
||||
--- hplip-3.13.2/prnt/hpcups/LJZjStream.cpp.logdir 2013-02-13 16:32:39.000000000 +0000
|
||||
+++ hplip-3.13.2/prnt/hpcups/LJZjStream.cpp 2013-03-05 11:14:46.074519084 +0000
|
||||
@@ -42,9 +42,12 @@
|
||||
#include "LJZjStream.h"
|
||||
#include "Utils.h"
|
||||
@ -144,8 +144,8 @@ diff -up hplip-3.13.2/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.13.2/prnt/hpcups
|
||||
if (1 != m_pJA->pre_process_raster || !firstpage_cups_header->Duplex){
|
||||
return NO_ERROR;
|
||||
diff -up hplip-3.13.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.13.2/prnt/hpcups/SystemServices.cpp
|
||||
--- hplip-3.13.2/prnt/hpcups/SystemServices.cpp.logdir 2013-02-13 17:32:39.000000000 +0100
|
||||
+++ hplip-3.13.2/prnt/hpcups/SystemServices.cpp 2013-02-14 11:50:22.597720115 +0100
|
||||
--- hplip-3.13.2/prnt/hpcups/SystemServices.cpp.logdir 2013-02-13 16:32:39.000000000 +0000
|
||||
+++ hplip-3.13.2/prnt/hpcups/SystemServices.cpp 2013-03-05 11:14:46.074519084 +0000
|
||||
@@ -31,14 +31,17 @@
|
||||
#include "CommonDefinitions.h"
|
||||
#include "SystemServices.h"
|
||||
@ -167,8 +167,8 @@ diff -up hplip-3.13.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.13.2/prnt/hp
|
||||
createTempFile(fname, &m_fp);
|
||||
if (m_fp)
|
||||
diff -up hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp
|
||||
--- hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp.logdir 2013-02-13 17:34:10.000000000 +0100
|
||||
+++ hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp 2013-02-14 11:52:05.090292573 +0100
|
||||
--- hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp.logdir 2013-02-13 16:34:10.000000000 +0000
|
||||
+++ hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp 2013-03-05 11:14:46.075519088 +0000
|
||||
@@ -29,6 +29,7 @@
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
\*****************************************************************************/
|
||||
@ -219,8 +219,8 @@ diff -up hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.13.2/prnt/hpijs/hp
|
||||
// fdFax = mkstemp (hpFileName);
|
||||
fdFax = createTempFile(hpFileName, &pFilePtrFax);
|
||||
diff -up hplip-3.13.2/prnt/hpijs/hpijs.cpp.logdir hplip-3.13.2/prnt/hpijs/hpijs.cpp
|
||||
--- hplip-3.13.2/prnt/hpijs/hpijs.cpp.logdir 2013-02-14 11:41:25.136140608 +0100
|
||||
+++ hplip-3.13.2/prnt/hpijs/hpijs.cpp 2013-02-14 11:53:57.972718824 +0100
|
||||
--- hplip-3.13.2/prnt/hpijs/hpijs.cpp.logdir 2013-03-05 11:14:46.060519023 +0000
|
||||
+++ hplip-3.13.2/prnt/hpijs/hpijs.cpp 2013-03-05 11:14:46.076519093 +0000
|
||||
@@ -29,6 +29,7 @@
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
\*****************************************************************************/
|
||||
@ -273,8 +273,8 @@ diff -up hplip-3.13.2/prnt/hpijs/hpijs.cpp.logdir hplip-3.13.2/prnt/hpijs/hpijs.
|
||||
BUG("unable to init capture");
|
||||
#endif
|
||||
diff -up hplip-3.13.2/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.13.2/prnt/hpijs/hpijsfax.cpp
|
||||
--- hplip-3.13.2/prnt/hpijs/hpijsfax.cpp.logdir 2013-02-13 17:34:10.000000000 +0100
|
||||
+++ hplip-3.13.2/prnt/hpijs/hpijsfax.cpp 2013-02-14 12:38:58.222064812 +0100
|
||||
--- hplip-3.13.2/prnt/hpijs/hpijsfax.cpp.logdir 2013-02-13 16:34:10.000000000 +0000
|
||||
+++ hplip-3.13.2/prnt/hpijs/hpijsfax.cpp 2013-03-05 11:14:46.077519097 +0000
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
#ifdef HAVE_LIBHPIP
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
Summary: HP Linux Imaging and Printing Project
|
||||
Name: hplip
|
||||
Version: 3.13.3
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2+ and MIT
|
||||
Group: System Environment/Daemons
|
||||
|
||||
@ -328,6 +328,9 @@ make
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
# Create /var/run/hplip
|
||||
mkdir -p %{buildroot}%{_localstatedir}/run/hplip
|
||||
|
||||
# Remove unpackaged files
|
||||
rm -rf %{buildroot}%{_sysconfdir}/sane.d \
|
||||
%{buildroot}%{_docdir} \
|
||||
@ -472,6 +475,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
||||
%{_localstatedir}/lib/hp
|
||||
%dir %attr(0774,root,lp) %{_localstatedir}/log/hp
|
||||
%dir %attr(1774,root,lp) %{_localstatedir}/log/hp/tmp
|
||||
%dir %attr(0775,root,lp) %{_localstatedir}/run/hplip
|
||||
%{_sysconfdir}/cron.daily/hplip_cron
|
||||
|
||||
%files common
|
||||
@ -527,6 +531,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Thu Mar 14 2013 Tim Waugh <twaugh@redhat.com> - 3.13.3-2
|
||||
- Moved hpfax pipe to /var/run/hplip (bug #917756).
|
||||
|
||||
* Fri Mar 08 2013 Jiri Popelka <jpopelka@redhat.com> - 3.13.3-1
|
||||
- 3.13.3
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user