- Removed old explicit provides for perl(Foomatic::GrovePath).

- Fixed macro in changelog.
- Avoid mixed spaces and tabs.
- Ship COPYING files.
- Added comments for sources.
This commit is contained in:
Tim Waugh 2010-03-03 16:14:04 +00:00
parent 2bd530860f
commit 57c25a3d0a
1 changed files with 41 additions and 31 deletions

View File

@ -2,14 +2,16 @@
%define filtersver 4.0.4
Summary: Database of printers and printer drivers
Name: foomatic
Version: %{enginever}
Release: 1%{?dist}
License: GPLv2+
Name: foomatic
Version: %{enginever}
Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Libraries
# The database engine.
Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
# The CUPS driver and filter.
Source1: http://www.openprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz
## PATCHES FOR FOOMATIC-FILTERS (PATCHES 1 TO 100)
@ -33,16 +35,15 @@ Patch103: foomatic-db-engine-perl.patch
## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
Url: http://www.linuxprinting.org
BuildRequires: perl >= 3:5.8.1
Url: http://www.linuxprinting.org
BuildRequires: perl >= 3:5.8.1
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: libxml2-devel
BuildRequires: autoconf, automake
BuildRequires: cups
Requires: perl >= 3:5.8.1
Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
BuildRequires: libxml2-devel
BuildRequires: autoconf, automake
BuildRequires: cups
Requires: perl >= 3:5.8.1
Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: perl(Foomatic::GrovePath)
# For 'rm' and '/sbin/service' in post
Requires: fileutils initscripts
@ -114,17 +115,17 @@ eval `perl '-V:installvendorlib' '-V: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 \
install-main install-cups
make DESTDIR=%buildroot PREFIX=%{_prefix} \
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 \
install
make DESTDIR=%buildroot PREFIX=%{_prefix} \
INSTALLSITELIB=$installvendorlib \
INSTALLSITEARCH=$installvendorarch \
install
popd
# Use relative, not absolute, symlink for CUPS filter and driver.
@ -136,10 +137,10 @@ 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 \
$RPM_BUILD_ROOT%{_libdir}/ppr \
$RPM_BUILD_ROOT%{_sysconfdir}/foomatic/filter.conf.sample \
$RPM_BUILD_ROOT%{_datadir}/foomatic/templates
rm -rf $RPM_BUILD_ROOT%{_libdir}/perl5/site_perl \
$RPM_BUILD_ROOT%{_libdir}/ppr \
$RPM_BUILD_ROOT%{_sysconfdir}/foomatic/filter.conf.sample \
$RPM_BUILD_ROOT%{_datadir}/foomatic/templates
find $RPM_BUILD_ROOT -name .packlist | xargs rm -f
%post
@ -151,6 +152,8 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%files
%defattr(-,root,root)
%doc --parents foomatic-filters-%{filtersver}/COPYING
%doc --parents foomatic-db-engine-%{enginever}/COPYING
%dir %{_sysconfdir}/foomatic
%config(noreplace) %{_sysconfdir}/foomatic/filter.conf
%config(noreplace) %{_sysconfdir}/foomatic/defaultspooler
@ -164,6 +167,13 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%{_var}/cache/foomatic
%changelog
* Wed Mar 3 2010 Tim Waugh <twaugh@redhat.com> - 4.0.4-2
- Removed old explicit provides for perl(Foomatic::GrovePath).
- Fixed macro in changelog.
- Avoid mixed spaces and tabs.
- Ship COPYING files.
- Added comments for sources.
* Tue Feb 16 2010 Jiri Popelka <jpopelka@redhat.com> - 4.0.4-1
- 4.0.4
- build no more requires ghostscript-devel
@ -917,7 +927,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
- Fix file lists.
* Mon Feb 25 2002 Tim Waugh <twaugh@redhat.com> 1.1-0.20020130.8
- Fix %post scriplet bug (bug #59942).
- Fix %%post scriplet bug (bug #59942).
* Thu Feb 21 2002 Tim Waugh <twaugh@redhat.com> 1.1-0.20020130.7
- Rebuild in new environment.
@ -980,14 +990,14 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
* Mon Dec 17 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011217.1
- respin to pull in latest foomatic database, fixes:
- properly use the cache in relation to foomatic-combo-xml's output
- fix _some_ of the quoting issues with calling foomatic-combo-xml
- properly use the cache in relation to foomatic-combo-xml's output
- fix _some_ of the quoting issues with calling foomatic-combo-xml
* Thu Dec 5 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011205.1
- respin to pull in latest foomatic database, fixes:
- droping half of a large job
- -Mutf8 added to the upstream filters
- miscelaneous printer db updates
- droping half of a large job
- -Mutf8 added to the upstream filters
- miscelaneous printer db updates
* Mon Nov 29 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011018.8
- added Requires: fileutils for the 'rm' in post
@ -1067,7 +1077,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
- Printing a help page under PDQ was broken.
* Thu Jul 12 2001 Stefan van der Eijk <stefan@eijk.nu> 1.1-0.20010712mdk
- BuildRequires: perl-devel
- BuildRequires: perl-devel
* Wed Jul 11 2001 Till Kamppeter <till@mandrakesoft.com> 1.1-0.20010711mdk
- initial release.