[foomatic/f13/master] Use perl_vendorlib macro instead of defining our own.
Tim Waugh
twaugh at fedoraproject.org
Tue Dec 21 16:18:10 UTC 2010
commit 4080de88fc54e9ca69adcc37eefcf5e876005acf
Author: Tim Waugh <twaugh at redhat.com>
Date: Tue Dec 21 16:17:46 2010 +0000
Use perl_vendorlib macro instead of defining our own.
foomatic.spec | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/foomatic.spec b/foomatic.spec
index 632a697..c692aca 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,12 +1,10 @@
-%define installvendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
-%define installvendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
%define enginever 4.0.6
%define filtersver 4.0.6
Summary: Tools for using the foomatic database of printers and printer drivers
Name: foomatic
Version: %{enginever}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Libraries
@@ -120,19 +118,17 @@ popd
rm -rf $RPM_BUILD_ROOT
pushd foomatic-filters-%{filtersver}
-mkdir -p $RPM_BUILD_ROOT/%{installvendorlib}
-export INSTALLSITELIB=$RPM_BUILD_ROOT/%{installvendorlib}
-export INSTALLSITEARCH=$RPM_BUILD_ROOT/%{installvendorarch}
+mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib}
make DESTDIR=%buildroot PREFIX=%{_prefix} \
- INSTALLSITELIB=$RPM_BUILD_ROOT/%{installvendorlib} \
- INSTALLSITEARCH=$RPM_BUILD_ROOT/%{installvendorarch} \
+ INSTALLSITELIB=%{perl_vendorlib} \
+ INSTALLSITEARCH=%{perl_vendorarch} \
install-main install-cups
popd
pushd foomatic-db-engine-%{enginever}
make DESTDIR=%buildroot PREFIX=%{_prefix} \
- INSTALLSITELIB=%{installvendorlib} \
- INSTALLSITEARCH=%{installvendorarch} \
+ INSTALLSITELIB=%{perl_vendorlib} \
+ INSTALLSITEARCH=%{perl_vendorarch} \
install
popd
@@ -174,7 +170,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%{_bindir}/foomatic-printjob
%{_bindir}/foomatic-searchprinter
%{_sbindir}/*
-%{installvendorlib}/Foomatic
+%{perl_vendorlib}/Foomatic
/usr/lib/cups/backend/beh
/usr/lib/cups/driver/*
%{_mandir}/man1/foomatic-combo-xml.1*
@@ -197,6 +193,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%{_mandir}/man1/foomatic-rip.1*
%changelog
+* Tue Dec 21 2010 Tim Waugh <twaugh at redhat.com> - 4.0.6-2
+- Use perl_vendorlib macro instead of defining our own.
+
* Thu Dec 16 2010 Jiri Popelka <jpopelka at redhat.com> - 4.0.6-1
- 4.0.6
More information about the scm-commits
mailing list