diff --git a/bzip2.spec b/bzip2.spec
index 6815ee6..90c3ced 100644
--- a/bzip2.spec
+++ b/bzip2.spec
@@ -7,7 +7,7 @@
 Summary:	Extremely powerful file compression utility
 Name:		bzip2
 Version:	1.0.6
-Release:	%mkrel 4
+Release:	5
 License:	BSD
 Group:		Archiving/Compression
 URL:		http://www.bzip.org/index.html
@@ -18,13 +18,12 @@ Source3:	bzme.1
 Patch0:		bzip2-1.0.6-makefile.diff
 Requires:	mktemp
 Requires:	%{libname} = %{version}-%{release}
-%if %buildpdf
+%if %{buildpdf}
 BuildRequires:	tetex-dvips
 BuildRequires:	tetex-latex
 %endif
 BuildRequires:	texinfo
 BuildRequires:	libtool
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
 Bzip2 compresses files using the Burrows-Wheeler block-sorting text
@@ -51,14 +50,12 @@ Requires:	%{libname} = %{version}-%{release}
 Provides:	lib%{name}-devel = %{version}-%{release}
 Provides:	%{name}-devel = %{version}-%{release}
 Obsoletes:	%{mklibname bzip2_ 1 -d} < 1.0.5-3
-Provides:	%{mklibname bzip2_ 1 -d}
 
 %description -n	%{develname}
 Header files and static library of bzip2 functions, for developing apps which
 will use the bzip2 library (aka libz2).
 
 %prep
-
 %setup -q
 %patch0 -p1 -b .makefile
 
@@ -74,13 +71,11 @@ cp %{SOURCE3} bzme.1
 %make -f Makefile-libbz2_so
 %make
 
-%if %buildpdf
+%if %{buildpdf}
 texi2dvi --pdf manual.texi
 %endif
 
 %install
-rm -rf %{buildroot}
-
 %makeinstall_std
 
 install -m0755 bzme %{buildroot}%{_bindir}/
@@ -94,45 +89,33 @@ EOF
 chmod 755 %{buildroot}%{_bindir}/bzless
 install -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1/
 
-%if %mdkversion < 200900
-%post -n %{libname} -p /sbin/ldconfig
-%endif
-
-%if %mdkversion < 200900
-%postun -n %{libname} -p /sbin/ldconfig
-%endif
-
-%clean
-rm -rf %{buildroot}
+# cleanup
+rm -f %{buildroot}%{_libdir}/*.a
 
 %files
-%defattr(-,root,root,755)
 %doc README LICENSE CHANGES
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %files -n %{libname}
-%defattr(-,root,root,755)
 %doc LICENSE
 %{_libdir}/libbz2.so.%{major}*
 
 %files -n %{develname}
-%defattr(-,root,root,755)
 %doc *.html LICENSE
-%if %buildpdf
+%if %{buildpdf}
 %doc manual.pdf
 %endif
-%{_libdir}/libbz2.a
-%{_libdir}/libbz2.la
 %{_libdir}/libbz2.so
 %{_includedir}/*.h
 
 
 %changelog
-* Wed Feb 22 2012 abf
-- The release updated by ABF
+* Sat Feb 11 2012 Oden Eriksson <oeriksson@mandriva.com> 1.0.6-4
++ Revision: 773295
+- various cleanups
 
-* Tue May 03 2011 Oden Eriksson <oeriksson@mandriva.com> 1.0.6-3mdv2011.0
+* Tue May 03 2011 Oden Eriksson <oeriksson@mandriva.com> 1.0.6-3
 + Revision: 663345
 - mass rebuild
 
@@ -186,7 +169,7 @@ rm -rf %{buildroot}
 - rebuild
 - kill re-definition of %%buildroot on Pixel's request
 
-  + Olivier Blin <oblin@mandriva.com>
+  + Olivier Blin <blino@mandriva.org>
     - restore BuildRoot
 
 * Thu Aug 16 2007 Thierry Vignaud <tv@mandriva.org> 1.0.4-2mdv2008.0