foomatic-4.0.7-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3326 ec354946-7b23-47d6-9f5a-488ba84defc7

f/foomatic/foomatic-vl.spec

@@ -1,13 +1,12 @@
 %define dbver_rel 4.0
-%define dbver_snap 20090529
-%define enginever 4.0.1
-%define filtersver 4.0.1
-%define hpijsver 20090529
+%define dbver_snap 20110405
+%define enginever 4.0.7
+%define filtersver 4.0.7
 
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	%{enginever}
-Release: 	3%{?_dist_release}
+Release: 	1%{?_dist_release}
 License:	GPL
 Group: System Environment/Libraries
 
@@ -18,7 +17,6 @@ Packager: tomop, daisuke, machino
 Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
 Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz
 Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
-Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
 # Use libdir.
 Patch1: foomatic-filters-libdir.patch
@@ -28,10 +26,10 @@ Patch2: foomatic-db-engine-libdir.patch
 Patch15: foomatic-bad-utf8.patch
 
 Url:		http://www.linuxprinting.org
-Requires:	perl >= 5.10.0
+Requires:	perl >= 5.12.3
 Requires:	%(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
 Requires:	hpijs
-BuildRequires:	perl >= 5.10.0
+BuildRequires:	perl >= 5.12.3
 BuildRequires:	libxml2-devel
 BuildRequires:	ghostscript-devel
 BuildRequires:	autoconf, automake
@@ -39,7 +37,7 @@ BuildRequires:	mpage
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Provides:	perl(Foomatic::GrovePath)
 # For 'rm' and '/sbin/service' in post
-PreReq: 	fileutils initscripts
+Requires(pre): 	fileutils initscripts
 Obsoletes: foomatic-db < 4.0.0
 Obsoletes: foomatic-ppd < 4.0.0
 Obsoletes: foomatic-ppd-gimp-print < 4.0.0
@@ -64,7 +62,7 @@ queues (foomatic-configure) and to print files/manipulate jobs
 The site http://www.linuxprinting.org/ is based on this database.
 
 %prep
-%setup -q  -c -a 1 -a 2 -a 3
+%setup -q  -c -a 1 -a 2
 
 pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
@@ -76,9 +74,6 @@ chmod a+x mkinstalldirs
 %patch15 -p1
 popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-popd
-
 pushd foomatic-db-%{dbver_snap}
 
 cd db/source
@@ -131,12 +126,6 @@ make %{_smp_mflags} PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS" \
 	INSTALLDIRS=vendor
 popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-%configure
-make %{_smp_mflags} PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS" \
-	INSTALLDIRS=vendor
-popd
-
 %install
 rm -rf %{buildroot}
 
@@ -170,14 +159,6 @@ make    DESTDIR=%buildroot PREFIX=%{_prefix} \
         install
 popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-make    DESTDIR=%buildroot PREFIX=%{_prefix} \
-	INSTALLDIRS=vendor \
-	INSTALLVENDORLIB=$installvendorlib \
-	INSTALLVENDORARCH=$installvendorarch \
-        install
-popd
-
 # Remove ghostscript UPP drivers that are gone in 7.07
 rm -f %buildroot%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
 
@@ -240,6 +221,11 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Wed Apr 06 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.7-1
+- new upstream release.
+- dropped Source3 (no longer provided by upstream).
+- updated Patch2.
+
 * Thu Mar 24 2011 IWAI, Masaharu <iwai@alib.jp> 4.0.1-3
 - rebuild with perl 5.12.3