[foomatic/f15/master: 3/3] Merge branch 'f14' into f15

[Jiří Popelka]

commit c950418bd90edf9347d04f844f5380d98eceb05c
Merge: c413c5e 03e5635
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Feb 21 14:43:42 2011 +0100

    Merge branch 'f14' into f15

 .gitignore                      |    2 ++
 foomatic-db-engine-libdir.patch |   25 +++++++++++++------------
 foomatic.spec                   |    9 ++++++---
 sources                         |    4 ++--
 4 files changed, 23 insertions(+), 17 deletions(-)
---
diff --cc foomatic.spec
index e3fb355,ef231a0..ee5b89b
--- a/foomatic.spec
+++ b/foomatic.spec
@@@ -193,9 -193,9 +193,12 @@@ rm -fr %buildroot $RPM_BUILD_DIR/%{name
  %{_mandir}/man1/foomatic-rip.1*
  
  %changelog
+ * Mon Feb 21 2011 Jiri Popelka <jpopelka at redhat.com> - 4.0.7-1
+ - 4.0.7
+ 
 +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.6-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 +
  * Tue Dec 21 2010 Tim Waugh <twaugh at redhat.com> - 4.0.6-2
  - Use perl_vendorlib macro instead of defining our own.