[foomatic/f13/master: 2/2] 4.0.5

[Jiří Popelka]

commit 9b4678ed56ba9623f80b60825b0ea5cb40845cf7
Merge: fd018cf e3e3334
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Aug 18 14:47:54 2010 +0200

    4.0.5

 .gitignore             |    2 ++
 foomatic-mkstemp.patch |   10 +++++-----
 foomatic.spec          |   14 +++++++-------
 sources                |    4 ++--
 4 files changed, 16 insertions(+), 14 deletions(-)
---
diff --cc foomatic.spec
index d3a5ba1,f5dc7b4..5c968ff
--- a/foomatic.spec
+++ b/foomatic.spec
@@@ -1,17 -1,15 +1,17 @@@
- %define enginever 4.0.4
- %define filtersver 4.0.4
+ %define enginever 4.0.5
+ %define filtersver 4.0.5
  
  Summary: Database of printers and printer drivers
 -Name:		foomatic
 -Version:	%{enginever}
 -Release:	1%{?dist}
 -License:	GPLv2+
 +Name:       foomatic
 +Version:    %{enginever}
- Release:    12%{?dist}
++Release:    1%{?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)
@@@ -30,23 -28,20 +30,20 @@@ Patch101: foomatic-db-engine-libdir.pat
  # Handle non-UTF-8 encodings in imported PPD files.
  Patch102: foomatic-bad-utf8.patch
  
- # Fixed installation path for perl module.
- 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:	%{name}-filters = %{version}-%{release}
 +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
 -PreReq: fileutils initscripts
 +Requires: fileutils initscripts
  
  # foomatic-filters checks for a conversion utility (bug #124931).
  BuildRequires: mpage
@@@ -162,71 -143,26 +158,75 @@@ rm -fr %buildroot $RPM_BUILD_DIR/%{name
  
  %files
  %defattr(-,root,root)
 -%dir %{_sysconfdir}/foomatic
 -%config(noreplace) %{_sysconfdir}/foomatic/filter.conf
 +%doc --parents foomatic-db-engine-%{enginever}/COPYING
  %config(noreplace) %{_sysconfdir}/foomatic/defaultspooler
 -%{_bindir}/*
 +%{_bindir}/foomatic-combo-xml
 +%{_bindir}/foomatic-compiledb
 +%{_bindir}/foomatic-configure
 +%{_bindir}/foomatic-datafile
 +%{_bindir}/foomatic-perl-data
 +%{_bindir}/foomatic-ppd-options
 +%{_bindir}/foomatic-ppd-to-xml
 +%{_bindir}/foomatic-ppdfile
 +%{_bindir}/foomatic-printjob
 +%{_bindir}/foomatic-searchprinter
  %{_sbindir}/*
 -%{_prefix}/lib*/perl5/vendor_perl/*/Foomatic
 -/usr/lib/cups/backend/*
 +%{_datadir}/perl5/Foomatic
 +/usr/lib/cups/backend/beh
  /usr/lib/cups/driver/*
 -/usr/lib/cups/filter/*
 -%{_mandir}/*/*
 +%{_mandir}/man1/foomatic-combo-xml.1*
 +%{_mandir}/man1/foomatic-compiledb.1*
 +%{_mandir}/man1/foomatic-configure.1*
 +%{_mandir}/man1/foomatic-perl-data.1*
 +%{_mandir}/man1/foomatic-ppd-options.1*
 +%{_mandir}/man1/foomatic-ppdfile.1*
 +%{_mandir}/man1/foomatic-printjob.1*
 +%{_mandir}/man8/*
  %{_var}/cache/foomatic
  
 +%files filters
 +%defattr(-,root,root,-)
 +%doc --parents foomatic-filters-%{filtersver}/COPYING
 +%dir %{_sysconfdir}/foomatic
 +%config(noreplace) %{_sysconfdir}/foomatic/filter.conf
 +%{_bindir}/foomatic-rip
 +/usr/lib/cups/filter/foomatic-rip
 +%{_mandir}/man1/foomatic-rip.1*
 +
  %changelog
+ * Wed Aug 18 2010 Jiri Popelka <jpopelka at redhat.com> - 4.0.5-1
+ - 4.0.5
+ - fixing of installation path for perl module is no longer needed
+ 
 -* Thu Mar 18 2010 Tim Waugh <twaugh at redhat.com> - 4.0.4-2
 +* Tue Jun 22 2010 Tim Waugh <twaugh at redhat.com> - 4.0.4-12
 +- Rebuilt for new device IDs.
 +
 +* Wed May  5 2010 Tim Waugh <twaugh at redhat.com> - 4.0.4-11
 +- Moved beh backend to main package.
 +
 +* Sun Apr 25 2010 Tim Waugh <twaugh at redhat.com> - 4.0.4-10
 +- Rebuilt for new device IDs.
 +
 +* Thu Apr 15 2010 Tim Waugh <twaugh at redhat.com> - 4.0.4-9
 +- Split out foomatic-filters sub-package.  Main package depends on it.
 +
 +* Mon Apr 12 2010 Tim Waugh <twaugh at redhat.com> - 4.0.4-8
 +- Rebuilt for new device IDs (bug #575063).
 +
 +* Thu Mar 18 2010 Tim Waugh <twaugh at redhat.com> - 4.0.4-4
  - Package requires ghostscript (used by foomatic-rip).
  
 +* Wed Mar  3 2010 Tim Waugh <twaugh at redhat.com> - 4.0.4-3
 +- Removed old explicit provides for perl(Foomatic::GrovePath).
 +- Fixed macro in changelog.
 +- Avoid mixed spaces and tabs.
 +- Ship COPYING files.
 +- Added comments for sources.
 +
 +* Thu Feb 25 2010 Tim Waugh <twaugh at redhat.com> - 4.0.4-2
 +- Make it explicit that the build requires foomatic-db.  This is
 +  needed for postscriptdriver tags.
 +
  * Tue Feb 16 2010 Jiri Popelka <jpopelka at redhat.com> - 4.0.4-1
  - 4.0.4
  - build no more requires ghostscript-devel