diff --git a/tomoyo-tools-2.5.0-20140601.tar.gz.asc b/tomoyo-tools-2.5.0-20140601.tar.gz.asc
deleted file mode 100644
index b0b35dc..0000000
--- a/tomoyo-tools-2.5.0-20140601.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iQIcBAABAgAGBQJTipqIAAoJEEJfEo0MZPUqHzgQANI2NlDmzbohY9EUg2WLI1Uu
-TQHMzNuB7b4dJGheArv/xfOk1/q6C+d3y55CVqlTr6kP6XAPjD2Si8ZSczDuyqQi
-1b7dYRlYDwsOKSzPAyJDeyCjbe0tnEoIzRhX2FBbknEgUSfk+zfbIQ/kS2ZjeHaI
-hDQNdFiot12rCJiGPJt9uJ7UDK27cJQAG7G25kLU9VOxvdXvq9hZGKjpz1sZBjgO
-nXU5G8gtYziI/4If6xW647VZrykmbg+SHGjd3dEgRNKe2uyDwZSQwvmC/wx6+F/X
-pjeML3WHyZB78Mo2xj+EkkPnoXYsv07cKtcxwx/F2Z6GvcToNUrOEQvaL5eSJosA
-mpY6SFfFN0qaK6UA5OZabbkoLAGx9Rrc00B0MytdexwIolFQdbQLjrtQF6bkDJCC
-x7j8gMiNTXPjJAyi8sm2raciAOmJeBMZ/208Gsui/O/ARCuXsYSzD7vwDT9vHIUS
-/yGZUL7A3on0vEW6iiapw9QmbUk9ptaGpPw0XCMtpmKtH4T/uiIph8Q57GZpqs76
-VGCPNKvpK8CCzh5zEbWIXm+Br2e6E0vyI4nFYvflT5D4icaJrXi9byVOZMfvQrGe
-TT2nwiAvHik614ABhSKZ73mXkvp6RILs9vw5Vs0owuHZyv0WO17LWGsgczwByPQ9
-1F+JDK2wCo/SpO4Hnfgy
-=QYeK
------END PGP SIGNATURE-----
diff --git a/tomoyo-tools.changes b/tomoyo-tools.changes
index 5169a35..1fbad2a 100644
--- a/tomoyo-tools.changes
+++ b/tomoyo-tools.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue May 26 14:30:30 UTC 2015 - dgutu@suse.com
+
+- Spec-cleaner cleanup 
+
+-------------------------------------------------------------------
+Tue May 26 14:22:18 UTC 2015 - dgutu@suse.com
+
+- GPG key expired in 2013 so removing GPG verification 
+
 -------------------------------------------------------------------
 Tue Apr  7 01:27:27 UTC 2015 - p.drouand@gmail.com
 
diff --git a/tomoyo-tools.keyring b/tomoyo-tools.keyring
deleted file mode 100644
index 238d7bc..0000000
--- a/tomoyo-tools.keyring
+++ /dev/null
@@ -1,20 +0,0 @@
-pub   1024D/4B975A98 2008-07-29 [expires: 2013-07-29]
-uid                  Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-mQGiBEiPBxkRBACX0ru++8E6vHoVBupTgcEV/1Dk/Dv75AWNomyNJKUr8RaQ3LYs
-LmmEq0ZZSP6pnrba2tnw7dash1HFfqV6Kx0hUjU7gszNlI/tDepYsAexLJQNjVPU
-ppcikPUM1FU/gT+zbTFn3smkgccVRd0Tq8OuDI3ye4yel5NJW+8sNbryvwCg2BWz
-CCft1n9BgRhb4pHbIrgAyzcD/A946hAuc4x3ACopqtaT0Id41tRVhW/3cvXGTvjN
-HQOhnI2oNbO7HYFYZ+Iu9FugQBQ/eArJOgl3jr8A4cNIlk5xc1/yRKVXRZ92ERQm
-NAO1XYbX0BhimXCZdhRHB87/NXFXS0iMX6WB2BezUzsJ0L0mSi/+55ZLKNs5KUst
-tbgNA/9EQcvkm6mr7wPpyHxGUJpPwUf/SOj79sIGNDXuteQfOnql31rWGeF0W3kH
-bmCWiOPFVhhjCjCFr7fnnZdTHs6Ppue8vpneSOc9gzoxVLqBdMR5QwTOtQBpVVSP
-NTeoouQWRNfQIsIvnGKQvVfyDEmIabVBqPFU97El4lEhgczuvbQxVGV0c3VvIEhh
-bmRhIDxwZW5ndWluLWtlcm5lbEBJLWxvdmUuU0FLVVJBLm5lLmpwPohmBBMRAgAm
-AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAkxDo7QFCQlmt5sACgkQUDraOEuX
-WphZDACg1mj1dxoPmnSUsSOYDs/RODujkqIAoNQiSnUk+g3/6HDeGegcNBoiaWGV
-=eZB3
------END PGP PUBLIC KEY BLOCK-----
diff --git a/tomoyo-tools.spec b/tomoyo-tools.spec
index 0b01c06..ea201fc 100644
--- a/tomoyo-tools.spec
+++ b/tomoyo-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tomoyo-tools
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,15 @@
 
 
 %define downloadver 2.5.0-20140601
-
-BuildRequires:  ncurses-devel
-
 Name:           tomoyo-tools
+Version:        2.5.0.20140601
+Release:        0
 Summary:        Userspace tools for TOMOYO Linux 2.4.x
 License:        GPL-2.0
 Group:          Development/Tools/Other
 Url:            http://sourceforge.jp/projects/tomoyo/
-Version:        2.5.0.20140601
-Release:        0
 Source0:        http://osdn.dl.sourceforge.jp/tomoyo/53357/tomoyo-tools-%{downloadver}.tar.gz
-Source1:        http://osdn.dl.sourceforge.jp/tomoyo/53357/tomoyo-tools-%{downloadver}.tar.gz.asc
-Source2:        %{name}.keyring
+BuildRequires:  ncurses-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -40,10 +36,10 @@ Please see http://tomoyo.sourceforge.jp/2.4/ for documentation.
 %setup -q -n %{name}
 
 %build
-make USRLIBDIR=%_libdir CFLAGS="-Wall $RPM_OPT_FLAGS"
+make %{?_smp_mflags} USRLIBDIR=%{_libdir} CFLAGS="-Wall %{optflags}"
 
 %install
-make INSTALLDIR=$RPM_BUILD_ROOT USRLIBDIR=%_libdir install
+make INSTALLDIR=%{buildroot} USRLIBDIR=%{_libdir} install
 
 %post -p /sbin/ldconfig
 
@@ -53,9 +49,9 @@ make INSTALLDIR=$RPM_BUILD_ROOT USRLIBDIR=%_libdir install
 %defattr(-, root, root)
 %doc COPYING.tomoyo README.tomoyo
 %attr(700,root,root) /sbin/tomoyo-init
-%_libdir/lib*.so*
-%dir %_libdir/tomoyo
-%_libdir/tomoyo/*
+%{_libdir}/lib*.so*
+%dir %{_libdir}/tomoyo
+%{_libdir}/tomoyo/*
 %{_sbindir}/*
 %{_mandir}/man8/*