Merge branch 'f13' into f14

foomatic.spec

@@ -1,10 +1,12 @@
+%define installvendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define installvendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
 %define enginever 4.0.5
 %define filtersver 4.0.5
 
 Summary: Tools for using the foomatic database of printers and printer drivers
 Name:       foomatic
 Version:    %{enginever}
-Release:    2%{?dist}
+Release:    3%{?dist}
 License:    GPLv2+
 Group: System Environment/Libraries
 
@@ -118,20 +120,19 @@ popd
 rm -rf $RPM_BUILD_ROOT
 
 pushd foomatic-filters-%{filtersver}
-eval `perl '-V:installvendorlib' '-V:installvendorarch'`
-mkdir -p $RPM_BUILD_ROOT/$installvendorlib
-export INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib
-export INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch
+mkdir -p $RPM_BUILD_ROOT/%{installvendorlib}
+export INSTALLSITELIB=$RPM_BUILD_ROOT/%{installvendorlib}
+export INSTALLSITEARCH=$RPM_BUILD_ROOT/%{installvendorarch}
 make    DESTDIR=%buildroot PREFIX=%{_prefix} \
-        INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
-        INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
+        INSTALLSITELIB=$RPM_BUILD_ROOT/%{installvendorlib} \
+        INSTALLSITEARCH=$RPM_BUILD_ROOT/%{installvendorarch} \
         install-main install-cups
 popd
 
 pushd foomatic-db-engine-%{enginever}
 make    DESTDIR=%buildroot PREFIX=%{_prefix} \
-        INSTALLSITELIB=$installvendorlib \
-        INSTALLSITEARCH=$installvendorarch \
+        INSTALLSITELIB=%{installvendorlib} \
+        INSTALLSITEARCH=%{installvendorarch} \
         install
 popd
 
@@ -144,10 +145,11 @@ mkdir -p $RPM_BUILD_ROOT%{_var}/cache/foomatic
 echo cups > $RPM_BUILD_ROOT%{_sysconfdir}/foomatic/defaultspooler
 
 # Remove things we don't ship.
-rm -rf  $RPM_BUILD_ROOT%{_libdir}/perl5/site_perl \
+rm -rf  \
         $RPM_BUILD_ROOT%{_libdir}/ppr \
         $RPM_BUILD_ROOT%{_sysconfdir}/foomatic/filter.conf.sample \
         $RPM_BUILD_ROOT%{_datadir}/foomatic/templates
+#$RPM_BUILD_ROOT%{_libdir}/perl5/site_perl
 find $RPM_BUILD_ROOT -name .packlist | xargs rm -f
 
 %post
@@ -172,7 +174,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_bindir}/foomatic-printjob
 %{_bindir}/foomatic-searchprinter
 %{_sbindir}/*
-%{_datadir}/perl5/Foomatic
+%{installvendorlib}/Foomatic
 /usr/lib/cups/backend/beh
 /usr/lib/cups/driver/*
 %{_mandir}/man1/foomatic-combo-xml.1*
@@ -195,6 +197,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_mandir}/man1/foomatic-rip.1*
 
 %changelog
+* Fri Oct 15 2010 Tim Waugh <twaugh@redhat.com> - 4.0.5-3
+- Removed hard-coded perl paths from spec file.
+
 * Tue Oct  5 2010 Tim Waugh <twaugh@redhat.com> - 4.0.5-2
 - Updated summary and description to more accurately reflect package
   contents (bug #630651).