From d6d5665f25a32c114e95f98b297a8aff350321e3 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 19 Jun 2006 17:02:33 +0000
Subject: [PATCH] - 0.7.13.

---
 .cvsignore                 |  1 +
 sources                    |  2 +-
 system-config-printer.spec | 16 +++++++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 0b0a216..1d9fdd0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -51,3 +51,4 @@ system-config-printer-0.7.9.tar.bz2
 system-config-printer-0.7.10.tar.bz2
 system-config-printer-0.7.11.tar.bz2
 system-config-printer-0.7.12.tar.bz2
+system-config-printer-0.7.13.tar.bz2
diff --git a/sources b/sources
index 41f8c2b..61df6d1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 c00f3b265bc10efcc67561f2ae2e8465  pycups-1.9.11.tar.bz2
-950a4102202b7045b5b80da4fdbaecf0  system-config-printer-0.7.12.tar.bz2
+a77a70a4146d454905c73dd138e72bae  system-config-printer-0.7.13.tar.bz2
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 1f5e0e7..1a4dd1c 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.12
+Version: 0.7.13
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -45,30 +45,29 @@ the configuration tool.
 %setup -q -a 1
 
 %build
+%configure
+
 pushd pycups-%{pycups_version}
 make
 popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%makeinstall
+
 pushd pycups-%{pycups_version}
 make install DESTDIR=%buildroot
 popd
 
-mkdir -p %buildroot%{_datadir}/%{name}
 mkdir -p %buildroot%{_bindir}
-mkdir -p %buildroot%{_sbindir}
 mkdir -p %buildroot%{_sysconfdir}/pam.d
 mkdir -p %buildroot%{_sysconfdir}/security/console.apps
-install -m0755 *.py %buildroot%{_datadir}/%{name}/
-install -m0644 *.glade %buildroot%{_datadir}/%{name}/
-install -m0755 %{name} %buildroot%{_sbindir}/
 install -m0644 %{SOURCE2} %buildroot%{_sysconfdir}/pam.d/%{name}
 install -m0644 %{SOURCE3} %buildroot%{_sysconfdir}/security/console.apps/%{name}
 ln -s consolehelper %buildroot%{_bindir}/%{name}
 
 # Desktop file installation.
-mkdir $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor redhat \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
   --add-category X-Red-Hat-Base                        \
@@ -106,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Mon Jun 19 2006 Tim Waugh <twaugh@redhat.com> 0.7.13-1
+- 0.7.13.
+
 * Fri Jun  9 2006 Tim Waugh <twaugh@redhat.com> 0.7.12-1
 - 0.7.12.