Attachment 307356 Details for Bug 445717 – Mercurial changeset of changes needed for hplip 2.8.5

[patch] Mercurial changeset of changes needed for hplip 2.8.5

hplip-2.8.5.changeset (text/plain), 5.80 KB, created by Douglas E. Warner on 2008-06-02 12:50:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas E. Warner

Created: 2008-06-02 12:50:49 UTC

Size: 5.80 KB

patch

obsolete

># HG changeset patch
># User Douglas E. Warner <silfreed@silfreed.net>
># Date 1212410716 14400
># Node ID 537d34a10d9d0a0a5e8ce9ddded73f9d5cd3ae9d
># Parent  1d7855e65f1c798484ff7a6bbeb29c2123e5cf81
>update to 2.8.5
>added post/postun ldconfig for hpijs package
>fixed spaces/tabs in libsane-hpaio post and pre
>added hp-systray binary and libs
>added hplipjs cups filter
>fixed suprious executable perms on source files
>updated command that fixes executable perms in docs/images to only
>change files
>added BuildRequires for dbus and dbus-devel
>updated hplip-desktop.patch and hplip-quiet.patch to work with 2.8.5
>
>diff -r 1d7855e65f1c -r 537d34a10d9d hplip/hplip-desktop.patch
>--- a/hplip/hplip-desktop.patch	Sun Jun 01 17:56:24 2008 -0400
>+++ b/hplip/hplip-desktop.patch	Mon Jun 02 08:45:16 2008 -0400
>@@ -1,15 +1,10 @@
>---- hplip-2.7.7/hplip.desktop.in.desktop	2007-08-01 22:00:39.000000000 +0100
>-+++ hplip-2.7.7/hplip.desktop.in	2007-08-04 09:13:48.000000000 +0100
>-@@ -1,10 +1,10 @@
>+diff -ub hplip-2.8.5/hplip.desktop.in hplip-2.8.5-new/hplip.desktop.in
>+--- hplip-2.8.5/hplip.desktop.in	2008-05-08 12:26:03.000000000 -0400
>++++ hplip-2.8.5-new/hplip.desktop.in	2008-05-31 22:02:07.000000000 -0400
>+@@ -1,5 +1,5 @@
>  [Desktop Entry]
> -Version=0.6
> +Encoding=UTF-8
>  Type=Application
>  Name=HP Device Manager
>- GenericName=HP Device Manager
>- Comment=View device status, ink levels and perform maintenance.
>--Exec=@abs_datadir@/hplip/toolbox.py
>-+Exec=@bindir@/hp-toolbox
>- Icon=@abs_datadir@/hplip/data/images/HPmenu.png
>- Terminal=false
>- Categories=Application;Utility;
>+ GenericName=Printer Management Application
>diff -r 1d7855e65f1c -r 537d34a10d9d hplip/hplip-quiet.patch
>--- a/hplip/hplip-quiet.patch	Sun Jun 01 17:56:24 2008 -0400
>+++ b/hplip/hplip-quiet.patch	Mon Jun 02 08:45:16 2008 -0400
>@@ -1,11 +1,9 @@
>---- hplip-2.7.6/hpssd.py.quiet	2007-06-01 00:23:37.000000000 +0100
>-+++ hplip-2.7.6/hpssd.py	2007-06-29 14:06:25.000000000 +0100
>-@@ -656,8 +656,6 @@
>-                 usage()
>+diff -ub hplip-2.8.5/hpssd.py hplip-2.8.5-new/hpssd.py
>+--- hplip-2.8.5/hpssd.py	2008-05-08 12:26:03.000000000 -0400
>++++ hplip-2.8.5-new/hpssd.py	2008-05-31 22:06:40.000000000 -0400
>+@@ -495,5 +495,4 @@
>+             sys.exit(0)
>  
>  
>--    utils.log_title(__title__, __version__)
>--
>-     prop.history_size = 100
>- 
>-     if prop.daemonize:
>+-    utils.log_title(__title__, __version__)    
>+     sys.exit(run())
>diff -r 1d7855e65f1c -r 537d34a10d9d hplip/hplip.spec
>--- a/hplip/hplip.spec	Sun Jun 01 17:56:24 2008 -0400
>+++ b/hplip/hplip.spec	Mon Jun 02 08:45:16 2008 -0400
>@@ -1,7 +1,7 @@
> Summary: HP Linux Imaging and Printing Project
> Name: hplip
>-Version: 2.8.2
>-Release: 2%{?dist}
>+Version: 2.8.5
>+Release: 1%{?dist}
> License: GPLv2+ and MIT
> Group: System Environment/Daemons
> Conflicts: system-config-printer < 0.6.132
>@@ -44,6 +44,8 @@
> BuildRequires: openssl-devel
> BuildRequires: autoconf
> BuildRequires: sane-backends-devel
>+BuildRequires: dbus
>+BuildRequires: dbus-devel
> 
> %description
> The Hewlett-Packard Linux Imaging and Printing Project provides
>@@ -116,6 +118,12 @@
> # Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
> %patch13 -p1 -b .ui-optional
> 
>+# fix spurious executable perms
>+%{__chmod} -x \
>+	scan/sane/*.h \
>+	scan/sane/*.c \
>+	scan/scanext/*.c
>+
> autoconf # for patch4
> 
> %build
>@@ -157,7 +165,7 @@
> install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
> 
> # Images in docdir should not be executable (bug #440552).
>-chmod 644 doc/images/*
>+find doc/images/ -type f -exec chmod -x {} \;
> 
> # Remove files we don't want to package.
> rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc
>@@ -173,6 +181,7 @@
> %{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
> %dir %{_sysconfdir}/hp
> %config(noreplace) %{_sysconfdir}/hp/hplip.conf
>+%config(noreplace) %{_sysconfdir}/xdg/autostart/hplip-systray.desktop
> %{_bindir}/hp-align
> %{_bindir}/hp-clean
> %{_bindir}/hp-colorcal
>@@ -186,6 +195,7 @@
> %{_bindir}/hp-scan
> %{_bindir}/hp-sendfax
> %{_bindir}/hp-setup
>+%{_bindir}/hp-systray
> %{_bindir}/hp-testpage
> %{_bindir}/hp-timedate
> %{_bindir}/hp-unload
>@@ -193,6 +203,7 @@
> # CUPS serverbin directory.
> /usr/lib/cups/backend/hp
> /usr/lib/cups/backend/hpfax
>+/usr/lib/cups/filter/hplipjs
> # Python extension
> %{_libdir}/python*/site-packages/*
> # Files
>@@ -213,6 +224,7 @@
> %{_datadir}/hplip/scan.py*
> %{_datadir}/hplip/sendfax.py*
> %{_datadir}/hplip/setup.py*
>+%{_datadir}/hplip/systray.py*
> %{_datadir}/hplip/testpage.py*
> %{_datadir}/hplip/timedate.py*
> %{_datadir}/hplip/unload.py*
>@@ -260,7 +272,7 @@
> # No daemons any more.
> /sbin/chkconfig --del hplip 2>/dev/null || true
> if [ -x /etc/init.d/hplip ]; then
>-  /sbin/service hplip stop
>+	/sbin/service hplip stop
> fi
> 
> %post gui
>@@ -269,15 +281,31 @@
> %postun gui
> /usr/bin/update-desktop-database &>/dev/null ||:
> 
>+%post -n hpijs -p /sbin/ldconfig
>+
>+%postun -n hpijs -p /sbin/ldconfig
>+
> %post -n libsane-hpaio
> /sbin/ldconfig
> if [ -f /etc/sane.d/dll.conf ] && \
>-   ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
>-        echo hpaio >> /etc/sane.d/dll.conf; \
>+	! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
>+		echo hpaio >> /etc/sane.d/dll.conf; \
> fi
> exit 0
> 
> %changelog
>+* Sat May 31 2008 Douglas E. Warner <silfreed@silfreed.net> 2.8.5-1
>+- update to 2.8.5
>+- added post/postun ldconfig for hpijs package
>+- fixed spaces/tabs in libsane-hpaio post and pre
>+- added hp-systray binary and libs
>+- added hplipjs cups filter
>+- fixed suprious executable perms on source files
>+- updated command that fixes executable perms in docs/images to only
>+  change files
>+- added BuildRequires for dbus and dbus-devel
>+- updated hplip-desktop.patch and hplip-quiet.patch to work with 2.8.5
>+
> * Fri Apr  4 2008 Tim Waugh <twaugh@redhat.com> 2.8.2-2
> - Update hplip.fdi for Fedora 9: info.bus -> info.subsystem.
> - Images in docdir should not be executable (bug #440552).

Actions: View | Diff

Attachments on bug 445717: 307356