diff --git a/picard.changes b/picard.changes
index 3b44167..d061aae 100644
--- a/picard.changes
+++ b/picard.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 21 11:14:04 UTC 2012 - saschpe@suse.de
+
+- Ran spec-cleaner
+
 -------------------------------------------------------------------
 Mon Feb 20 09:45:40 UTC 2012 - pascal.bleser@opensuse.org
 
diff --git a/picard.spec b/picard.spec
index 4b807f9..c61f1dc 100644
--- a/picard.spec
+++ b/picard.spec
@@ -15,12 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           picard
 Version:        0.15.1
-Release:        1
+Release:        0
 Summary:        The Next Generation MusicBrainz Tagger
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Sound/Utilities
@@ -40,28 +38,33 @@ Source14:       http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
 Source15:       http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
 Source16:       http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
 Source17:       http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 %if 0%{?BUILD_ORIG_ADDON:1}
 BuildRequires:  ffmpeg-devel
 %endif
-BuildRequires:  desktop-file-utils gcc-c++ libofa-devel python-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gcc-c++
 BuildRequires:  libdiscid-devel
+BuildRequires:  libofa-devel
+BuildRequires:  python-devel
 %if 0%{?suse_version}
-%py_requires
-BuildRequires:  hicolor-icon-theme python-mutagen python-qt4 update-desktop-files
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  python-mutagen
+BuildRequires:  python-qt4
+BuildRequires:  update-desktop-files
 Requires:       python-mutagen
+%py_requires
 %endif
 %if 0%{?fedora}
-BuildRequires:  PyQt4 python-mutagen
+BuildRequires:  PyQt4
+BuildRequires:  python-mutagen
 Requires:       python-mutagen
 %endif
 %if 0%{?mandriva_version}
 BuildRequires:  python-qt4
 %endif
-
-%{!?py_sitedir: %define py_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?py_ver_int: %define py_ver_int %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%%d%%d'%%v" 2>/dev/null)}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{!?py_sitedir: %define py_sitedir %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?py_ver_int: %define py_ver_int %(python -c "import sys; v=sys.version_info[:2]; print '%%d%%d'%%v" 2>/dev/null)}
 %if 0%{?py_ver_int} == 24
 Requires:       python-ctypes
 %endif
@@ -72,19 +75,12 @@ Python. Picard Tagger is intended to be the next generation of tagger for
 MusicBrainz, with a focus on album oriented tagging as opposed to track based
 tagging and cross platform compatibility.
 
-
-Authors:
--------
-    Lukáš Lalinský <lalinsky@gmail.com>
-    Robert Kaye <rob@eorbit.net>
-
-
 %lang_package
 %prep
 %setup -q
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="%{optflags}"
 cat > %{name}_libdiscid_dummy.c <<-EOF
 #include <stdio.h>
 #include <discid/discid.h>
@@ -100,14 +96,14 @@ libdiscid_so="`readelf --wide --dynamic picard_libdiscid_dummy | sed -n '/(NEEDE
 sed -i~ -e "s@^\([[:blank:]]\+\)\(libName[[:blank:]]*=[[:blank:]]*'\)\(libdiscid.so.0\)\('[[:blank:]]*\)@\1\2${libdiscid_so}\4 # was '\3'@" picard/disc.py
 if diff -u picard/disc.py~ picard/disc.py ; then : ; fi
 #
-%{__python} setup.py config
-%{__python} setup.py build
+python setup.py config
+python setup.py build
 
 %install
-%{__python} setup.py install --skip-build --prefix=%{_prefix} --root=$RPM_BUILD_ROOT
+python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
 
 # install plugins
-PLUGINDIR=$RPM_BUILD_ROOT%{py_sitedir}/picard/plugins/
+PLUGINDIR=%{buildroot}%{py_sitedir}/picard/plugins/
 install -m 0644 %{SOURCE1} ${PLUGINDIR}
 install -m 0644 %{SOURCE2} ${PLUGINDIR}
 install -m 0644 %{SOURCE5} ${PLUGINDIR}
@@ -124,7 +120,7 @@ install -m 0644 %{SOURCE17} ${PLUGINDIR}
 
 %if 0%{?fedora}
 desktop-file-install --delete-original --remove-category="Application" \
-    --dir=$RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+    --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/%{name}.desktop
 %endif
 %if 0%{?suse_version}
 %suse_update_desktop_file -G "Music Tagger" -N "picard" picard
@@ -132,11 +128,8 @@ desktop-file-install --delete-original --remove-category="Application" \
 
 %find_lang %{name}
 
-mkdir -vp $RPM_BUILD_ROOT/%{_libdir}/%{name}
-cp -avL %{name}_libdiscid_dummy $RPM_BUILD_ROOT/%{_libdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -vp %{buildroot}/%{_libdir}/%{name}
+cp -avL %{name}_libdiscid_dummy %{buildroot}/%{_libdir}/%{name}
 
 %if 0%{?mandriva_version} > 2006