diff --git a/libcap-ng-python.spec b/libcap-ng-python.spec
index 574ea92..2b136a5 100644
--- a/libcap-ng-python.spec
+++ b/libcap-ng-python.spec
@@ -1,52 +1,73 @@
+#
+# spec file for package libcap-ng-python (Version 0.6.4)
+#
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
 %{!?python_sitelib:  %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
-Summary:       An alternate POSIX capabilities library
-Name:         libcap-ng-python
-Version:       0.6.4
+Summary:        An alternate POSIX capabilities library
+
+Name:           libcap-ng-python
+Version:        0.6.4
+Release:        1
 %define soname 0
 %define rname libcap-ng
-Release:       0
-License:       LGPLv2+
-Group:         System/Libraries
-URL:           http://people.redhat.com/sgrubb/libcap-ng
+License:        LGPLv2+
+Group:          System/Libraries
+Url:            http://people.redhat.com/sgrubb/libcap-ng
 # http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-%{version}.tar.gz
-Source0:       libcap-ng-%{version}.tar.bz2
-Source1:       pre_checkin.sh
-Source2:       baselibs.conf
-Source99:      libcap-ng.rpmlintrc
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kernel-headers >= 2.6.11
-BuildRequires: libattr-devel pkg-config
+Source0:        libcap-ng-%{version}.tar.bz2
+Source1:        pre_checkin.sh
+Source2:        baselibs.conf
+Source99:       libcap-ng.rpmlintrc
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  kernel-headers >= 2.6.11
+BuildRequires:  libattr-devel pkg-config python-base
 
 %description
 Libcap-ng is a library that makes using posix capabilities easier
 
 %if "%{name}" == "%{rname}"
+
 %package -n %{name}%{soname}
-Summary:       An alternate POSIX capabilities library
-License:       LGPLv2+
-Group:         System/Libraries
+
+Summary:        An alternate POSIX capabilities library
+License:        LGPLv2+
+Group:          System/Libraries
 
 %description -n %{name}%{soname}
 Libcap-ng is a library that makes using posix capabilities easier
 
 %package devel
-Summary:       Header files for libcap-ng library
-License:       LGPLv2+
-Group:         Development/Libraries/C and C++
-Requires:      kernel-headers >= 2.6.11
-Requires:      %{name}%{soname} = %{version}
-Requires:      pkgconfig
+Summary:        Header files for libcap-ng library
+License:        LGPLv2+
+Group:          Development/Libraries/C and C++
+Requires:       kernel-headers >= 2.6.11
+Requires:       %{name}%{soname} = %{version}
+Requires:       pkgconfig
 
 %description devel
 The libcap-ng-devel package contains the files needed for developing
 applications that need to use the libcap-ng library.
 
 %package utils
-Summary:       Utilities for analysing and setting file capabilities
-License:       GPLv2+
-Group:         System/Base
+Summary:        Utilities for analysing and setting file capabilities
+License:        GPLv2+
+Group:          System/Base
 
 %description utils
 The libcap-ng-utils package contains applications to analyse the
@@ -54,12 +75,13 @@ posix capabilities of all the program running on a system. It also
 lets you set the file system based capabilities.
 
 %else
+
 %package -n python-capng
-Summary:       Python bindings for libcap-ng library
-License:       LGPLv2+
-Group:         Development/Libraries/Python
-BuildRequires: python-devel swig
-Requires:      %{name}%{soname} = %{version}
+Summary:        Python bindings for libcap-ng library
+License:        LGPLv2+
+Group:          Development/Libraries/Python
+BuildRequires:  python-devel swig
+Requires:       %{name}%{soname} = %{version}
 %py_requires
 
 %description -n python-capng
@@ -108,6 +130,7 @@ LIBNAME=$(basename "$VLIBNAME")
 %{?buildroot:%__rm -rf "%{buildroot}"}
 
 %if "%{name}" == "%{rname}"
+
 %post -n %{name}%{soname} -p /sbin/ldconfig
 
 %postun -n %{name}%{soname} -p /sbin/ldconfig
@@ -136,6 +159,7 @@ LIBNAME=$(basename "$VLIBNAME")
 %attr(0644,root,root) %{_mandir}/man8/*.8%{ext_man}
 
 %else
+
 %files -n python-capng
 %defattr(-,root,root,-)
 %attr(755,root,root) %{python_sitearch}/_capng.so
diff --git a/libcap-ng.spec b/libcap-ng.spec
index 3b1d4df..6390d12 100644
--- a/libcap-ng.spec
+++ b/libcap-ng.spec
@@ -1,52 +1,73 @@
+#
+# spec file for package libcap-ng (Version 0.6.4)
+#
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
 %{!?python_sitelib:  %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
-Summary:       An alternate POSIX capabilities library
-Name:          libcap-ng
-Version:       0.6.4
+Summary:        An alternate POSIX capabilities library
+
+Name:           libcap-ng
+Version:        0.6.4
+Release:        2
 %define soname 0
 %define rname libcap-ng
-Release:       0
-License:       LGPLv2+
-Group:         System/Libraries
-URL:           http://people.redhat.com/sgrubb/libcap-ng
+License:        LGPLv2+
+Group:          System/Libraries
+Url:            http://people.redhat.com/sgrubb/libcap-ng
 # http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-%{version}.tar.gz
-Source0:       libcap-ng-%{version}.tar.bz2
-Source1:       pre_checkin.sh
-Source2:       baselibs.conf
-Source99:      libcap-ng.rpmlintrc
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kernel-headers >= 2.6.11
-BuildRequires: libattr-devel pkg-config python-base
+Source0:        libcap-ng-%{version}.tar.bz2
+Source1:        pre_checkin.sh
+Source2:        baselibs.conf
+Source99:       libcap-ng.rpmlintrc
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  kernel-headers >= 2.6.11
+BuildRequires:  libattr-devel pkg-config python-base
 
 %description
 Libcap-ng is a library that makes using posix capabilities easier
 
 %if "%{name}" == "%{rname}"
+
 %package -n %{name}%{soname}
-Summary:       An alternate POSIX capabilities library
-License:       LGPLv2+
-Group:         System/Libraries
+
+Summary:        An alternate POSIX capabilities library
+License:        LGPLv2+
+Group:          System/Libraries
 
 %description -n %{name}%{soname}
 Libcap-ng is a library that makes using posix capabilities easier
 
 %package devel
-Summary:       Header files for libcap-ng library
-License:       LGPLv2+
-Group:         Development/Libraries/C and C++
-Requires:      kernel-headers >= 2.6.11
-Requires:      %{name}%{soname} = %{version}
-Requires:      pkgconfig
+Summary:        Header files for libcap-ng library
+License:        LGPLv2+
+Group:          Development/Libraries/C and C++
+Requires:       kernel-headers >= 2.6.11
+Requires:       %{name}%{soname} = %{version}
+Requires:       pkgconfig
 
 %description devel
 The libcap-ng-devel package contains the files needed for developing
 applications that need to use the libcap-ng library.
 
 %package utils
-Summary:       Utilities for analysing and setting file capabilities
-License:       GPLv2+
-Group:         System/Base
+Summary:        Utilities for analysing and setting file capabilities
+License:        GPLv2+
+Group:          System/Base
 
 %description utils
 The libcap-ng-utils package contains applications to analyse the
@@ -54,12 +75,13 @@ posix capabilities of all the program running on a system. It also
 lets you set the file system based capabilities.
 
 %else
+
 %package -n python-capng
-Summary:       Python bindings for libcap-ng library
-License:       LGPLv2+
-Group:         Development/Libraries/Python
-BuildRequires: python-devel swig
-Requires:      %{name}%{soname} = %{version}
+Summary:        Python bindings for libcap-ng library
+License:        LGPLv2+
+Group:          Development/Libraries/Python
+BuildRequires:  python-devel swig
+Requires:       %{name}%{soname} = %{version}
 %py_requires
 
 %description -n python-capng
@@ -108,6 +130,7 @@ LIBNAME=$(basename "$VLIBNAME")
 %{?buildroot:%__rm -rf "%{buildroot}"}
 
 %if "%{name}" == "%{rname}"
+
 %post -n %{name}%{soname} -p /sbin/ldconfig
 
 %postun -n %{name}%{soname} -p /sbin/ldconfig
@@ -136,6 +159,7 @@ LIBNAME=$(basename "$VLIBNAME")
 %attr(0644,root,root) %{_mandir}/man8/*.8%{ext_man}
 
 %else
+
 %files -n python-capng
 %defattr(-,root,root,-)
 %attr(755,root,root) %{python_sitearch}/_capng.so