Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at Tue Jun 2 17:38:34 CEST 2009. -------- --- hplip/hplip.changes 2008-12-03 17:31:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/hplip/hplip.changes 2009-06-02 14:47:48.000000000 +0200 @@ -1,0 +2,66 @@ +Tue Jun 2 14:46:19 CEST 2009 - jsmeix@suse.de + +- fix_gcc44_glib.diff fixes GCC/glibc issues, here in particular + "invalid conversion from 'const char*' to 'char*'" errors. + The upstream bug report is + https://bugs.launchpad.net/hplip/+bug/382720 + +------------------------------------------------------------------- +Tue May 5 14:54:42 CEST 2009 - jsmeix@suse.de + +- force-qt4-for-hp-systray-desktop.diff is obsolete because + configure uses --enable-qt4 by default now which obsoletes + also "Recommends: python-qt" (only python-qt4 is required). +- Updated to version 3.9.4b: + A few bug fixies (no Suse bugs). + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 3.9.4: + Added PolicyKit support. Command line tools like hp-setup, + hp-plugin, etc. are now run as regular user. + Added GPG digital signature support to the HPLIP plug-in + to validate that the plug-in is not corrupted and authentic. + Added native CUPS driver support (hpcups) currently for + testing only and added static PPDs for hpcups. + Some more supported printers and all-in-one devices + (in particular a few Designjet PostScript printers). + Many bug fixies (no Suse bugs). + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 3.9.2: + Qt4 now default UI. + Support policy change. End of support date is added to + all HPLIP supported devices, for details see + http://hplipopensource.com/node/314 + New file /var/lib/hp/hplip.state for runtime variable data. + Removed any variable data from /etc/hp/hplip.conf. + Some more supported printers and all-in-one devices. + Major bug fixing on Qt4 solution (no Suse bugs). + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 2.8.12: + From this release forward, all PPD files - even for devices + that require a binary plug-in - will reside in the tarball + (the "plugin PPDs" are moved into hpijs.drv). + Preview (alpha) release of the Qt4 version of HPLIP. + Replaced "MODE 0666" udev device permissions with + "console permissions via HAL". + No new supported devices. + Several bug fixes (no Suse bugs). + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 2.8.10: + Bumped libhpmud version for new plugin attribute. + Many more supported printers and all-in-one devices. + Several bug fixes (no Suse bugs). + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 2.8.9: + Added Qt4 configure option but Qt3 is the default. + Many bug fixes (no Suse bugs). + Several more supported printers, in particular + some Compact Photo (QuickConnect) printers. + For details see + http://hplipopensource.com/hplip-web/release_notes.html + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- force-qt4-for-hp-systray-desktop.diff hplip-2.8.7.tar.bz2 New: ---- fix_gcc44_glib.diff hplip-3.9.4b.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.V31892/_old 2009-06-02 17:34:12.000000000 +0200 +++ /var/tmp/diff_new_pack.V31892/_new 2009-06-02 17:34:12.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package hplip (Version 2.8.7) +# spec file for package hplip (Version 3.9.4b) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,23 +19,27 @@ Name: hplip -BuildRequires: cups cups-devel dbus-1-devel libdrm-devel libgphoto2-devel libjpeg-devel libusb-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt python-tk python-xml qt3-devel readline-devel sane-backends update-desktop-files +BuildRequires: cups cups-devel dbus-1-devel fdupes libdrm-devel libgphoto2-devel libjpeg-devel libqt4-devel libusb-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt4 python-xml readline-devel sane-backends update-desktop-files Summary: HP's Printing, Scanning, and Faxing Software # 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: 2.8.7 -Release: 6 +Version: 3.9.4b +Release: 1 Group: Hardware/Printing License: BSD 3-Clause; GPL v2 or later; X11/MIT -Url: http://hpinkjet.sourceforge.net/ +Url: http://hplipopensource.com # Source0...Source9 is for sources from HP: -# URL for Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/hplip-2.8.7.tar.gz +# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.9.4b.tar.gz Source0: %{name}-%{version}.tar.bz2 # Patch0...Patch9 is for patches from HP: # Patch10...Patch99 is for Suse patches for the sources from HP: -# Fix "... is used uninitialized ..." warnings: +# Patch10 fixes "... is used uninitialized ..." warnings: Patch10: fix-uninitialized-variables.diff +# Patch11 fixes GCC/glibc issues, see http://udrepper.livejournal.com/20948.html +# here in particular "invalid conversion from 'const char*' to 'char*'" errors. +# The upstream bug report is https://bugs.launchpad.net/hplip/+bug/382720 +Patch11: fix_gcc44_glib.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': @@ -46,8 +50,6 @@ # Source102 is a small man page for /usr/bin/hpijs: Source102: hpijs.1.gz # Source103 was the init script for hpssd which is obsolete since version 2.8.4 -# where hpssd is gone and replaced by hp-systray, see -# https://bugzilla.novell.com/show_bug.cgi?id=390663 # Source104 is a script which outputs a global HAL fdi file # for all HP USB devices which belong to HPLIP: Source104: create_hal_global_fdi_from_hpmud_rules @@ -57,10 +59,6 @@ # that the permissions can be changed e.g. by any CUPS filter script # or CUPS backend (both run as user "lp"): Patch101: change-udev-rules.diff -# Patch102 forces the desktop systems to execute hp-systray as "hp-systray --qt4" -# via /etc/xdg/autostart/hplip-systray.desktop so that hp-systray -# docks to the notification tray of the Gnome and KDE desktops. -Patch102: force-qt4-for-hp-systray-desktop.diff # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils, /bin/grep, /bin/sed, /usr/bin/find @@ -74,18 +72,7 @@ Requires: %{name}-hpijs = %{version}-%{release} # Require special Python stuff (which pulls in Python base stuff): Requires: python-xml, pyxml -# Do no longer have a hard RPM requirement for python-qt -# to be able to provide hplip even on a distribution without python-qt. -# Without python-qt all GUI stuff would fail but several /usr/bin/hp-* -# tools have a command line option to run in non-graphical mode -# so that the basic driver functionality still works even without python-qt: -Recommends: python-qt -# Because of Patch102 (force-qt4-for-hp-systray-desktop.diff) -# the python-qt4 RPM is required but this should be no problem because -# in an upcoming release HPLIP will be converted over to Qt4, see -# https://bugs.launchpad.net/hplip/+bug/231978/comments/7 -# and then the above "Recommends: python-qt" can be dropped -# but currently only hp-systray can be used with Qt4: +# Since version 3.9.2 by default only Qt4 is used: Requires: python-qt4 # Since version 2.8.4 all interprocess communication uses dbus. # Therefore python-dbus version 0.80 or greater is required (which pulls in dbus base stuff). @@ -130,7 +117,7 @@ The HPLIP project is open source software and uses GPL-compatible licenses. For more information, see: -http://hpinkjet.sourceforge.net/ +http://hplipopensource.com /usr/share/doc/packages/hplip/index.html @@ -231,12 +218,12 @@ %prep # Be quiet when unpacking: %setup -q -# Fix "... is used uninitialized ..." warnings: +# Patch10 fixes "... is used uninitialized ..." warnings: %patch10 +# Patch11 fixes GCC/glibc issues: +%patch11 # Patch101 changes in the udev rules file the mode from "0666" to "0664": %patch101 -# Patch102 forces the desktop systems to execute hp-systray as "hp-systray --qt4": -%patch102 %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) @@ -251,6 +238,8 @@ # so that enable-foomatic-rip-hplip-install is also needed: ./configure --prefix=/usr \ --libdir=%_libdir \ + --enable-qt4 \ + --disable-policykit \ --enable-doc-build \ --enable-network-build \ --enable-pp-build \ @@ -344,10 +333,10 @@ # Desktop menue entry stuff: # Install the wrapper for hp-toolbox: install -m 755 %{SOURCE101} %{buildroot}%{_bindir}/hp-toolbox.wrapper -# Install /usr/share/hplip/data/images/48x48/prog.png as desktop icon file +# Install /usr/share/hplip/data/images/64x64/hp_logo.png as desktop icon file # because it is used in the hplip.desktop.in and hplip-systray.desktop.in sources: install -d %{buildroot}%{_datadir}/pixmaps -install -m 644 %{buildroot}%{_datadir}/%{name}/data/images/48x48/prog.png %{buildroot}%{_datadir}/pixmaps/HPmenu.png +install -m 644 %{buildroot}%{_datadir}/%{name}/data/images/64x64/hp_logo.png %{buildroot}%{_datadir}/pixmaps/HPmenu.png # Set up and install the desktop menue entry stuff using "Categories=System;Monitor;" # and remove HP's hplip.desktop and hplip-systray.desktop files before because we use Source100: # (additionally there is/was a typo in HP's install because of the trailing blank at 'applications ') @@ -359,6 +348,8 @@ # Install the man page for /usr/bin/hpijs: install -d %{buildroot}%{_mandir}/man1 install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/ +# Find duplicate files: +%fdupes -s %{buildroot} %post /sbin/ldconfig @@ -424,27 +415,38 @@ %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %config %{_sysconfdir}/udev/rules.d/55-hpmud.rules +%config %{_sysconfdir}/udev/rules.d/56-hpmud_support.rules %dir %{_datadir}/hal %dir %{_datadir}/hal/fdi %dir %{_datadir}/hal/fdi/information %dir %{_datadir}/hal/fdi/information/20thirdparty %{_datadir}/hal/fdi/information/20thirdparty/70-hpmud.fdi +%dir %{_datadir}/hal/fdi/preprobe +%dir %{_datadir}/hal/fdi/preprobe/10osvendor +%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi %{_sysconfdir}/xdg/autostart/hplip-systray.desktop %{_datadir}/%{name}/ %{_bindir}/hp-align %{_bindir}/hp-check %{_bindir}/hp-clean %{_bindir}/hp-colorcal +%{_bindir}/hp-devicesetup %{_bindir}/hp-fab +%{_bindir}/hp-faxsetup %{_bindir}/hp-firmware %{_bindir}/hp-info %{_bindir}/hp-levels +%{_bindir}/hp-linefeedcal %{_bindir}/hp-makecopies %{_bindir}/hp-makeuri %{_bindir}/hp-mkuri +%{_bindir}/hp-pkservice %{_bindir}/hp-plugin +%{_bindir}/hp-pqdiag %{_bindir}/hp-print +%{_bindir}/hp-printsettings %{_bindir}/hp-probe +%{_bindir}/hp-query %{_bindir}/hp-scan %{_bindir}/hp-sendfax %{_bindir}/hp-setup @@ -466,10 +468,13 @@ %dir %{_libdir}/cups/filter %{_libdir}/cups/filter/foomatic-rip-hplip %{_libdir}/cups/filter/hplipjs +%{_libdir}/cups/filter/hpcups %dir %{_datadir}/cups %dir %{_datadir}/cups/model %dir %{_datadir}/cups/model/manufacturer-PPDs %{_datadir}/cups/model/manufacturer-PPDs/%{name}/ +%dir /var/lib/hp +/var/lib/hp/hplip.state %doc %{_defaultdocdir}/%{name}/ %{_bindir}/hp-toolbox.wrapper %{_datadir}/pixmaps/HPmenu.png @@ -483,6 +488,66 @@ %{_libdir}/libhpmud.* %changelog +* Tue Jun 02 2009 jsmeix@suse.de +- fix_gcc44_glib.diff fixes GCC/glibc issues, here in particular + "invalid conversion from 'const char*' to 'char*'" errors. + The upstream bug report is + https://bugs.launchpad.net/hplip/+bug/382720 +* Tue May 05 2009 jsmeix@suse.de +- force-qt4-for-hp-systray-desktop.diff is obsolete because + configure uses --enable-qt4 by default now which obsoletes + also "Recommends: python-qt" (only python-qt4 is required). +- Updated to version 3.9.4b: + A few bug fixies (no Suse bugs). + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 3.9.4: + Added PolicyKit support. Command line tools like hp-setup, + hp-plugin, etc. are now run as regular user. + Added GPG digital signature support to the HPLIP plug-in + to validate that the plug-in is not corrupted and authentic. + Added native CUPS driver support (hpcups) currently for + testing only and added static PPDs for hpcups. + Some more supported printers and all-in-one devices + (in particular a few Designjet PostScript printers). + Many bug fixies (no Suse bugs). + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 3.9.2: + Qt4 now default UI. + Support policy change. End of support date is added to + all HPLIP supported devices, for details see + http://hplipopensource.com/node/314 + New file /var/lib/hp/hplip.state for runtime variable data. + Removed any variable data from /etc/hp/hplip.conf. + Some more supported printers and all-in-one devices. + Major bug fixing on Qt4 solution (no Suse bugs). + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 2.8.12: + From this release forward, all PPD files - even for devices + that require a binary plug-in - will reside in the tarball + (the "plugin PPDs" are moved into hpijs.drv). + Preview (alpha) release of the Qt4 version of HPLIP. + Replaced "MODE 0666" udev device permissions with + "console permissions via HAL". + No new supported devices. + Several bug fixes (no Suse bugs). + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 2.8.10: + Bumped libhpmud version for new plugin attribute. + Many more supported printers and all-in-one devices. + Several bug fixes (no Suse bugs). + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 2.8.9: + Added Qt4 configure option but Qt3 is the default. + Many bug fixes (no Suse bugs). + Several more supported printers, in particular + some Compact Photo (QuickConnect) printers. + For details see + http://hplipopensource.com/hplip-web/release_notes.html * Wed Dec 03 2008 lnussel@suse.de - use "usb" instead of "usb_device" (bnc#438867) * Wed Dec 03 2008 jsmeix@suse.de ++++++ change-udev-rules.diff ++++++ --- /var/tmp/diff_new_pack.V31892/_old 2009-06-02 17:34:12.000000000 +0200 +++ /var/tmp/diff_new_pack.V31892/_new 2009-06-02 17:34:12.000000000 +0200 @@ -1,34 +1,200 @@ ---- data/rules/55-hpmud.rules.orig 2008-09-09 13:42:51.000000000 +0200 -+++ data/rules/55-hpmud.rules 2008-10-21 15:30:31.000000000 +0200 -@@ -1,22 +1,22 @@ - # HPLIP udev rules file for HP printer and all-in-one products. +--- data/rules/55-hpmud.rules.orig 2009-04-29 22:38:31.000000000 +0200 ++++ data/rules/55-hpmud.rules 2009-05-05 16:08:32.000000000 +0200 +@@ -14,134 +14,136 @@ + # ACTION!="add", GOTO="hpmud_rules_end" --SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0666" +-SUBSYSTEM=="ppdev", OWNER="lp", GROUP="lp", MODE="0660" -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test" --SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end" +SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664" +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_pid_test" -+SUBSYSTEM!="usb", GOTO="hpmud_rules_end" + SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end" -LABEL="pid_test" +LABEL="hpmud_pid_test" # Check for AiO products (0x03f0xx11). --SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes" -+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" - # Check for Photosmart products (0x03f0xx02). --SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes" -+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="664" + + # Check for Photosmart products without wildcard since cameras and scanners also used (0x03f0xx02). + # The xx02 pid has been retired so this explicit list should not change. + # photosmart_d2300_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c302", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_100 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3802", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_1115 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3402", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_1215 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3202", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_1218 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3302", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_130 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3902", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_1315 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3602", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_140_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1002", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_230 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3502", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_240_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1102", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_320_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1202", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_330_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1602", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_370_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1302", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_380_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1702", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_420_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1502", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_470_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1802", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_7150 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3a02", OWNER="lp", GROUP="lp", MODE="660" +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3b02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_7200_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b002", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_7345 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2002", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_7350 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3c02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_7400_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b802", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_7550 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3e02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_7600_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b202", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_7700_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b402", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_7800_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c002", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_7900_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b602", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_8000_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c102", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_8100_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="ba02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_8200_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c202", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_8400_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bb02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_8700_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bc02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a310_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1d02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a320_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1e02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a430_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1902", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a440_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a510_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1a02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a520_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2602", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a530_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a610_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1b02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a620_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2702", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a630_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2c02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a710_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1c02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_a820_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2902", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_d5060_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c802", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_d5100_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c402", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_d6100_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c502", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_d7100_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c602", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_d7300_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c702", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_pro_b8300_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="be02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_b8800_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d002", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # photosmart_pro_b9100_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bd02", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # Photosmart_B8500_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d102", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # Check for Business Inkjet products (0x03f0xx12). --SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes" -+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" # Check for Deskjet products (0x03f0xx04). --SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes" -+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" # Check for LaserJet products (0x03f0xx17). --SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes" -+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="lp", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes" + # 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 + # ++# Re-enabled the following rule because changing /etc/sane.d/dll.conf is just how it works with SANE. ++# # 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'" ++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'" + + LABEL="hpmud_rules_end" ++++++ fix_gcc44_glib.diff ++++++ --- prnt/hpijs/registry.cpp.orig 2009-04-29 22:41:07.000000000 +0200 +++ prnt/hpijs/registry.cpp 2009-06-02 14:17:09.000000000 +0200 @@ -292,7 +292,7 @@ DRIVER_ERROR DeviceRegistry::SelectDevic device = eDJ3320; match = TRUE; } - char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); + const char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); if (!cmdStr) { cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:"); --- prnt/hpijs/dj3320.cpp.orig 2009-04-29 22:41:07.000000000 +0200 +++ prnt/hpijs/dj3320.cpp 2009-06-02 14:32:21.000000000 +0200 @@ -429,7 +429,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE pLDLEncap->bNewStatus = FALSE; // First 10 bytes of m_pbyReadBuff are packet header. Status query from printer has $S: - if ((pcStr = strstr((const char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL) + if ((pcStr = strstr((char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL) { m_dsCurrentStatus = DISPLAY_COMM_PROBLEM; return DISPLAY_COMM_PROBLEM; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org