diff --git a/.cvsignore b/.cvsignore
index b48ea53..b6941d4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-foomatic-20010717.tar.bz2
+foomatic-20010828.tar.bz2
diff --git a/foomatic.spec b/foomatic.spec
index 39231a6..ab5bb5f 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,14 +1,16 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	1.1
-Release:	0.20010717.5
+%define release_date 20010828
+Release:	0.%{release_date}.1
 License:	GPL
 Group: System Environment/Libraries
 
-Source:		http://www.linuxprinting.org/foomatic-20010717.tar.bz2
+Source:		foomatic-%{release_date}.tar.bz2
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl
+Requires:	perl
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	perl-Storable >= 0.6.11, perl-DateManip >= 5.39, perl-libxml-enno >= 1.02
 Requires:	perl-libxml-perl >= 0.07, perl-Parse-Yapp >= 1.04, perl-XML-Dumper >= 0.4
@@ -18,9 +20,6 @@ BuildRequires:	perl-Storable >= 0.6.11, perl-DateManip >= 5.39, perl-libxml-enno
 BuildRequires:	perl-libxml-perl >= 0.07, perl-Parse-Yapp >= 1.04, perl-XML-Dumper >= 0.4
 BuildRequires:	perl-XML-Encoding >= 1.01, perl-XML-Parser >= 2.29, perl-XML-Twig >= 2.02
 BuildRequires:	perl-XML-Grove, perl-libwww-perl
-BuildArchitectures: noarch
-
-Patch1:		foomatic-j.patch
 
 %description
 Foomatic is a comprehensive, spooler-independent database of printers,
@@ -39,41 +38,25 @@ The site http://www.linuxprinting.org/ is based in this database.
 %prep
 
 %setup -q -n foomatic
-%patch1 -p1 -b .jp
 
 %build
 
-# --------------------------------------------------------------------
-# Begin REALLY EXPENSIVE DB COMPILE PHASE
-# foomatic-compiledb takes 150 megs of memory per thread, AND takes
-# several hours to run.
-
-# So, to debug the rpm, compile it once, and copy the cache dir to
-# someplace else on the system, and then set the if blocks appropriately
-
-# precompile the cache.
-make testing
-
-%if 1
-# Pre-compile the db
-echo "use lib '.';" > foomatic-compiledb.tmp
-cat foomatic-compiledb >> foomatic-compiledb.tmp
-# j * 150m == memory reqs
-perl ./foomatic-compiledb.tmp -j 2
-
 # Pregenerate the overview
-echo "use lib '.';" > foomatic-configure.tmp
-cat foomatic-configure >> foomatic-configure.tmp
-perl ./foomatic-configure.tmp -O > /dev/null
+	make testing
 
-find cache -type d -exec chmod 0755 '{}' ';'
-%endif
+	# Yay, perl hacks!
+	echo "use lib '.';" > foomatic-configure.tmp
+	cat foomatic-configure >> foomatic-configure.tmp
+	perl ./foomatic-configure.tmp -O > /dev/null
 
-make clean
-# END REALLY EXPENSIVE DB COMPILE PHASE
-# --------------------------------------------------------------------
+	# fix the cache permissions
+	find cache -type d -exec chmod 0755 '{}' ';'
 
-make PREFIX=%{_prefix} INSTALLPREFIX=%buildroot
+	# Cleanup the testing paths
+	make clean
+
+# Build the normal package
+	make PREFIX=%{_prefix} INSTALLPREFIX=%buildroot
 
 %install
 
@@ -86,11 +69,7 @@ make	PREFIX=%{_prefix} \
 	INSTALLSITELIB=$RPM_BUILD_ROOT/$installsitelib \
 	install
 
-%if 1
 cp -a cache/* $RPM_BUILD_ROOT/var/cache/foomatic
-%else
-cp -a ../foomatic.cache/* $RPM_BUILD_ROOT/var/cache/foomatic/
-%endif
 
 %clean
 rm -fr %buildroot
@@ -108,6 +87,18 @@ rm -fr %buildroot
 %_datadir/*
 
 %changelog
+* Tue Aug 28 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20010828.1
+- WOW! The latest foomatic uses Till Kamppeter's C based combo compiler.
+- It is now fast enough that there is no real benifit to precompiling.
+- NOTE: this forces the package to stop being noarched.
+
+* Mon Aug 27 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20010827.1
+- fresh pull, maybe it fixes the build errors.
+
+* Sat Aug 25 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20010825.1
+- did a fresh database pull, which contains the old japanese printers as well.
+- removed japanese hack.
+
 * Tue Aug 14 2001 Akira TAGOH <tagoh@redhat.com> 1.1-0.20010717.5
 - Add Japanese printer entry.
 
diff --git a/sources b/sources
index 3c03caa..1aef9ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2f4c905d6c1df02be1c9004231cadc2  foomatic-20010717.tar.bz2
+b7bb25b72a593e91990b048de3147099  foomatic-20010828.tar.bz2