From e8ca1bba8934774c8a91b25d8f4dcc62f6793bd0 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 3 Aug 2007 17:23:54 +0000
Subject: [PATCH] - 2.7.7.

---
 .cvsignore          |  1 +
 hplip-2.7.6-1.patch | 11 -----------
 hplip-desktop.patch | 15 ---------------
 hplip.spec          | 13 +++++--------
 sources             |  2 +-
 5 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 hplip-2.7.6-1.patch
 delete mode 100644 hplip-desktop.patch

diff --git a/.cvsignore b/.cvsignore
index 2754f28..58b6d19 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -16,3 +16,4 @@ hplip-1.7.1.tar.gz
 hplip-1.7.2.tar.gz
 hplip-1.7.4a.tar.gz
 hplip-2.7.6.tar.gz
+hplip-2.7.7.tar.gz
diff --git a/hplip-2.7.6-1.patch b/hplip-2.7.6-1.patch
deleted file mode 100644
index 5df2c05..0000000
--- a/hplip-2.7.6-1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr hplip-2.7.6.old/prnt/hpijs/djgenericvip.h hplip-2.7.6.new/prnt/hpijs/djgenericvip.h
---- hplip-2.7.6.old/prnt/hpijs/djgenericvip.h	2007-07-06 10:31:25.000000000 -0700
-+++ hplip-2.7.6.new/prnt/hpijs/djgenericvip.h	2007-07-06 10:48:25.000000000 -0700
-@@ -52,6 +52,7 @@
-     virtual PHOTOTRAY_STATE PhotoTrayEngaged (BOOL bQueryPrinter);
-     //! Returns TRUE if a hagaki feed is present in printer.
-     virtual BOOL HagakiFeedPresent(BOOL bQueryPrinter);
-+	virtual DATA_FORMAT GetDataFormat () { return RASTER_STRIP; }
- 
- #ifdef APDK_AUTODUPLEX
-     //!Returns TRUE if duplexer and hagaki feed (combined) unit is present in printer.
diff --git a/hplip-desktop.patch b/hplip-desktop.patch
deleted file mode 100644
index 1f17a61..0000000
--- a/hplip-desktop.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- hplip-2.7.6/hplip.desktop.in.desktop	2007-04-23 19:46:01.000000000 +0100
-+++ hplip-2.7.6/hplip.desktop.in	2007-07-17 15:39:34.000000000 +0100
-@@ -1,10 +1,10 @@
- [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
-+Exec=@bindir@/hp-toolbox
- Icon=@abs_datadir@/hplip/data/images/HPmenu.png
- Terminal=false
- Categories=Application;Utility;
diff --git a/hplip.spec b/hplip.spec
index fab52f4..1028689 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 2.7.6
-Release: 10%{?dist}
+Version: 2.7.7
+Release: 1%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -13,8 +13,6 @@ Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
 Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
-Patch0: http://switch.dl.sourceforge.net/sourceforge/hplip/hplip-2.7.6-1.patch
-Patch1: hplip-desktop.patch
 Patch2: hplip-guest.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
@@ -89,10 +87,6 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
 %prep
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
-%patch0 -p1 -b .patchlevel1
-
-# Use /usr/share/applications for putting desktop files in.
-%patch1 -p1 -b .desktop
 
 # Quieten hpssd on startup.
 %patch3 -p1 -b .quiet
@@ -273,6 +267,9 @@ fi
 exit 0
 
 %changelog
+* Fri Aug  3 2007 Tim Waugh <twaugh@redhat.com> 2.7.7-1 
+- 2.7.7.
+
 * Mon Jul 23 2007 Tim Waugh <twaugh@redhat.com> 2.7.6-10 
 - Move libhpmud to hpijs package (bug #248978).
 
diff --git a/sources b/sources
index 9ac6afd..1eb5d19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7493f4d53ec98123d69c9b36318cc1f5  hplip-2.7.6.tar.gz
+086bd6a306fa2dfbd6e8c962fddcdef4  hplip-2.7.7.tar.gz