diff --git a/.cvsignore b/.cvsignore index d646c24..710ccb7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ ipv6calc-0.47.tar.gz +ipv6calc-0.48.tar.gz diff --git a/ipv6calc.spec b/ipv6calc.spec index e193b58..4b5a765 100644 --- a/ipv6calc.spec +++ b/ipv6calc.spec @@ -1,14 +1,19 @@ -Name: ipv6calc -Version: 0.47 -Release: 4 -Summary: IPv6 address format change and calculation utility -License: GPL +# Project : ipv6calc +# File : contrib/ipv6calc.spec +# Version : $Id: ipv6calc.spec,v 1.6 2004/11/01 11:00:47 rvokal Exp $ +# Copyright : 2001-2004 by Peter Bieringer + +Summary: IPv6 address format change and calculation utility +Name: ipv6calc +Version: 0.48 +Release: 1 Group: Applications/Text -URL: http://www.deepspace6.net/projects/%{name}.html -Source: ftp://ftp.deepspace6.net/pub/ds6/sources/%{name}/%{name}-%{version}.tar.gz +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 -Requires: krb5-libs, openssl -BuildRequires: krb5-devel, openssl-devel +Requires: krb5-libs +BuildRequires: krb5-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -25,43 +30,151 @@ Many more format conversions are supported, see given URL for more. %setup -q -n ipv6calc-%{version} %patch0 -p1 -%build -CFLAGS="$RPM_OPT_FLAGS" %configure +CFLAGS="$RPM_OPT_FLAGS" +./configure --bindir=%{_bindir} --mandir=%{_mandir} + +%build make clean make COPTS="$RPM_OPT_FLAGS" make test - + %install -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +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 + + %clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf $RPM_BUILD_ROOT + +%post +%preun + %files %defattr(-,root,root) -%doc ChangeLog README CREDITS TODO COPYING LICENSE -%doc examples/analog/analog-dist.cfg examples/analog/run_analog.sh examples/analog/ipv6calc.tab ipv6calcweb/ipv6calcweb.cgi examples/analog/analog-ipv6calc-descriptions.txt examples/analog/analog-dist-combined.cfg -/bin/ipv6* -%{_bindir}/ipv6* -%{_mandir}/man8/ipv6* + +# binaries +/bin/ipv6calc +%{_bindir}/ipv6logconv +%{_bindir}/ipv6logstats + +# man pages +%{_mandir}/man8/* + +# docs, examples and helper +%{_docdir}/%{name}-%{version}/* + %changelog +* Mon Nov 1 2004 Radek Vokal 0.48-1 +- spec file cleanup + +* Sat Oct 30 2004 Peter Bieringer +- remove openssl(-devel) from requirements, no longer needed + * Tue Oct 26 2004 Radek Vokal 0.47-4 - spec file cleanup, typo patch * Mon Oct 18 2004 Radek Vokal 0.47-3 - initial build for Fedora Core -* Mon Aug 23 2004 Robert Scheck 0.47-2 -- Updated URLs -- Fixed openssl and krb5 support and requirements +* Fri Nov 22 2003 Peter Bieringer +- adjustments + +* Fri Nov 21 2003 Peter Bieringer +- add ipv6logstats +- add man pages +- add configure options + +* Tue Nov 11 2002 Peter Bieringer +- change IPv6 address in %description + +* Sat Apr 20 2002 Peter Bieringer +- Change URL + +* Mon Apr 07 2002 Peter Bieringer +- add more analog example files + +* Mon Apr 05 2002 Peter Bieringer +- remove BuildRequires extension, not needed for normal build + +* Mon Mar 24 2002 Peter Bieringer +- extend BuildRequires for perl /usr/bin/aggregate wget + +* Mon Mar 18 2002 Peter Bieringer +- add ipv6calcweb.cgi + +* Mon Mar 16 2002 Peter Bieringer +- add ipv6logconv, analog examples + +* Mon Mar 11 2002 Peter Bieringer +- Add perl to buildrequire and openssl to require + +* Mon Jan 21 2002 Peter Bieringer +- Add LICENSE + COPYING file + +* Thu Dec 27 2001 Peter Bieringer +- Add comment header +- Add call to configure on build + +* Tue Dec 18 2001 Peter Bieringer +- Replace hardwired version number with autoconf/configure variable + +* Wed Apr 25 2001 Peter Bieringer +- Fix permissions of doc files + +* Thu Mar 15 2001 Peter Bieringer +- Add doc directory also to %files to make sure the directory will be removed + on update or deinstall +- change install permissions for entries in doc directory +- change "make install" to "make installonly" (make test should be only executed once" + +* Wed Mar 14 2001 Peter Bieringer +- Add "make clean" and "make test" on %build + +* Tue Mar 13 2001 Peter Bieringer +- add CREDITS and TODO for install + +* Sat Mar 10 2001 Peter Bieringer +- enable "URL" + +* Sun Mar 04 2001 Peter Bieringer +- change install location to /bin -* Sun Jan 11 2004 Robert Scheck 0.47-1 -- Update to 0.47 -- Rewrite of the spec file +* Tue Feb 27 2001 Peter Bieringer +- review for new release, now named "ipv6calc" +- review install section for RedHat 7.0.91 -* Sat Oct 11 2003 Robert Scheck 0.46-1 -- Update to 0.46 -- Spec file for Red Hat Linux based on that one from SuSE +* Sun Feb 25 2001 Peter Bieringer +- initial build diff --git a/sources b/sources index 5982ca6..8202ca8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70cab03d1aa6ce3a1af7fd9241c90585 ipv6calc-0.47.tar.gz +2be7e214ea215d373ab3c4f31473683a ipv6calc-0.48.tar.gz