rpms/ptouch-driver/devel ptouch-driver-1.2-execfilterdir.patch, NONE, 1.1 ptouch-driver.spec, 1.1, 1.2

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/extras/rpms/ptouch-driver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3710

Modified Files:
	ptouch-driver.spec 
Added Files:
	ptouch-driver-1.2-execfilterdir.patch 
Log Message:
Fix ppc64 and amd64 build.


ptouch-driver-1.2-execfilterdir.patch:

--- NEW FILE ptouch-driver-1.2-execfilterdir.patch ---
This prevents installing the filter to /usr/lib64 on 64bit platforms.

diff -urp ptouch-driver-1.2.orig/Makefile.am ptouch-driver-1.2/Makefile.am
--- ptouch-driver-1.2.orig/Makefile.am	2007-07-27 19:51:05.000000000 +0200
+++ ptouch-driver-1.2/Makefile.am	2007-07-27 19:53:58.000000000 +0200
@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
 ## USA
 
-execfilterdir			= $(libdir)/cups/filter
+execfilterdir			= $(prefix)/lib/cups/filter
 execfilter_PROGRAMS		= rastertoptch
 rastertoptch_CPPFLAGS		= -D_GNU_SOURCE
 


Index: ptouch-driver.spec
===================================================================
RCS file: /cvs/extras/rpms/ptouch-driver/devel/ptouch-driver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ptouch-driver.spec	27 Jul 2007 17:35:33 -0000	1.1
+++ ptouch-driver.spec	27 Jul 2007 18:03:43 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           ptouch-driver
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        CUPS driver for Brother P-touch label printers
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.diku.dk/~panic/P-touch/
 Source0:        http://www.diku.dk/~panic/P-touch/%{name}-%{version}.tar.gz
+Patch0:         ptouch-driver-1.2-execfilterdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cups-devel
 Requires:       cups
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -36,5 +38,8 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %changelog
+* Fri Jul 27 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.2-2
+- Install to the right place on 64bit platforms
+
 * Fri Jul 20 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.2-1
 - Initial package