SPECS: nmap.spec - proper obsoletes name, adapter, cleanups

[glen]

Author: glen                         Date: Wed Mar 12 15:49:17 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- proper obsoletes name, adapter, cleanups

---- Files affected:
SPECS:
   nmap.spec (1.131 -> 1.132) 

---- Diffs:

================================================================
Index: SPECS/nmap.spec
diff -u SPECS/nmap.spec:1.131 SPECS/nmap.spec:1.132
--- SPECS/nmap.spec:1.131	Wed Mar 12 16:40:34 2008
+++ SPECS/nmap.spec	Wed Mar 12 16:49:12 2008
@@ -92,8 +92,8 @@
 Summary(pl.UTF-8):	Graficzny frontend dla nmapa
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	nmap-X11
 Obsoletes:	nmap-frontend
-Obsoletes:	nmap-x
 
 %description zenmap
 This package includes zenmap, a graphical frontend for nmap.
@@ -107,11 +107,11 @@
 
 %build
 find -type f -name 'configure.ac' | while read CFG; do
-    cd $(dirname "$CFG")
-    cp -f /usr/share/automake/config.sub .
-    %{__aclocal}
-    %{__autoconf}
-    cd -
+	cd $(dirname "$CFG")
+	cp -f /usr/share/automake/config.sub .
+	%{__aclocal}
+	%{__autoconf}
+	cd -
 done
 
 CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions" \
@@ -172,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132  2008-03-12 15:49:12  glen
+- proper obsoletes name, adapter, cleanups
+
 Revision 1.131  2008-03-12 15:40:34  kosmo
 - updated to 4.53
 
@@ -347,12 +350,12 @@
 
 Revision 1.74  2003/03/30 20:55:49  misi3k
 - rel 3
-- fix %%install (s/rm/rm -f/)
+- fix %install (s/rm/rm -f/)
 
 Revision 1.73  2003/03/28 17:23:56  adgor
-- nmapfe, xnmap moved to %%{_bindir}
-- nmapfe.desktop patched and moved to %%{_desktopdir}
-- simplified %%install
+- nmapfe, xnmap moved to %{_bindir}
+- nmapfe.desktop patched and moved to %{_desktopdir}
+- simplified %install
 - Release 2
 
 Revision 1.72  2003/03/21 13:23:26  grzegorz
@@ -407,12 +410,12 @@
 - remove time.patch
 
 Revision 1.57  2002/05/21 23:14:15  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.56  2002/05/21 22:40:32  qboosh
-- new %%doc
+- new %doc
 - ac25x patch needed for autoconf 2.53
 
 Revision 1.55  2002/05/15 19:31:26  kloczek
@@ -442,7 +445,7 @@
   Group field using gettext).
 
 Revision 1.47  2002/01/18 02:14:03  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.46  2001/11/21 21:46:02  qboosh
 - removed desktop patch - doesn't exist
@@ -508,7 +511,7 @@
 - 2.54BETA19
 
 Revision 1.25  2000/12/05 18:48:58  misiek
-BETA8
+- BETA8
 
 Revision 1.24  2000/11/12 20:11:55  kloczek
 - modyfications for using neew rpm automation.
@@ -534,7 +537,7 @@
   adapter...
 
 Revision 1.19  2000/06/09 07:23:26  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.18  2000/04/01 11:15:08  zagrodzki
 - changed all BuildRoot definitons
@@ -546,15 +549,15 @@
 - translated kloczkish into english
 
 Revision 1.16  2000/02/19 00:28:19  raven
-fixed compile problems.
+- fixed compile problems.
 
 Revision 1.15  1999/09/01 02:17:07  kloczek
 - new %description's,
-- added using %%configure macro.
+- added using %configure macro.
 
 Revision 1.14  1999/07/21 18:19:46  pius
 - added using DESTDIR,
-- moved data files from %%{_libdir}/nmap to %%{_datadir}/nmap,
+- moved data files from %{_libdir}/nmap to %{_datadir}/nmap,
 - fixed permissions on data files,
 - added gzipping docs,
 - cosmetics.
@@ -564,24 +567,3 @@
 
 Revision 1.12  1999/07/12 23:06:11  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Thu Feb 18 1999 Wojtek Ślusarczyk <wojtek at shadow.eu.org>
-  [2.07-2d]
-- fixed Group,
-- removed gzipping html docs.
-
-* Sat Feb 13 1999 Arkadiusz Miśkiewicz <misiek at misiek.eu.org>
-- new upstream release
-- few small changes
-
-* Wed Dec 30 1998 Arkadiusz Miśkiewicz <misiek at misiek.eu.org>
-- new upstream release
-
-* Wed Dec 16 1998 Arkadiusz Miśkiewicz <misiek at misiek.eu.org>
-- new upstream release
-
-* Thu Nov 03 1998 Arkadiusz Miśkiewicz <misiek at misiek.eu.org>
-- corrected spec file for Polish Linux Distribution
-
-* Sat Oct 3 1998  Ian Macdonald <ianmacd at xs4all.nl>
-- first RPM release
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nmap.spec?r1=1.131&r2=1.132&f=u