More updates wrt. the change from tincd->tinc.

[tinc] / redhat / tinc.spec

diff --git a/redhat/tinc.spec b/redhat/tinc.spec
index b0a4d4e..7887d90 100644 (file)
--- a/redhat/tinc.spec
+++ b/redhat/tinc.spec
@@ -1,14 +1,14 @@
 Summary: tinc vpn daemon
 Name: tinc
-Version: cvs_2000_04_17
-Release: mk1
+Version: 1.0pre1
+Release: 1
 Copyright: GPL
-Group: Networking
+Group: System Environment/Daemons
 URL: http://tinc.nl.linux.org/
-Source0: cabal.tgz
-Source1: tinc
-Buildroot: /var/tmp/%{name}-%{version}
-#Requires: 
+Source0: %{name}-%{version}.tar.gz
+Buildroot: /var/tmp/%{name}-%{version}-%{release}
+#for building the package the following is required:
+# /usr/bin/texi2html /usr/bin/install /usr/bin/patch
 
 %description
 tinc is cool!
@@ -16,27 +16,26 @@ See http://tinc.nl.linux.org/
 
 %prep
 
-%setup -q -n cabal
+%setup -q -n %{name}-%{version}
 
 %build
-autoconf
-automake
 ./configure --prefix=/usr --sysconfdir=/etc
 make
+/usr/bin/texi2html doc/tinc.texi
 
 %install
-ME=my.vpn.ip.number
-PEER=peer.vpn.ip.number
-PEEREAL=peer.real.ip.number
-
 rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -D $RPM_SOURCE_DIR/tinc $RPM_BUILD_ROOT/etc/rc.d/init.d/
+/usr/bin/install -D redhat/tinc $RPM_BUILD_ROOT/etc/rc.d/init.d/
 
+ME=my.vpn.ip.number
+PEER=peer.vpn.ip.number
+PEEREAL=peer.real.ip.number
+
+umask 077
 mkdir -p $RPM_BUILD_ROOT/etc/tinc/$PEER/passphrases
-cat <<END >$RPM_BUILD_ROOT/etc/tinc/$PEER/tincd.conf
+cat <<END >$RPM_BUILD_ROOT/etc/tinc/$PEER/tinc.conf
 #sample
 TapDevice = /dev/tap0
 ConnectTo = $PEEREAL
@@ -76,16 +75,13 @@ END
 %postun
 
 %files
-
-%doc AUTHORS ChangeLog NEWS README THANKS TODO
-
-#%defattr(-,root,root)
+%doc AUTHORS ChangeLog NEWS README THANKS *.html
 %config /etc/tinc
 /etc/rc.d
 /usr/sbin
 /usr/lib/tinc
 /usr/man
-/usr/info
+/usr/info/tinc.info
 
 %changelog
 * Tue Apr 18 2000 Mads Kiileric <mads@kiilerich.com>