[ptouch-driver] _cups_serverbin macro + new URL

[Jiří Popelka]

commit 617ad1dec7819398939d944aae8de0b201716b30
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Jan 4 16:08:33 2012 +0100

    _cups_serverbin macro + new URL

 ptouch-driver.spec |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/ptouch-driver.spec b/ptouch-driver.spec
index 6540fe4..0219821 100644
--- a/ptouch-driver.spec
+++ b/ptouch-driver.spec
@@ -1,15 +1,15 @@
 Name:           ptouch-driver
 Version:        1.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        CUPS driver for Brother P-touch label printers
 
 Group:          System Environment/Libraries
 License:        GPLv2+
-URL:            http://www.diku.dk/~panic/P-touch/
-Source0:        http://www.diku.dk/~panic/P-touch/%{name}-%{version}.tar.gz
+URL:            http://www.diku.dk/hjemmesider/ansatte/panic/P-touch/
+Source0:        http://www.diku.dk/hjemmesider/ansatte/panic/P-touch/ptouch-driver-%{version}.tar.gz
 Patch0:         ptouch-driver-1.2-gcc43.patch
 Patch1:         ptouch-driver-1.3-PT-2300.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:  cups-devel
 BuildRequires:  automake
 Requires:       cups
@@ -37,6 +37,7 @@ for driving the family of Brother P-touch label printers.
 
 %build
 # On 64bits, we need to install into lib, not lib64
+# (see _cups_serverbin macro from cups-devel)
 # and this package for some reason uses libdir
 %configure --libdir=%{_prefix}/lib
 make %{?_smp_mflags}
@@ -45,22 +46,22 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
-%{_prefix}/lib/cups/filter/rastertoptch
+%{_cups_serverbin}/filter/rastertoptch
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %files foomatic
-%defattr(-,root,root,-)
 %{_datarootdir}/foomatic/db/source/driver/ptouch.xml
 %{_datarootdir}/foomatic/db/source/printer/Brother-PT-*.xml
 %{_datarootdir}/foomatic/db/source/printer/Brother-QL-*.xml
 %{_datarootdir}/foomatic/db/source/opt/Brother-Ptouch-*.xml
 
 %changelog
+* Wed Jan 04 2012 Jiri Popelka <jpopelka at redhat.com> - 1.3-8
+- Use _cups_serverbin macro from cups-devel for where to put driver executables.
+- Change URL
+- modernize spec
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild