From f607a376e94699eeeca1468e8e67a6703dddf183 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Wed, 22 Sep 2010 10:28:18 +0100
Subject: [PATCH 1/3] Avoided another macro in comment.

---
 hplip.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hplip.spec b/hplip.spec
index 5c0ca5f..81118df 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -387,7 +387,7 @@ rm -rf %{buildroot}
 %dir %{_datadir}/ppd/HP
 %{_datadir}/ppd/HP/*.ppd.gz
 %{_datadir}/cups/drv/*
-# Note: this must be /usr/lib not %{_libdir}, since that's the
+# Note: this must be /usr/lib not %%{_libdir}, since that's the
 # CUPS serverbin directory.
 /usr/lib/cups/filter/hpcac
 /usr/lib/cups/filter/hpcups
@@ -420,6 +420,10 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 22 2010 Tim Waugh <twaugh@redhat.com>
+- More fixes from package review:
+  - Avoided another macro in comment.
+
 * Wed Sep 15 2010 Tim Waugh <twaugh@redhat.com>
 - Fixes from package review:
   - Main package and hpijs sub-package require cups for directories.

From 610a682f24d5b23e1e41161adbec7c80bb0edaaa Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Wed, 22 Sep 2010 10:30:10 +0100
Subject: [PATCH 2/3] Use python_sitearch macro throughout.

---
 hplip.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hplip.spec b/hplip.spec
index 68d05d4..65c3c9d 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -266,7 +266,7 @@ rm -rf  %{buildroot}%{_sysconfdir}/sane.d \
 rm -f   %{buildroot}%{_bindir}/foomatic-rip \
         %{buildroot}%{_libdir}/cups/filter/foomatic-rip \
         %{buildroot}%{_libdir}/*.la \
-        %{buildroot}%{_libdir}/python*/site-packages/*.la \
+        %{buildroot}%{python_sitearch}/*.la \
         %{buildroot}%{_libdir}/libhpip.so \
         %{buildroot}%{_libdir}/sane/*.la \
         %{buildroot}%{_datadir}/cups/model/foomatic-ppds \
@@ -463,6 +463,7 @@ fi
 * Wed Sep 22 2010 Tim Waugh <twaugh@redhat.com>
 - More fixes from package review:
   - Avoided another macro in comment.
+  - Use python_sitearch macro throughout.
 
 * Mon Sep 20 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.6-5
 - Increased timeouts for curl, wget, ping for high latency networks (bug #635388).

From 023cb27391afa6b2eafd812b77868e4b490ac70d Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Wed, 29 Sep 2010 22:34:21 -0700
Subject: [PATCH 3/3] - Rebuilt for gcc bug 634757

---
 hplip.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hplip.spec b/hplip.spec
index 46fa40b..2b384ab 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.6
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -456,6 +456,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 29 2010 jkeating - 3.10.6-5.1
+- Rebuilt for gcc bug 634757
+
 * Mon Sep 20 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.6-5
 - Increased timeouts for curl, wget, ping for high latency networks (bug #635388).