Merge branch 'f17' into f18

.gitignore

@@ -8,3 +8,4 @@
 /foomatic-filters-4.0.8.tar.gz
 /foomatic-filters-4.0.13.tar.gz
 /foomatic-filters-4.0.15.tar.gz
+/foomatic-filters-4.0.17.tar.gz

foomatic.spec

@@ -1,10 +1,10 @@
-%define enginever 4.0.8
-%define filtersver 4.0.15
+%global enginever 4.0.8
+%global filtersver 4.0.17
 
 Summary: Tools for using the foomatic database of printers and printer drivers
 Name:       foomatic
 Version:    %{enginever}
-Release:    13%{?dist}
+Release:    14%{?dist}
 License:    GPLv2+
 Group: System Environment/Libraries
 
@@ -109,7 +109,7 @@ popd
 
 %install
 pushd foomatic-filters-%{filtersver}
-mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib}
+mkdir -p %{buildroot}%{perl_vendorlib}
 make    DESTDIR=%buildroot PREFIX=%{_prefix} \
         INSTALLSITELIB=%{perl_vendorlib} \
         INSTALLSITEARCH=%{perl_vendorarch} \
@@ -127,17 +127,17 @@ popd
 ln -sf ../../../bin/foomatic-rip %{buildroot}%{_cups_serverbin}/filter/foomatic-rip
 ln -sf ../../../bin/foomatic-ppdfile %{buildroot}%{_cups_serverbin}/driver/foomatic
 
-mkdir -p $RPM_BUILD_ROOT%{_var}/cache/foomatic
+mkdir -p %{buildroot}%{_var}/cache/foomatic
 
-echo cups > $RPM_BUILD_ROOT%{_sysconfdir}/foomatic/defaultspooler
+echo cups > %{buildroot}%{_sysconfdir}/foomatic/defaultspooler
 
 # Remove things we don't ship.
 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
+        %{buildroot}%{_libdir}/ppr \
+        %{buildroot}%{_sysconfdir}/foomatic/filter.conf.sample \
+        %{buildroot}%{_datadir}/foomatic/templates
+#%{buildroot}%%{_libdir}/perl5/site_perl
+find %{buildroot} -name .packlist | xargs rm -f
 
 %post
 /bin/rm -f /var/cache/foomatic/*
@@ -180,6 +180,9 @@ exit 0
 %{_mandir}/man1/foomatic-rip.1*
 
 %changelog
+* Tue Aug 21 2012 Jiri Popelka <jpopelka@redhat.com> - 4.0.8-14
+- Updated filters to 4.0.17
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.8-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
 5283cd5125a96dc0b35d896326512b1a  foomatic-db-engine-4.0.8.tar.gz
-1b7efcdc57340915647daa5b5c15b0ef  foomatic-filters-4.0.15.tar.gz
+b05f5dcbfe359f198eef3df5b283d896  foomatic-filters-4.0.17.tar.gz