Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2012-10-12 08:05:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip", Maintainer is "jsm...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2012-05-03 10:57:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hplip.new/hplip.changes 2012-10-12 08:11:31.000000000 +0200 @@ -1,0 +2,100 @@ +Wed Oct 10 14:23:14 CEST 2012 - jsm...@suse.de + +- Bugfix version upgrade to 3.12.10a: + The 'a' does not mean 'alpha' but "first bugfix of 3.12.10". + Fixed crash in HP Device Manager and System Tray due to + ValueError exception in HPLIP upgrade functionality, see + https://bugs.launchpad.net/hplip/+bug/1064889 (bnc#784173). +- Added "chmod a+x ... usr/share/hplip/fax/pstotiff" because + "make install" installs it only with -rw-r--r-- permissions + so that when the CUPS filter usr/lib/cups/filter/pstotiff + which is a link to usr/share/hplip/fax/pstotiff is called, + it cannot execute usr/share/hplip/fax/pstotiff, see + https://bugs.launchpad.net/hplip/+bug/1064247 (bnc#783810). + +------------------------------------------------------------------- +Fri Oct 5 11:51:35 CEST 2012 - jsm...@suse.de + +- Version upgrade to 3.12.10: + Perhaps HP binary plugin installation failure fixed upstream + see https://bugs.launchpad.net/hplip/+bug/1048732 + A few more supported printers and all-in-one devices. + A few bug fixes. + For details see + http://hplipopensource.com/hplip-web/release_notes.html + +------------------------------------------------------------------- +Thu Oct 4 13:37:56 CEST 2012 - jsm...@suse.de + +- no-hplip_cron.diff deactivates the "cron" stuff in Makefile.am + because it lets build fail on SLE11 products (possibly an + autoconf issue) and we (SUSE) do not allow to install files + like /etc/cron.daily/hplip_cron via RPMs. Instead hplip_cron + is provided as /usr/share/doc/packages/hplip/hplip_cron +- The /var/lib/hp directory is created everywhere except on + openSUSE 12.2 and later versions (perhaps also an autoconf + issue) so that it is created in the install section if it + does not exist as a simple and fail-safe workaround + see https://bugs.launchpad.net/bugs/1018303 + and (bnc#780413). +- Adapted change-udev-rules.diff so that it applies to + the HPLIP 3.12.9 sources. + +------------------------------------------------------------------- +Fri Sep 28 12:42:33 UTC 2012 - mmeis...@suse.com + +- Fixed fix-no-return-in-nonvoid-function.diff because + HP's upstream fix is insufficient (not 64-bit safe), + see https://bugs.launchpad.net/hplip/+bug/1017496 +- Adapted no-chgrp_lp_hplip_Logdir.diff so that it + applies to the HPLIP 3.12.9 sources. + +------------------------------------------------------------------ +Fri Sep 28 08:20:55 UTC 2012 - mmeis...@suse.com + +- Version upgrade to 3.12.9: + User can collect logs by running 'hp-logcapture' command + for any issue in print/scan/fax functionality. + Logs get stored in /var/log/hp/tmp. + Several more supported printers and all-in-one devices. + Several bug fixes. + For details see + http://hplipopensource.com/hplip-web/release_notes.html + +------------------------------------------------------------------- +Thu Jun 28 12:00:28 CEST 2012 - jsm...@suse.de + +- Provide the /var/lib/hp directory that is required in particular + by hp-plugin (see https://bugs.launchpad.net/hplip/+bug/1018303) + in the hplip-hpijs package to be on the safe side because + hplip-hpijs is the minimal (printing-only) way to use HPLIP. + +------------------------------------------------------------------- +Mon Jun 25 15:56:54 UTC 2012 - m...@philipp-wagner.com + +- Add libusb 1.0 as dependency. If necessary building with + libusb 0.1 would be possible as well by setting a configure + flag. + +------------------------------------------------------------------- +Mon Jun 25 14:42:59 UTC 2012 - m...@philipp-wagner.com + +- fix-no-return-in-nonvoid-function.diff fixes compiler warnings + causing a no-return-in-nonvoid-function error during the build. + An upstream bug report is open at + https://bugs.launchpad.net/hplip/+bug/1017496 + +------------------------------------------------------------------- +Mon Jun 25 09:47:53 UTC 2012 - m...@philipp-wagner.com + +- Upgraded to version 3.12.6: + 'hp-check' tool when run with "--fix" option resolves missing + dependencies/groups/plugin and disable SELinux. + Added PIN to PRINT support for HP Color LaserJet CM4540 MFP. + libusb-1.0 support added. + Several more supported printers and all-in-one devices. + Several bug fixes. + For details see + http://hplipopensource.com/hplip-web/release_notes.html + +------------------------------------------------------------------- Old: ---- hplip-3.12.4.tar.gz New: ---- fix-no-return-in-nonvoid-function.diff hplip-3.12.10a.tar.gz no-hplip_cron.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.ShnQVf/_old 2012-10-12 08:11:32.000000000 +0200 +++ /var/tmp/diff_new_pack.ShnQVf/_new 2012-10-12 08:11:32.000000000 +0200 @@ -30,7 +30,7 @@ BuildRequires: libjpeg-devel BuildRequires: libqt4-devel BuildRequires: libtool -BuildRequires: libusb-devel +BuildRequires: libusb-1_0-devel BuildRequires: net-snmp-devel BuildRequires: pkgconfig # All printer driver packages should have "BuildRequires: python-cups" @@ -50,20 +50,20 @@ %endif BuildRequires: update-desktop-files Summary: HP's Printing, Scanning, and Faxing Software -License: BSD-3-Clause ; GPL-2.0+ ; MIT +License: BSD-3-Clause and GPL-2.0+ and MIT Group: Hardware/Printing # HPLIP has reached 1.0 status. With this release a date encoded revision number is used: # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June) # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc -Version: 3.12.4 +Version: 3.12.10a Release: 0 Url: http://hplipopensource.com # Source0...Source9 is for sources from HP: -# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.4.tar.gz -# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.4.tar.gz.asc +# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.10a.tar.gz +# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.10a.tar.gz.asc # How to verify Source0 see: http://hplipopensource.com/node/327 # For example: /usr/bin/gpg --keyserver pgp.mit.edu --recv-keys 0xA59047B9 -# /usr/bin/gpg --verify hplip-3.12.4.tar.gz.asc hplip-3.12.4.tar.gz +# /usr/bin/gpg --verify hplip-3.12.10a.tar.gz.asc hplip-3.12.10a.tar.gz # must result: Good signature from "HPLIP (HP Linux Imaging and Printing) <hp...@hp.com>" Source0: hplip-%{version}.tar.gz # Patch0...Patch9 is for patches from HP: @@ -73,6 +73,10 @@ # Patch11 fix_gcc44_glib.diff is obsolete since version 3.9.6b because it is fixed in the source. # Patch12 hplip-3.9.8-CVE-2010-4267.patch fixes a remote buffer overflow in hpmud/pml.c: Patch12: hplip-3.9.8-CVE-2010-4267.patch +# Fix validation errors about no return values for non-void functions. +# An upstream bug report is open at +# https://bugs.launchpad.net/hplip/+bug/1017496 +Patch13: fix-no-return-in-nonvoid-function.diff # Source100... is for special Suse sources: # Source100 is the primary source for the suse_update_desktop_file stuff. # It is found automatically in $RPM_SOURCE_DIR by 'suse_update_desktop_file -i hplip': @@ -100,11 +104,15 @@ # Patch100... is for special Suse patches: # Patch101 changes the udev rules files 55-hpmud.rules and 56-hpmud_support.rules: Patch101: change-udev-rules.diff -# Patch102 deactivates the "chgrp lp -R /var/log/hp" in Makefile.am +# Patch102 no-chgrp_lp_hplip_Logdir.diff deactivates the "chgrp lp -R /var/log/hp" in Makefile.am # because during install this results "Operation not permitted" # this is done in the files section via attr(0774,root,lp) # where mode 0774 matches to what is set in Makefile.am: Patch102: no-chgrp_lp_hplip_Logdir.diff +# Patch103 no-hplip_cron.diff deactivates the "cron" stuff in Makefile.am +# because it lets build fail on SLE11 products (possibly an autoconf issue) +# and we (i.e. SUSE) do not allow to install /etc/cron.daily/hplip_cron +Patch103: no-hplip_cron.diff # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils @@ -310,14 +318,21 @@ # Patch12 hplip-3.9.8-CVE-2010-4267.patch # fixes a remote buffer overflow in hpmud/pml.c: %patch12 +# Patch13 fix-no-return-in-nonvoid-function.diff +# fixes no-return-in-nonvoid-function errors +%patch13 # Patch101 change-udev-rules.diff # changes the udev rules files 55-hpmud.rules and 56-hpmud_support.rules: %patch101 -# Patch102 deactivates the "chgrp lp -R /var/log/hp" in Makefile.am +# Patch102 no-chgrp_lp_hplip_Logdir.diff deactivates the "chgrp lp -R /var/log/hp" in Makefile.am # because during install this results "Operation not permitted" # this is done in the files section via attr(0774,root,lp) # where mode 0774 matches to what is set in Makefile.am: %patch102 +# Patch103 no-hplip_cron.diff deactivates the "cron" stuff in Makefile.am +# because it lets build fail on SLE11 products (possibly an autoconf issue) +# and we (i.e. SUSE) do not allow to install /etc/cron.daily/hplip_cron +%patch103 %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) @@ -379,6 +394,22 @@ %install make install DESTDIR=%{buildroot} +# HPLIP's "make install" installs -rw-r--r-- usr/share/hplip/fax/pstotiff +# and usr/lib/cups/filter/pstotiff -> usr/share/hplip/fax/pstotiff +# so that when the CUPS filter usr/lib/cups/filter/pstotiff is called, +# it cannot execute usr/share/hplip/fax/pstotiff which is fixed hereby +# (see https://bugs.launchpad.net/hplip/+bug/1064247 and bnc#783810): +chmod a+x %{buildroot}%{_datadir}/hplip/fax/pstotiff +# The /var/lib/hp directory is created everywhere except on openSUSE 12.2 and later versions +# (perhaps an autoconf issue) so that it is created here as simple and fail-safe workaround +# see https://bugs.launchpad.net/bugs/1018303 and bnc#780413 +# using fixed "/var/log/hp" because this is hardcoded in the HPLIP sources +# regarding owner and permissions see the "files hpijs" section below +# and Patch102 no-chgrp_lp_hplip_Logdir.diff: +test -d %{buildroot}/var/lib/hp || install -d %{buildroot}/var/lib/hp +# Provide hplip_cron as /usr/share/doc/packages/hplip/hplip_cron +# see Patch103 no-hplip_cron.diff: +install -m 644 data/rules/hplip_cron %{buildroot}%{_defaultdocdir}/%{name}/ # Remove the installed /etc/sane.d/dll.conf # because this is provided by the sane-backends package: rm %{buildroot}%{_sysconfdir}/sane.d/dll.conf @@ -571,6 +602,7 @@ %{_bindir}/hp-info %{_bindir}/hp-levels %{_bindir}/hp-linefeedcal +%{_bindir}/hp-logcapture %{_bindir}/hp-makecopies %{_bindir}/hp-makeuri %{_bindir}/hp-mkuri @@ -632,7 +664,11 @@ %dir %{_datadir}/cups/model/manufacturer-PPDs %{_datadir}/cups/model/manufacturer-PPDs/%{name}/ %{_datadir}/%{name}/data/models/models.dat -%dir %attr(0774,root,lp) %{_var}/log/hp +# Use fixed "/var/log/hp" because this is hardcoded in the HPLIP sources. +# Regarding attr(0774,root,lp) see no-chgrp_lp_hplip_Logdir.diff (Patch102): +%dir %attr(0774,root,lp) /var/log/hp +# Use fixed "/var/lib/hp" because this is hardcoded in the HPLIP sources: +%dir /var/lib/hp %files sane %defattr(-, root, root) ++++++ change-udev-rules.diff ++++++ --- /var/tmp/diff_new_pack.ShnQVf/_old 2012-10-12 08:11:32.000000000 +0200 +++ /var/tmp/diff_new_pack.ShnQVf/_new 2012-10-12 08:11:32.000000000 +0200 @@ -1,13 +1,13 @@ ---- data/rules/55-hpmud.rules.orig 2011-12-09 12:19:54.000000000 +0100 -+++ data/rules/55-hpmud.rules 2012-01-12 16:20:57.000000000 +0100 -@@ -12,142 +12,186 @@ +--- data/rules/55-hpmud.rules.orig 2012-09-04 14:33:13.000000000 +0200 ++++ data/rules/55-hpmud.rules 2012-10-04 15:39:27.000000000 +0200 +@@ -12,142 +12,187 @@ # 3. This rules file is an attempt at being compatable with all distros. Feel free to make your own changes and if you feel your # changes are not distro specific please send your patch to us. 2/11/2009, D Suffield # +# SUSE changed: +# +# ATTRS{idVendor} to ATTR{idVendor} and -+# ATTRS{idProduct to ATTR{idProduct} ++# ATTRS{idProduct} to ATTR{idProduct} +# because ATTRS search all parents which wastes resources +# while ATTR is sufficient here, +# see https://bugzilla.novell.com/show_bug.cgi?id=436085 @@ -230,6 +230,9 @@ # Check for DesignJet product (0x03f0xx14). -ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="660" +ATTR{idVendor}=="03f0", ATTR{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes" ++ ++# The following rule will disable USB autosuspend for the device ++ENV{libsane_matched}=="yes", RUN+="/bin/sh -c 'test -e /sys/$env{DEVPATH}/power/level && echo on > /sys/$env{DEVPATH}/power/level'" # Removed the following rule because FHS states that /etc should be reserved for static files only. This # functionality should be done in a deb/rpm post install script. 2/11/2009, D Suffield @@ -244,25 +247,22 @@ # If sane-bankends is installed add hpaio backend support to dll.conf if needed. -# ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'" +ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'" -+ -+# The following rule will disable USB autosuspend for the device -+ENV{libsane_matched}=="yes", RUN+="/bin/sh -c 'test -e /sys/$env{DEVPATH}/power/level && echo on > /sys/$env{DEVPATH}/power/level'" LABEL="hpmud_rules_end" ---- data/rules/56-hpmud_support.rules.orig 2011-12-09 12:19:54.000000000 +0100 -+++ data/rules/56-hpmud_support.rules 2012-01-12 16:24:00.000000000 +0100 ++ +--- data/rules/56-hpmud_support.rules.orig 2012-09-04 14:33:13.000000000 +0200 ++++ data/rules/56-hpmud_support.rules 2012-10-04 15:43:36.000000000 +0200 @@ -1,15 +1,16 @@ # HPLIP udev rules file. Notify console user if plugin support is required for this device. -ACTION!="add", GOTO="hpmud_rules_end" -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test" -SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end" -- --LABEL="pid_test" +ACTION!="add", GOTO="hpmud_support_rules_end" +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_support_pid_test" +SUBSYSTEM!="usb_device", GOTO="hpmud_support_rules_end" -+ + +-LABEL="pid_test" +LABEL="hpmud_support_pid_test" # Check for LaserJet products (0x03f0xx17). @@ -276,19 +276,27 @@ -LABEL="hpmud_rules_end" +LABEL="hpmud_support_rules_end" + ---- data/rules/86-hpmud_plugin.rules.orig 2011-12-09 12:19:54.000000000 +0100 -+++ data/rules/86-hpmud_plugin.rules 2012-01-12 17:07:28.000000000 +0100 -@@ -1,9 +1,9 @@ +--- data/rules/86-hpmud_plugin.rules.orig 2012-09-04 14:33:13.000000000 +0200 ++++ data/rules/86-hpmud_plugin.rules 2012-10-04 15:46:25.000000000 +0200 +@@ -1,13 +1,15 @@ # Load hp firmware for this printer. -ACTION!="add", GOTO="hpmud_rules_end" +ACTION!="add", GOTO="hpmud_plugin_rules_end" + #Check and add printer for Suse 10.3 distro # hp_Marvel_Device (These printer requires the plugin files. installling when device is detected) --SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m &'" --SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m &'" -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m &'" -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m &'" - +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM} &'" +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM}&'" ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM} &'" ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM}&'" + + #Check and add printer for other distros +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m %c &'" +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m %c &'" -LABEL="hpmud_rules_end" ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m %c &'" ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m %c &'" ++ +LABEL="hpmud_plugin_rules_end" ++ ++++++ fix-no-return-in-nonvoid-function.diff ++++++ --- scan/sane/hpaio.c.orig 2012-09-04 14:32:55.000000000 +0200 +++ scan/sane/hpaio.c 2012-09-28 14:20:24.595427330 +0200 @@ -368,7 +368,7 @@ extern const SANE_Option_Descriptor * sa if (strcmp(*((char **)handle), "SCL-PML") == 0) return sclpml_get_option_descriptor(handle, option); else - return SANE_STATUS_UNSUPPORTED; + return NULL; } /* sane_hpaio_get_option_descriptor() */ extern SANE_Status sane_hpaio_control_option(SANE_Handle handle, SANE_Int option, SANE_Action action, void * pValue, SANE_Int * pInfo ) ++++++ hplip-3.12.4.tar.gz -> hplip-3.12.10a.tar.gz ++++++ /work/SRC/openSUSE:Factory/hplip/hplip-3.12.4.tar.gz /work/SRC/openSUSE:Factory/.hplip.new/hplip-3.12.10a.tar.gz differ: char 5, line 1 ++++++ no-chgrp_lp_hplip_Logdir.diff ++++++ --- /var/tmp/diff_new_pack.ShnQVf/_old 2012-10-12 08:11:32.000000000 +0200 +++ /var/tmp/diff_new_pack.ShnQVf/_new 2012-10-12 08:11:32.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2012-04-10 10:35:14.000000000 +0200 -+++ Makefile.am 2012-04-13 12:05:40.000000000 +0200 -@@ -509,14 +509,14 @@ endif +--- Makefile.am.orig 2012-09-04 14:34:06.000000000 +0200 ++++ Makefile.am 2012-09-28 11:18:21.065027065 +0200 +@@ -552,24 +552,24 @@ endif install-dist_hplip_LogDATA: if FULL_BUILD test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) @@ -13,8 +13,19 @@ - chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) chmod 774 $(DESTDIR)$(hplip_Logdir) --endif #FULL_BUILD -+endif #HPLIP_BUILD + endif #FULL_BUILD - install-data-hook: + install-dist_hplip_tmpDATA: + if FULL_BUILD + test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) +- chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) ++# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) + chmod 1774 $(DESTDIR)$(hplip_tmpdir) + endif #FULL_BUILD if HPLIP_BUILD + test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) +- chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) ++# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) + chmod 1774 $(DESTDIR)$(hplip_tmpdir) + endif #FULL_BUILD + ++++++ no-hplip_cron.diff ++++++ --- Makefile.am.after-no-chgrp_lp_hplip_Logdir.diff 2012-09-28 15:17:30.000000000 +0200 +++ Makefile.am 2012-09-28 15:19:34.000000000 +0200 @@ -107,8 +107,8 @@ hp_mkuri_LDADD = -ldl libhpmud.la hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" # cron files -crondir = /etc/cron.daily -dist_cron_DATA = data/rules/hplip_cron +#crondir = /etc/cron.daily +#dist_cron_DATA = data/rules/hplip_cron # hpmud.rules rulesdir = /etc/udev/rules.d @@ -573,17 +573,17 @@ if HPLIP_BUILD chmod 1774 $(DESTDIR)$(hplip_tmpdir) endif #FULL_BUILD -install-dist_cronDATA:$(dist_cron_DATA) - test -z "$(DESTDIR)$(crondir)" || $(MKDIR_P) "$(DESTDIR)$(crondir)"; \ - list='$(dist_cron_DATA)'; test -n "$(crondir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL) -m755 $$files '$(DESTDIR)$(crondir)'"; \ - $(INSTALL) -m755 $$files "$(DESTDIR)$(crondir)" || exit $$?; \ - done +#install-dist_cronDATA:$(dist_cron_DATA) +# test -z "$(DESTDIR)$(crondir)" || $(MKDIR_P) "$(DESTDIR)$(crondir)"; \ +# list='$(dist_cron_DATA)'; test -n "$(crondir)" || list=; \ +# for p in $$list; do \ +# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +# echo "$$d$$p"; \ +# done | $(am__base_list) | \ +# while read files; do \ +# echo " $(INSTALL) -m755 $$files '$(DESTDIR)$(crondir)'"; \ +# $(INSTALL) -m755 $$files "$(DESTDIR)$(crondir)" || exit $$?; \ +# done install-data-hook: if HPLIP_BUILD -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
