[hplip: 1/3] 3.13.5
Jiří Popelka
jpopelka at fedoraproject.org
Tue May 14 17:35:31 UTC 2013
commit af46106cd47a21797afcbf804a73a10d8ddff2e3
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Tue May 14 18:59:32 2013 +0200
3.13.5
.gitignore | 1 +
hplip-3.13.4.tar.gz.asc | 7 ----
hplip-3.13.5.tar.gz.asc | 7 ++++
hplip-dbglog-newline.patch | 50 ++++++++++++++++----------------
hplip-logdir.patch | 66 ++++++++++++++++++++++----------------------
hplip-udev-rules.patch | 30 ++++++++++----------
hplip.spec | 8 ++++-
sources | 2 +-
8 files changed, 88 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 480f366..dc79a25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ hplip-3.10.6.tar.gz
/hplip-3.13.2.tar.gz
/hplip-3.13.3.tar.gz
/hplip-3.13.4.tar.gz
+/hplip-3.13.5.tar.gz
diff --git a/hplip-3.13.5.tar.gz.asc b/hplip-3.13.5.tar.gz.asc
new file mode 100644
index 0000000..29c7366
--- /dev/null
+++ b/hplip-3.13.5.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlGMyHEACgkQc9dwzaWQR7mbhQCg6toDozQF4AOYtjUKU2oEdKDx
+DYIAn0vw4HPVVDL+u95ug5xW8B+vgE+e
+=Fbzl
+-----END PGP SIGNATURE-----
diff --git a/hplip-dbglog-newline.patch b/hplip-dbglog-newline.patch
index a221e96..2de9a01 100644
--- a/hplip-dbglog-newline.patch
+++ b/hplip-dbglog-newline.patch
@@ -1,7 +1,7 @@
-diff -up hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp
---- hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2013-04-09 12:26:18.750566175 +0200
-+++ hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp 2013-04-09 12:27:07.525884647 +0200
-@@ -452,7 +452,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
+diff -up hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2013-05-14 15:01:34.288431852 +0200
++++ hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp 2013-05-14 15:03:08.103139571 +0200
+@@ -471,7 +471,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
m_DBusComm.sendEvent(EVENT_PRINT_FAILED_MISSING_PLUGIN, "Plugin missing", m_JA.job_id, m_JA.user_name);
}
@@ -10,36 +10,36 @@ diff -up hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.13.4/p
ppdClose(m_ppd);
m_ppd = NULL;
return err;
-@@ -545,7 +545,7 @@ int HPCupsFilter::StartPrintJob(int arg
- close(fd);
+@@ -564,7 +564,7 @@ int HPCupsFilter::StartPrintJob(int arg
}
+
if (m_iLogLevel & BASIC_LOG)
- dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()", err);
+ dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()\n", err);
+
closeFilter();
cupsRasterClose(cups_raster);
- return 1;
-@@ -555,7 +555,7 @@ int HPCupsFilter::StartPrintJob(int arg
- close(fd);
+@@ -576,7 +576,7 @@ int HPCupsFilter::StartPrintJob(int arg
}
+
if (m_iLogLevel & BASIC_LOG)
- dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()");
+ dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()\n");
+
closeFilter();
cupsRasterClose(cups_raster);
- return 0;
-@@ -705,7 +705,7 @@ int HPCupsFilter::processRasterData(cups
- //Need to revisit to crosscheck if it is a firmware issue.
+@@ -728,7 +728,7 @@ int HPCupsFilter::processRasterData(cups
+ //Need to revisit to crosscheck if it is a firmware issue.
- *m_pPrinterBuffer = 0x01;
-- dbglog("First raster data plane.." );
-+ dbglog("First raster data plane..\n" );
- }
+ *m_pPrinterBuffer = 0x01;
+- dbglog("First raster data plane.." );
++ dbglog("First raster data plane..\n" );
+ }
if (this->isBlankRaster((BYTE *) m_pPrinterBuffer, &cups_header)) {
-diff -up hplip-3.13.4/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.13.4/prnt/hpcups/Lidil.cpp
---- hplip-3.13.4/prnt/hpcups/Lidil.cpp.dbglog-newline 2013-04-08 11:52:06.000000000 +0200
-+++ hplip-3.13.4/prnt/hpcups/Lidil.cpp 2013-04-09 12:26:19.400557093 +0200
+diff -up hplip-3.13.5/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.13.5/prnt/hpcups/Lidil.cpp
+--- hplip-3.13.5/prnt/hpcups/Lidil.cpp.dbglog-newline 2013-05-10 12:03:36.000000000 +0200
++++ hplip-3.13.5/prnt/hpcups/Lidil.cpp 2013-05-14 15:01:34.985422251 +0200
@@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline *
if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
m_pPM->BaseResY != m_pQA->vertical_resolution)
@@ -94,9 +94,9 @@ diff -up hplip-3.13.4/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.13.4/prnt/hpc
return false;
}
-diff -up hplip-3.13.4/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.13.4/prnt/hpcups/Pcl3.cpp
---- hplip-3.13.4/prnt/hpcups/Pcl3.cpp.dbglog-newline 2013-04-08 11:52:06.000000000 +0200
-+++ hplip-3.13.4/prnt/hpcups/Pcl3.cpp 2013-04-09 12:26:19.400557093 +0200
+diff -up hplip-3.13.5/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.13.5/prnt/hpcups/Pcl3.cpp
+--- hplip-3.13.5/prnt/hpcups/Pcl3.cpp.dbglog-newline 2013-05-10 12:03:36.000000000 +0200
++++ hplip-3.13.5/prnt/hpcups/Pcl3.cpp 2013-05-14 15:01:34.985422251 +0200
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline **
if (!selectPrintMode())
@@ -140,9 +140,9 @@ diff -up hplip-3.13.4/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.13.4/prnt/hpcu
return false;
}
-diff -up hplip-3.13.4/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.13.4/prnt/hpcups/Pcl3Gui.cpp
---- hplip-3.13.4/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2013-04-08 11:52:06.000000000 +0200
-+++ hplip-3.13.4/prnt/hpcups/Pcl3Gui.cpp 2013-04-09 12:26:19.400557093 +0200
+diff -up hplip-3.13.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.13.5/prnt/hpcups/Pcl3Gui.cpp
+--- hplip-3.13.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2013-05-10 12:03:36.000000000 +0200
++++ hplip-3.13.5/prnt/hpcups/Pcl3Gui.cpp 2013-05-14 15:01:34.986422237 +0200
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline
if (!selectPrintMode())
diff --git a/hplip-logdir.patch b/hplip-logdir.patch
index 043f47b..3ef579b 100644
--- a/hplip-logdir.patch
+++ b/hplip-logdir.patch
@@ -1,6 +1,6 @@
-diff -up hplip-3.13.4/fax/backend/hpfax.py.logdir hplip-3.13.4/fax/backend/hpfax.py
---- hplip-3.13.4/fax/backend/hpfax.py.logdir 2013-04-08 11:58:34.000000000 +0200
-+++ hplip-3.13.4/fax/backend/hpfax.py 2013-04-09 12:12:18.485307795 +0200
+diff -up hplip-3.13.5/fax/backend/hpfax.py.logdir hplip-3.13.5/fax/backend/hpfax.py
+--- hplip-3.13.5/fax/backend/hpfax.py.logdir 2013-05-10 12:09:22.000000000 +0200
++++ hplip-3.13.5/fax/backend/hpfax.py 2013-05-14 14:57:19.458942171 +0200
@@ -244,7 +244,7 @@ else:
input_fd = 0
@@ -10,9 +10,9 @@ diff -up hplip-3.13.4/fax/backend/hpfax.py.logdir hplip-3.13.4/fax/backend/hpfax
pipe_name = os.path.join(tmp_dir, "hpfax-pipe-%d" % job_id)
-diff -up hplip-3.13.4/logcapture.py.logdir hplip-3.13.4/logcapture.py
---- hplip-3.13.4/logcapture.py.logdir 2013-04-08 11:58:45.000000000 +0200
-+++ hplip-3.13.4/logcapture.py 2013-04-09 12:12:18.485307795 +0200
+diff -up hplip-3.13.5/logcapture.py.logdir hplip-3.13.5/logcapture.py
+--- hplip-3.13.5/logcapture.py.logdir 2013-05-10 12:09:32.000000000 +0200
++++ hplip-3.13.5/logcapture.py 2013-05-14 14:57:19.458942171 +0200
@@ -39,7 +39,7 @@ CUPS_BACKUP_FILE='/etc/cups/cupsd.conf_o
LOG_FOLDER_PATH='./'
LOG_FOLDER_NAME='hplip_troubleshoot_logs'
@@ -31,9 +31,9 @@ diff -up hplip-3.13.4/logcapture.py.logdir hplip-3.13.4/logcapture.py
if File_list:
sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES))
if sts != 0:
-diff -up hplip-3.13.4/prnt/filters/hplipjs.c.logdir hplip-3.13.4/prnt/filters/hplipjs.c
---- hplip-3.13.4/prnt/filters/hplipjs.c.logdir 2013-04-08 11:53:27.000000000 +0200
-+++ hplip-3.13.4/prnt/filters/hplipjs.c 2013-04-09 12:12:18.486307781 +0200
+diff -up hplip-3.13.5/prnt/filters/hplipjs.c.logdir hplip-3.13.5/prnt/filters/hplipjs.c
+--- hplip-3.13.5/prnt/filters/hplipjs.c.logdir 2013-05-10 12:04:50.000000000 +0200
++++ hplip-3.13.5/prnt/filters/hplipjs.c 2013-05-14 14:57:19.459942157 +0200
@@ -275,7 +275,8 @@ int main (int argc, char **argv)
{
fprintf (stderr, "DEBUG: HPLIPJS: argv[%d] = %s\n", i, argv[i]);
@@ -44,9 +44,9 @@ diff -up hplip-3.13.4/prnt/filters/hplipjs.c.logdir hplip-3.13.4/prnt/filters/hp
HPFp = fopen (szPSFile, "w");
#endif
-diff -up hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp
---- hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.logdir 2013-04-09 12:12:18.478307892 +0200
-+++ hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp 2013-04-09 12:15:34.838563875 +0200
+diff -up hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp.logdir 2013-05-14 14:57:19.450942281 +0200
++++ hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp 2013-05-14 14:59:45.745927028 +0200
@@ -31,7 +31,9 @@
\*****************************************************************************/
@@ -57,13 +57,13 @@ diff -up hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.4/prnt/hpcu
#include <sys/wait.h>
#include <sys/utsname.h>
#include <time.h>
-@@ -39,9 +41,15 @@
+@@ -39,10 +41,15 @@
#define HP_FILE_VERSION_STR "03.09.08.0"
+char *env_tmpdir = NULL;
-+
static HPCupsFilter filter;
+
int main (int argc, char *argv[])
{
+ env_tmpdir = getenv ("TMPDIR");
@@ -73,7 +73,7 @@ diff -up hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.4/prnt/hpcu
openlog("hpcups", LOG_PID, LOG_DAEMON);
if (argc < 6 || argc > 7) {
-@@ -587,9 +595,10 @@ int HPCupsFilter::processRasterData(cups
+@@ -610,9 +617,10 @@ int HPCupsFilter::processRasterData(cups
DRIVER_ERROR err;
int ret_status = 0;
@@ -86,8 +86,8 @@ diff -up hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.4/prnt/hpcu
while (cupsRasterReadHeader2(cups_raster, &cups_header))
-@@ -651,14 +660,15 @@ int HPCupsFilter::processRasterData(cups
-
+@@ -675,14 +683,15 @@ int HPCupsFilter::processRasterData(cups
+ // Save Raster file for Debugging
if (m_iLogLevel & SAVE_INPUT_RASTERS)
{
- char szFileName[64];
@@ -104,7 +104,7 @@ diff -up hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.4/prnt/hpcu
createTempFile(szFileName, &cfp);
if (cfp)
{
-@@ -669,7 +679,7 @@ int HPCupsFilter::processRasterData(cups
+@@ -693,7 +702,7 @@ int HPCupsFilter::processRasterData(cups
if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
cups_header.cupsColorSpace == CUPS_CSPACE_K)
{
@@ -113,9 +113,9 @@ diff -up hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.4/prnt/hpcu
createTempFile(szFileName, &kfp);
if (kfp)
{
-diff -up hplip-3.13.4/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.13.4/prnt/hpcups/LJZjStream.cpp
---- hplip-3.13.4/prnt/hpcups/LJZjStream.cpp.logdir 2013-04-08 11:52:06.000000000 +0200
-+++ hplip-3.13.4/prnt/hpcups/LJZjStream.cpp 2013-04-09 12:12:18.487307767 +0200
+diff -up hplip-3.13.5/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.13.5/prnt/hpcups/LJZjStream.cpp
+--- hplip-3.13.5/prnt/hpcups/LJZjStream.cpp.logdir 2013-05-10 12:03:36.000000000 +0200
++++ hplip-3.13.5/prnt/hpcups/LJZjStream.cpp 2013-05-14 14:57:19.460942143 +0200
@@ -42,9 +42,12 @@
#include "LJZjStream.h"
#include "Utils.h"
@@ -144,9 +144,9 @@ diff -up hplip-3.13.4/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.13.4/prnt/hpcups
if (1 != m_pJA->pre_process_raster || !firstpage_cups_header->Duplex){
return NO_ERROR;
-diff -up hplip-3.13.4/prnt/hpcups/SystemServices.cpp.logdir hplip-3.13.4/prnt/hpcups/SystemServices.cpp
---- hplip-3.13.4/prnt/hpcups/SystemServices.cpp.logdir 2013-04-08 11:52:06.000000000 +0200
-+++ hplip-3.13.4/prnt/hpcups/SystemServices.cpp 2013-04-09 12:12:18.488307753 +0200
+diff -up hplip-3.13.5/prnt/hpcups/SystemServices.cpp.logdir hplip-3.13.5/prnt/hpcups/SystemServices.cpp
+--- hplip-3.13.5/prnt/hpcups/SystemServices.cpp.logdir 2013-05-10 12:03:36.000000000 +0200
++++ hplip-3.13.5/prnt/hpcups/SystemServices.cpp 2013-05-14 14:57:19.460942143 +0200
@@ -31,14 +31,17 @@
#include "CommonDefinitions.h"
#include "SystemServices.h"
@@ -167,9 +167,9 @@ diff -up hplip-3.13.4/prnt/hpcups/SystemServices.cpp.logdir hplip-3.13.4/prnt/hp
createTempFile(fname, &m_fp);
if (m_fp)
-diff -up hplip-3.13.4/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.13.4/prnt/hpijs/hpcupsfax.cpp
---- hplip-3.13.4/prnt/hpijs/hpcupsfax.cpp.logdir 2013-04-08 11:53:31.000000000 +0200
-+++ hplip-3.13.4/prnt/hpijs/hpcupsfax.cpp 2013-04-09 12:12:18.488307753 +0200
+diff -up hplip-3.13.5/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.13.5/prnt/hpijs/hpcupsfax.cpp
+--- hplip-3.13.5/prnt/hpijs/hpcupsfax.cpp.logdir 2013-05-10 12:04:54.000000000 +0200
++++ hplip-3.13.5/prnt/hpijs/hpcupsfax.cpp 2013-05-14 14:57:19.461942130 +0200
@@ -29,6 +29,7 @@
POSSIBILITY OF SUCH DAMAGE.
\*****************************************************************************/
@@ -219,9 +219,9 @@ diff -up hplip-3.13.4/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.13.4/prnt/hpijs/hp
// fdFax = mkstemp (hpFileName);
fdFax = createTempFile(hpFileName, &pFilePtrFax);
-diff -up hplip-3.13.4/prnt/hpijs/hpijs.cpp.logdir hplip-3.13.4/prnt/hpijs/hpijs.cpp
---- hplip-3.13.4/prnt/hpijs/hpijs.cpp.logdir 2013-04-09 12:12:18.475307934 +0200
-+++ hplip-3.13.4/prnt/hpijs/hpijs.cpp 2013-04-09 12:12:18.489307739 +0200
+diff -up hplip-3.13.5/prnt/hpijs/hpijs.cpp.logdir hplip-3.13.5/prnt/hpijs/hpijs.cpp
+--- hplip-3.13.5/prnt/hpijs/hpijs.cpp.logdir 2013-05-14 14:57:19.448942309 +0200
++++ hplip-3.13.5/prnt/hpijs/hpijs.cpp 2013-05-14 14:57:19.461942130 +0200
@@ -29,6 +29,7 @@
POSSIBILITY OF SUCH DAMAGE.
\*****************************************************************************/
@@ -273,9 +273,9 @@ diff -up hplip-3.13.4/prnt/hpijs/hpijs.cpp.logdir hplip-3.13.4/prnt/hpijs/hpijs.
if ((pSS->InitScript(szCapOutFile, TRUE)) != NO_ERROR)
BUG("unable to init capture");
#endif
-diff -up hplip-3.13.4/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.13.4/prnt/hpijs/hpijsfax.cpp
---- hplip-3.13.4/prnt/hpijs/hpijsfax.cpp.logdir 2013-04-08 11:53:31.000000000 +0200
-+++ hplip-3.13.4/prnt/hpijs/hpijsfax.cpp 2013-04-09 12:12:18.489307739 +0200
+diff -up hplip-3.13.5/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.13.5/prnt/hpijs/hpijsfax.cpp
+--- hplip-3.13.5/prnt/hpijs/hpijsfax.cpp.logdir 2013-05-10 12:04:54.000000000 +0200
++++ hplip-3.13.5/prnt/hpijs/hpijsfax.cpp 2013-05-14 14:57:19.462942116 +0200
@@ -31,6 +31,7 @@
#ifdef HAVE_LIBHPIP
diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
index 90c7c6f..6b3fbd4 100644
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@@ -1,23 +1,23 @@
-diff -up hplip-3.12.11/data/rules/56-hpmud_support.rules.udev-rules hplip-3.12.11/data/rules/56-hpmud_support.rules
---- hplip-3.12.11/data/rules/56-hpmud_support.rules.udev-rules 2012-11-20 10:53:51.000000000 +0100
-+++ hplip-3.12.11/data/rules/56-hpmud_support.rules 2012-11-27 10:07:00.377519016 +0100
-@@ -6,6 +6,7 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
+diff -up hplip-3.13.5/data/rules/56-hpmud.rules.udev-rules hplip-3.13.5/data/rules/56-hpmud.rules
+--- hplip-3.13.5/data/rules/56-hpmud.rules.udev-rules 2013-05-14 14:56:07.716930453 +0200
++++ hplip-3.13.5/data/rules/56-hpmud.rules 2013-05-14 14:54:37.757169708 +0200
+@@ -7,6 +7,7 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_dev
- LABEL="pid_test"
+ LABEL="hpmud_usb_rules"
+ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
- # Check for LaserJet products (0x03f0xx17).
- ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attrs{product}", ENV{hp_test}="yes"
- # Check for LaserJet products (0x03f0xx2a).
-diff -up hplip-3.12.11/Makefile.in.udev-rules hplip-3.12.11/Makefile.in
---- hplip-3.12.11/Makefile.in.udev-rules 2012-11-20 10:55:50.000000000 +0100
-+++ hplip-3.12.11/Makefile.in 2012-11-27 10:07:00.380518971 +0100
-@@ -4353,7 +4353,7 @@ cups_drv = prnt/drv/hpcups.drv
+ # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl
+ ATTR{idVendor}=="03f0", ATTR{idProduct}=="????", OWNER="root", GROUP="lp", MODE="0660", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1"
+
+diff -up hplip-3.13.5/Makefile.in.udev-rules hplip-3.13.5/Makefile.in
+--- hplip-3.13.5/Makefile.in.udev-rules 2013-05-14 12:45:14.670392763 +0200
++++ hplip-3.13.5/Makefile.in 2013-05-14 12:47:24.779623958 +0200
+@@ -4369,7 +4369,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE at dist_cron_DATA = data/rules/hplip_cron
# hpmud.rules
- at HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
+ at HPLIP_BUILD_TRUE@rulesdir = /usr/lib/udev/rules.d
- @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE at dist_rules_DATA = data/rules/56-hpmud_support.rules \
- @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@ data/rules/86-hpmud_plugin.rules \
- @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@ data/rules/56-hpmud_add_printer.rules \
+ @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE at dist_rules_DATA = data/rules/56-hpmud.rules
+ @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE at dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
+ @HPLIP_BUILD_TRUE at halpredir = /usr/share/hal/fdi/preprobe/10osvendor
diff --git a/hplip.spec b/hplip.spec
index 145577b..9d7ad26 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -6,8 +6,8 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
-Version: 3.13.4
-Release: 3%{?dist}
+Version: 3.13.5
+Release: 1%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
@@ -378,6 +378,7 @@ rm -f %{buildroot}%{_bindir}/hp-uninstall
rm -f %{buildroot}%{_datadir}/hplip/upgrade.*
rm -f %{buildroot}%{_bindir}/hp-upgrade
rm -f %{buildroot}%{_bindir}/hp-config_usb_printer
+rm -f %{buildroot}%{_unitdir}/hplip-printer at .service
rm -f %{buildroot}%{_datadir}/hplip/config_usb_printer.*
rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template
rm -f %{buildroot}%{_datadir}/cups/mime/pstotiff.types
@@ -534,6 +535,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
+* Tue May 14 2013 Jiri Popelka <jpopelka at redhat.com> - 3.13.5-1
+- 3.13.5
+
* Fri May 10 2013 Jiri Popelka <jpopelka at redhat.com> - 3.13.4-3
- Device ID for HP LaserJet 2200 (bug #873123#c8).
diff --git a/sources b/sources
index 5199db1..7ff0dfd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5c247161e2fd7685e0520e968393d19 hplip-3.13.4.tar.gz
+f0c406f06f191a120f7d283b69ff10e8 hplip-3.13.5.tar.gz
More information about the scm-commits
mailing list