rpms/jwhois/devel jwhois.spec,1.38,1.39

[Vitezslav Crhonek (vcrhonek)]

Author: vcrhonek

Update of /cvs/extras/rpms/jwhois/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28281

Modified Files:
	jwhois.spec 
Log Message:
merge review specfile cleanup


Index: jwhois.spec
===================================================================
RCS file: /cvs/extras/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jwhois.spec	21 Nov 2007 12:00:48 -0000	1.38
+++ jwhois.spec	28 Nov 2007 14:15:46 -0000	1.39
@@ -1,6 +1,6 @@
 Name: jwhois
 Version: 4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnu.org/software/jwhois/
 Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
 Patch0: jwhois-4.0-connect.patch
@@ -8,7 +8,6 @@
 Group: Applications/Internet
 Summary: Internet whois/nicname client
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-Obsoletes: fwhois, whois
 BuildRequires: autoconf automake libidn-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -25,10 +24,10 @@
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+rm -fr $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT"
 rm -f "$RPM_BUILD_ROOT"%{_infodir}/dir
 %find_lang jwhois
@@ -55,14 +54,19 @@
 fi
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+rm -fr $RPM_BUILD_ROOT
 
 %changelog
-* Tue Nov 20 2007 Lubomir Kundrak <lkundak at redhat.com> - 4.0-4
+* Wed Nov 28 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-5
+- Merge review: add _smp_mflag, remove RPM_BUILD_ROOT test in istall
+  and clean, remove Obsoletes:, fix use of %% in changelog
+  Resolves: #225955
+
+* Tue Nov 20 2007 Lubomir Kundrak <lkundrak at redhat.com> - 4.0-4
 - Fix connections to IPv4 servers
 
 * Tue Oct  9 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-3
-- Fix localized man pages not marked with %lang (patch by Ville
+- Fix localized man pages not marked with %%lang (patch by Ville
   Skyttä <ville.skytta at iki.fi>)
 
 * Tue Aug 28 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-2