diff --git a/libpipeline.spec b/libpipeline.spec
index 16ff4d3..10c2ba8 100644
--- a/libpipeline.spec
+++ b/libpipeline.spec
@@ -1,14 +1,20 @@
+%global gnulib_ver 20111211-stable
+
 Summary: A pipeline manipulation library
 Name: libpipeline
 Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Development/Libraries
 URL: http://libpipeline.nongnu.org/
-Source0: http://download.savannah.gnu.org/releases/libpipeline/%{name}-%{version}.tar.gz
-Patch0: libpipeline-1.2.1-gnulib.patch
-BuildRequires: libtool
-Provides: bundled(gnulib)
+Source: http://download.savannah.gnu.org/releases/libpipeline/libpipeline-%{version}.tar.gz
+
+Patch: libpipeline-1.2.1-gnulib.patch
+
+BuildRequires: libtool, check-devel
+
+# FPC exception for gnulib - copylib - https://fedorahosted.org/fpc/ticket/174
+Provides: bundled(gnulib) = %{gnulib_ver}
 
 %description
 libpipeline is a C library for setting up and running pipelines of
@@ -29,37 +35,38 @@ to develop programs that use libpipeline library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gnulibpatch
+%patch -p1 -b .gnulibpatch
 
 %build
-./configure --libdir=%{_libdir}
+%{configure}
 make %{?_smp_mflags}
 
+%check
+make check
+
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} \
-             INSTALL='install -p'
+make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} INSTALL='install -p'
 rm $RPM_BUILD_ROOT/%{_libdir}/libpipeline.la
 
-%post
-/sbin/ldconfig
-exit 0
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING README ChangeLog NEWS
 %{_libdir}/libpipeline.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/libpipeline.so
+%{_libdir}/pkgconfig/libpipeline.pc
 %{_includedir}/*.h
 %{_mandir}/man3/*
-%{_libdir}/pkgconfig/libpipeline.pc
 
 %changelog
+* Thu Sep 06 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.1-2
+- enabled test suite at build time
+- cleaned .spec file
+
 * Mon Jul 23 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.1-1
 - update to 1.2.1
 - fixed FTBFS caused by gnulib