SPECS: foomatic-db-engine.spec - rel 2

[patrys]

Author: patrys                       Date: Mon Mar 17 17:01:19 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2

---- Files affected:
SPECS:
   foomatic-db-engine.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/foomatic-db-engine.spec
diff -u SPECS/foomatic-db-engine.spec:1.27 SPECS/foomatic-db-engine.spec:1.28
--- SPECS/foomatic-db-engine.spec:1.27	Mon Mar 17 14:13:17 2008
+++ SPECS/foomatic-db-engine.spec	Mon Mar 17 18:01:14 2008
@@ -5,15 +5,17 @@
 Summary(pl.UTF-8):	System umożliwiający używanie darmowych sterowników drukarek
 Name:		foomatic-db-engine
 Version:	3.0.%{snap}
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 URL:		http://www.linuxprinting.org/foomatic.html
 Source0:	http://www.linuxprinting.org/download/foomatic/%{name}-3.0-%{snap}.tar.gz
 # Source0-md5:	d6ac64aeaa1f6ecdf386df6b6ad380a7
+Patch0:		%{name}-destdir.patch
+Patch1:		%{name}-cups.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	foomatic-filters >= 3.0.2
+BuildRequires:	foomatic-filters >= 3.0.20080317
 BuildRequires:	libxml2-devel
 BuildRequires:	perl-devel
 BuildRequires:	rpm-perlprov
@@ -21,6 +23,8 @@
 Obsoletes:	foomatic
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define	_ulibdir	%{_prefix}/lib
+
 %description
 Foomatic is a system for using free software printer drivers with
 common spoolers on Unix. It supports LPD, PDQ, CUPS, the VA Linux LPD,
@@ -36,13 +40,14 @@
 
 %prep
 %setup -q -n %{name}-3.0-%{snap}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal} -I .
 %{__autoconf}
 %configure
 %{__make} \
-	PERLPREFIX=/usr \
 	PERL_INSTALLDIRS=vendor
 
 %install
@@ -51,7 +56,6 @@
 chmod +x mkinstalldirs
 
 %{__make} install \
-	PERLPREFIX=/usr \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/{driver,opt,printer}
@@ -65,7 +69,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/foomatic
 %attr(755,root,root) %{_bindir}/foomatic-*
 %attr(755,root,root) %{_sbindir}/foomatic-*
-%attr(755,root,root) %{_libdir}/cups/driver/foomatic
+%attr(755,root,root) %{_ulibdir}/cups/driver/foomatic
 %{perl_vendorlib}/Foomatic
 %{_datadir}/foomatic
 %{_mandir}/man1/*
@@ -77,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2008-03-17 17:01:14  patrys
+- rel 2
+
 Revision 1.27  2008-03-17 13:13:17  patrys
 - current version (ver schema changed)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/foomatic-db-engine.spec?r1=1.27&r2=1.28&f=u