Merge branch 'f17' into f18
This commit is contained in:
commit
ce14ea3458
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@
|
|||||||
/foomatic-filters-4.0.8.tar.gz
|
/foomatic-filters-4.0.8.tar.gz
|
||||||
/foomatic-filters-4.0.13.tar.gz
|
/foomatic-filters-4.0.13.tar.gz
|
||||||
/foomatic-filters-4.0.15.tar.gz
|
/foomatic-filters-4.0.15.tar.gz
|
||||||
|
/foomatic-filters-4.0.17.tar.gz
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
%define enginever 4.0.8
|
%global enginever 4.0.8
|
||||||
%define filtersver 4.0.15
|
%global filtersver 4.0.17
|
||||||
|
|
||||||
Summary: Tools for using the foomatic database of printers and printer drivers
|
Summary: Tools for using the foomatic database of printers and printer drivers
|
||||||
Name: foomatic
|
Name: foomatic
|
||||||
Version: %{enginever}
|
Version: %{enginever}
|
||||||
Release: 13%{?dist}
|
Release: 14%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
|
|
||||||
@ -109,7 +109,7 @@ popd
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
pushd foomatic-filters-%{filtersver}
|
pushd foomatic-filters-%{filtersver}
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib}
|
mkdir -p %{buildroot}%{perl_vendorlib}
|
||||||
make DESTDIR=%buildroot PREFIX=%{_prefix} \
|
make DESTDIR=%buildroot PREFIX=%{_prefix} \
|
||||||
INSTALLSITELIB=%{perl_vendorlib} \
|
INSTALLSITELIB=%{perl_vendorlib} \
|
||||||
INSTALLSITEARCH=%{perl_vendorarch} \
|
INSTALLSITEARCH=%{perl_vendorarch} \
|
||||||
@ -127,17 +127,17 @@ popd
|
|||||||
ln -sf ../../../bin/foomatic-rip %{buildroot}%{_cups_serverbin}/filter/foomatic-rip
|
ln -sf ../../../bin/foomatic-rip %{buildroot}%{_cups_serverbin}/filter/foomatic-rip
|
||||||
ln -sf ../../../bin/foomatic-ppdfile %{buildroot}%{_cups_serverbin}/driver/foomatic
|
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.
|
# Remove things we don't ship.
|
||||||
rm -rf \
|
rm -rf \
|
||||||
$RPM_BUILD_ROOT%{_libdir}/ppr \
|
%{buildroot}%{_libdir}/ppr \
|
||||||
$RPM_BUILD_ROOT%{_sysconfdir}/foomatic/filter.conf.sample \
|
%{buildroot}%{_sysconfdir}/foomatic/filter.conf.sample \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/foomatic/templates
|
%{buildroot}%{_datadir}/foomatic/templates
|
||||||
#$RPM_BUILD_ROOT%%{_libdir}/perl5/site_perl
|
#%{buildroot}%%{_libdir}/perl5/site_perl
|
||||||
find $RPM_BUILD_ROOT -name .packlist | xargs rm -f
|
find %{buildroot} -name .packlist | xargs rm -f
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/bin/rm -f /var/cache/foomatic/*
|
/bin/rm -f /var/cache/foomatic/*
|
||||||
@ -180,6 +180,9 @@ exit 0
|
|||||||
%{_mandir}/man1/foomatic-rip.1*
|
%{_mandir}/man1/foomatic-rip.1*
|
||||||
|
|
||||||
%changelog
|
%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
|
* 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
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user