From 14f23263b381fddf13fc2086a3bd26b80ce3eef3 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Wed, 3 Mar 2010 10:45:12 +0000
Subject: [PATCH] - Set defattr in gui sub-package file manifest. - Avoid mixed
 use of spaces and tabs.

---
 hplip.spec | 61 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/hplip.spec b/hplip.spec
index 382d1b4..e633872 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -25,7 +25,7 @@ Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch16: hplip-bad-low-ink-warning.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
 Requires(post): /sbin/chkconfig
@@ -160,11 +160,11 @@ sed -i.duplex-constraints \
 
 %build
 %configure \
-	--enable-scan-build --enable-gui-build --enable-fax-build \
-	--disable-foomatic-rip-hplip-install --enable-pp-build \
-	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
-	--enable-hpijs-install --enable-udev-acl-rules \
-	--disable-policykit
+        --enable-scan-build --enable-gui-build --enable-fax-build \
+        --disable-foomatic-rip-hplip-install --enable-pp-build \
+        --enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
+        --enable-hpijs-install --enable-udev-acl-rules \
+        --disable-policykit
 
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -177,31 +177,31 @@ mkdir -p %{buildroot}%{_bindir}
 make install DESTDIR=%{buildroot}
 
 # Remove unpackaged files
-rm -rf	%{buildroot}%{_sysconfdir}/sane.d \
-	%{buildroot}%{_docdir} \
-	%{buildroot}%{_datadir}/hal/fdi \
-	%{buildroot}%{_datadir}/hplip/pkservice.py \
-	%{buildroot}%{_bindir}/hp-pkservice
+rm -rf  %{buildroot}%{_sysconfdir}/sane.d \
+        %{buildroot}%{_docdir} \
+        %{buildroot}%{_datadir}/hal/fdi \
+        %{buildroot}%{_datadir}/hplip/pkservice.py \
+        %{buildroot}%{_bindir}/hp-pkservice
 
-rm -f	%{buildroot}%{_bindir}/foomatic-rip \
-	%{buildroot}%{_libdir}/cups/filter/foomatic-rip \
-	%{buildroot}%{_libdir}/*.la \
-	%{buildroot}%{_libdir}/python*/site-packages/*.la \
-	%{buildroot}%{_libdir}/libhpip.so \
-	%{buildroot}%{_libdir}/sane/*.la \
-	%{buildroot}%{_datadir}/cups/model/foomatic-ppds \
-	%{buildroot}%{_datadir}/applications/hplip.desktop \
-	%{buildroot}%{_datadir}/ppd/HP/*.ppd
+rm -f   %{buildroot}%{_bindir}/foomatic-rip \
+        %{buildroot}%{_libdir}/cups/filter/foomatic-rip \
+        %{buildroot}%{_libdir}/*.la \
+        %{buildroot}%{_libdir}/python*/site-packages/*.la \
+        %{buildroot}%{_libdir}/libhpip.so \
+        %{buildroot}%{_libdir}/sane/*.la \
+        %{buildroot}%{_datadir}/cups/model/foomatic-ppds \
+        %{buildroot}%{_datadir}/applications/hplip.desktop \
+        %{buildroot}%{_datadir}/ppd/HP/*.ppd
 
 mkdir -p %{buildroot}%{_datadir}/applications
 sed -i -e '/^Categories=/d' hplip.desktop
-desktop-file-install --vendor HP				\
-	--dir %{buildroot}%{_datadir}/applications		\
-	--add-category System					\
-	--add-category Settings					\
-	--add-category HardwareSettings				\
-	--add-category Application				\
-	hplip.desktop
+desktop-file-install --vendor HP                                \
+        --dir %{buildroot}%{_datadir}/applications              \
+        --add-category System                                   \
+        --add-category Settings                                 \
+        --add-category HardwareSettings                         \
+        --add-category Application                              \
+        hplip.desktop
 
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/sane.d/dll.d
 echo hpaio > %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio
@@ -321,6 +321,7 @@ rm -rf %{buildroot}
 %{_libdir}/python*/site-packages/*
 
 %files gui
+%defattr(-,root,root,-)
 %{_bindir}/hp-check
 %{_bindir}/hp-print
 %{_bindir}/hp-systray
@@ -367,6 +368,10 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Wed Mar  3 2010 Tim Waugh <twaugh@redhat.com> - 3.10.2-3
+- Set defattr in gui sub-package file manifest.
+- Avoid mixed use of spaces and tabs.
+
 * Mon Mar  1 2010 Tim Waugh <twaugh@redhat.com> - 3.10.2-2
 - Removed SYSFS use in udev rules and actually made them work
   (bug #560754).