rpms/ipv6calc/devel .cvsignore, 1.3, 1.4 ipv6calc.spec, 1.9, 1.10 sources, 1.3, 1.4 ipv6calc-0.47-typo.patch, 1.1, NONE ipv6calc-0.48-md5.patch, 1.1, NONE

Tue Apr 19 07:00:48 UTC 2005

Update of /cvs/dist/rpms/ipv6calc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30524

Modified Files:
	.cvsignore ipv6calc.spec sources 
Removed Files:
	ipv6calc-0.47-typo.patch ipv6calc-0.48-md5.patch 
Log Message:

 - using CVS tarball, patch clean-up
 - lots of spec file cleanups (#155164)




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	1 Nov 2004 11:00:47 -0000	1.3
+++ .cvsignore	19 Apr 2005 07:00:29 -0000	1.4
@@ -1,2 +1 @@
-ipv6calc-0.47.tar.gz
 ipv6calc-0.48.tar.gz


Index: ipv6calc.spec
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/ipv6calc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ipv6calc.spec	13 Apr 2005 21:16:54 -0000	1.9
+++ ipv6calc.spec	19 Apr 2005 07:00:30 -0000	1.10
@@ -1,18 +1,11 @@
-# Project    : ipv6calc
-# File       : contrib/ipv6calc.spec
-# Version    : $Id$
-# Copyright  : 2001-2004 by Peter Bieringer <pb at bieringer.de>
-
 Summary: 	IPv6 address format change and calculation utility
 Name: 		ipv6calc
 Version: 	0.48
-Release: 	4
+Release: 	5
 Group:		Applications/Text
 URL: 		http://www.deepspace6.net/projects/%{name}.html
 License: 	GNU GPL version 2
 Source: 	ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/%{name}-%{version}.tar.gz
-Patch0:		ipv6calc-0.47-typo.patch
-Patch1:		ipv6calc-0.48-md5.patch
 Requires:	krb5-libs
 BuildRequires:	krb5-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -22,59 +15,33 @@
 different ways.
 
 Install this package, if you want to extend the existing address detection
-on IPv6 initscript setup or make life easier in adding reverse IPv6 zones to DNS
-or using in DNS queries like
+on IPv6 initscript setup or make life easier in adding reverse IPv6 zones
+to DNS or using in DNS queries like
  dig -t ANY `ipv6calc -r 3ffe:ffff:100::1/48`
 Many more format conversions are supported, see given URL for more.
 
 %prep
-%setup -q -n ipv6calc-%{version}
-%patch0 -p1 
-%patch1 -p1 -b .md5
+%setup -q
 
 %configure
-CFLAGS="$RPM_OPT_FLAGS"
-./configure --bindir=%{_bindir} --mandir=%{_mandir}
 
 %build
-make clean
 make COPTS="$RPM_OPT_FLAGS"
-make test
 	
 %install
 rm -rf $RPM_BUILD_ROOT
 make installonly root=$RPM_BUILD_ROOT
 
-## Install examples and helper files
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
-
-# ipv6logconv
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ipv6logconv
-cp -r examples/analog/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ipv6logconv
-
-# ipv6logstats
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ipv6logstats
-pushd ipv6logstats
-cp example_* collect_ipv6logstats.pl README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ipv6logstats/
-for dir in examples-data examples-gri; do
-	cp -r $dir $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ipv6logstats/
-done
-popd
-
-# ipv6calcweb
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ipv6calcweb
-pushd ipv6calcweb
-cp USAGE ipv6calcweb.cgi $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ipv6calcweb
-popd
-
-# Docs
-for f in ChangeLog README CREDITS TODO COPYING LICENSE USAGE doc/ipv6calc.lyx doc/ipv6calc.sgml doc/ipv6calc.html; do
-	cp $f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
-done
-
-# Remove all CVS files
-find $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -type d -name CVS |xargs rm -rf
-
+# Copy examples and helper files together
+mkdir -p redhat/{ipv6logconv,ipv6logstats/examples-{data,gri},ipv6calcweb}
+cp -f ipv6calcweb/{USAGE,ipv6calcweb.cgi} redhat/ipv6calcweb
+cp -f examples/analog/{analog-,ipv6calc.tab,run_analog.sh}* redhat/ipv6logconv
+cp -f ipv6logstats/{README,collect_,example_}* redhat/ipv6logstats
+cp -f ipv6logstats/examples-data/*.txt redhat/ipv6logstats/examples-data
+cp -f ipv6logstats/examples-gri/*.gri redhat/ipv6logstats/examples-gri
+ 
+%check
+make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,19 +49,21 @@
 %files
 %defattr(-,root,root)
 
-# binaries
-/bin/ipv6calc
+%doc ChangeLog README CREDITS TODO COPYING LICENSE USAGE doc/ipv6calc.* redhat/*
+/bin/%{name}
 %{_bindir}/ipv6logconv
 %{_bindir}/ipv6logstats
-
-# man pages
 %{_mandir}/man8/*
 
-# docs, examples and helper
-%{_docdir}/%{name}-%{version}/*
 
 
 %changelog
+* Tue Apr 19 2005 Radek Vokal <rvokal at redhat.com> 0.48-5
+- using CVS tarball, patch clean-up
+
+* Sun Apr 17 2005 Robert Scheck <redhat at linuxnetz.de> 
+- lots of spec file cleanups (#155164)
+
 * Wed Apr 13 2005 Florian La Roche <laroche at redhat.com>
 - remove empty scripts
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2004 11:00:47 -0000	1.3
+++ sources	19 Apr 2005 07:00:30 -0000	1.4
@@ -1 +1 @@
-2be7e214ea215d373ab3c4f31473683a  ipv6calc-0.48.tar.gz
+3eb67a834a375c65a5e9fe6d716f6b12  ipv6calc-0.48.tar.gz


--- ipv6calc-0.47-typo.patch DELETED ---


--- ipv6calc-0.48-md5.patch DELETED ---


