- up to 4.0.20110615

Changed files:
    foomatic-db-engine-destdir.patch -> 1.2
    foomatic-db-engine.spec -> 1.33

diff --git a/foomatic-db-engine-destdir.patch b/foomatic-db-engine-destdir.patch
deleted file mode 100644 (file)
index c527b67..0000000
--- a/foomatic-db-engine-destdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- foomatic-db-engine-3.0-20080317/Makefile.in~       2008-03-17 08:20:03.000000000 +0100
-+++ foomatic-db-engine-3.0-20080317/Makefile.in        2008-03-17 17:43:35.485414506 +0100
-@@ -188,7 +188,7 @@
- #     $(DESTDIR) properly
-       ( cd lib && \
-         $(MAKE) PREFIX=$(PERLPREFIX) && \
--        $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
-+        $(MAKE) PREFIX=$(PERLPREFIX) pure_install \
-       )
-       ${SRC}/mkinstalldirs $(DESTDIR)$(BINDIR)
-       ${SRC}/mkinstalldirs $(DESTDIR)$(SBINDIR)

diff --git a/foomatic-db-engine.spec b/foomatic-db-engine.spec
index c5fbdb445a721b2b566457afec39f0ce2a01e894..5e6af09211f80242a1f9b067458c22ef8925df6b 100644 (file)
--- a/foomatic-db-engine.spec
+++ b/foomatic-db-engine.spec
@@ -1,20 +1,20 @@
 %include       /usr/lib/rpm/macros.perl
-%define                snap    20080317
+%define                mver    4.0
+%define                snap    20110615
 Summary:       System for using free software printer drivers
 Summary(pl.UTF-8):     System umożliwiający używanie darmowych sterowników drukarek
 Name:          foomatic-db-engine
-Version:       3.0.%{snap}
-Release:       4
+Version:       %{mver}.%{snap}
+Release:       1
 License:       GPL
 Group:         Applications/System
-Source0:       http://www.linuxprinting.org/download/foomatic/%{name}-3.0-%{snap}.tar.gz
-# Source0-md5: d6ac64aeaa1f6ecdf386df6b6ad380a7
-Patch0:                %{name}-destdir.patch
-Patch1:                %{name}-cups.patch
+Source0:       http://www.linuxprinting.org/download/foomatic/%{name}-%{mver}-%{snap}.tar.gz
+# Source0-md5: 455b22f44b73c65adcc30fc9a6313a75
+Patch0:                %{name}-cups.patch
 URL:           http://www.linuxprinting.org/foomatic.html
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: foomatic-filters >= 3.0.20080317
+BuildRequires: foomatic-filters >= 4.0.7
 BuildRequires: libxml2-devel
 BuildRequires: perl-devel
 BuildRequires: rpm-perlprov
@@ -38,9 +38,8 @@ kolejkowania oraz dowolny wolnodostępny sterownik, dla którego
 parametry zostały wprowadzone do bazy danych.
 
 %prep
-%setup -q -n %{name}-3.0-%{snap}
+%setup -q -n %{name}-%{mver}-%{snap}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal} -I .