From 684567d1308c9b1b10ef83aeaa9a9bd3c96e5bab Mon Sep 17 00:00:00 2001
From: Matt Domsch <mdomsch@fedoraproject.org>
Date: Sep 24 2006 04:34:20 +0000
Subject: upgrade to 2006.07.25


---

diff --git a/.cvsignore b/.cvsignore
index 03ae52e..c8ef622 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-aiccu_2005.01.31.tar.gz
+aiccu_2006.07.25.tar.gz
diff --git a/aiccu-reload.patch b/aiccu-reload.patch
index 4c4ae41..17ae30a 100644
--- a/aiccu-reload.patch
+++ b/aiccu-reload.patch
@@ -1,21 +1,11 @@
---- doc/aiccu.init.rpm.orig	2006-04-22 16:09:38.000000000 -0500
-+++ doc/aiccu.init.rpm	2006-04-22 16:10:07.000000000 -0500
-@@ -87,6 +87,9 @@
-   restart)
-   	restart
+--- aiccu_2006.07.25/doc/aiccu.init.rpm.orig	2006-09-03 15:05:44.000000000 -0500
++++ aiccu_2006.07.25/doc/aiccu.init.rpm	2006-09-03 15:05:59.000000000 -0500
+@@ -85,6 +85,8 @@ case "$1" in
+   	stop
  	;;
-+  reload)
-+        restart
+   restart)
++	restart
 +	;;
-   status)
-   	rhstatus
- 	;;
-@@ -94,7 +97,7 @@
-   	[ -f /var/lock/subsys/aiccu ] && restart || :
+   reload)
+   	restart
  	;;
-   *)
--	echo $"Usage: $0 {start|stop|restart|status|condrestart}"
-+	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
- 	exit 1
- esac
- 
diff --git a/aiccu.spec b/aiccu.spec
index 39babc4..b28288b 100644
--- a/aiccu.spec
+++ b/aiccu.spec
@@ -8,17 +8,16 @@
 
 Summary:   AICCU - SixXS Automatic IPv6 Connectivity Client Utility
 Name:      aiccu
-Version:   2005.01.31
-Release:   5%{?dist}
+Version:   2006.07.25
+Release:   1%{?dist}
 License:   BSDish
 Group:	   System Environment/Daemons
 URL:       http://www.sixxs.net/tools/aiccu/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source:    http://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_%{version}.tar.gz
+# upstream author acks this patch, will include in a future release
 Patch1:	   aiccu-reload.patch
-Patch2:	   aiccu-chkconfig.patch
-Patch3:	   aiccu-no-strip.patch
-Patch4:	   aiccu-cflags.patch
+BuildRequires: gnutls-devel
 Requires:  iproute
 Requires(post): chkconfig
 Requires(preun): chkconfig, initscripts
@@ -33,10 +32,7 @@ For more information about SixXS check http://www.sixxs.net
 
 %prep
 %setup -q -n %{name}
-%patch1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch1 -p1
 # fix executable permissions on non-executable content
 # so debuginfo can pick them up properly
 find . -type f -not -name rules -and -not -name *init* -exec chmod a-x \{\} \;
@@ -77,6 +73,10 @@ make clean
 %{_sysconfdir}/init.d/aiccu
 
 %changelog
+* Sat Sep 23 2006 Matt Domsch <matt@domsch.com> 2006.07.25-1
+- upgrade to latest upstream, drop all applied patches
+- add BR gnutls-devel now used for obtaining tunnel info
+
 * Sat Sep  2 2006 Matt Domsch <matt@domsch.com> 2005.01.31-5
 - rebuild
 
diff --git a/sources b/sources
index 14b5f16..50c08ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c3da5feab3d59fb5a99a45203e0ca56  aiccu_2005.01.31.tar.gz
+0df76e92eb34f4ce8aa3cfcf6896f271  aiccu_2006.07.25.tar.gz