X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=redhat%2Ftinc.spec;h=beadcfe7422c502ab3bfc437eb718edbd2f077a0;hp=232f088c192b3296b0a49d76cf6ac2640ba20106;hb=a92604fa5dffef589fc3042c5ae09ae8878e8cff;hpb=4d85552c5bf134ada1d1083ec86dabbe41497c4a

diff --git a/redhat/tinc.spec b/redhat/tinc.spec
index 232f088c..beadcfe7 100644
--- a/redhat/tinc.spec
+++ b/redhat/tinc.spec
@@ -1,16 +1,27 @@
-Summary: tinc vpn daemon
+Summary: tinc Virtual Private Network daemon
 Name: tinc
-Version: 1.0
-Release: pre1
+Version: 1.0pre1
+Release: 2
 Copyright: GPL
-Group: Networking
+Group: System Environment/Daemons
 URL: http://tinc.nl.linux.org/
 Source0: %{name}-%{version}.tar.gz
 Buildroot: /var/tmp/%{name}-%{version}-%{release}
-Requires: /usr/bin/texi2html /usr/bin/install /usr/bin/patch
+# for building the package the following is required:
+# /usr/bin/texi2html /usr/bin/patch
 
 %description
-tinc is cool!
+# taken from doc/tinc.texi
+tinc is a Virtual Private Network (VPN) daemon that uses tunneling and
+encryption to create a secure private network between hosts on the
+Internet.
+
+Because the tunnel appears to the IP level network code as a normal
+network device, there is no need to adapt any existing software.
+
+This tunneling allows VPN sites to share information with each other
+over the Internet without exposing any information to others.
+
 See http://tinc.nl.linux.org/
 
 %prep
@@ -18,25 +29,30 @@ See http://tinc.nl.linux.org/
 %setup -q -n %{name}-%{version}
 
 %build
-#autoconf
-#automake
 ./configure --prefix=/usr --sysconfdir=/etc
 make
-texi2html doc/tinc.texi
+/usr/bin/texi2html doc/tinc.texi
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+gzip $RPM_BUILD_ROOT/usr/info/tinc.info
 
-install -D redhat/tinc $RPM_BUILD_ROOT/etc/rc.d/init.d/
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
+cp 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
-#sample
+cat <<END >$RPM_BUILD_ROOT/etc/tinc/$PEER/tinc.conf
+# Sample tinc configuration. 
+# Insert your own ip numbers instead of the placeholders,
+# and be sure to use your own passphrases.
+# See man tinc.conf(5) tincd(8) genauth(8), info tinc and 
+# /usr/doc/%{name}-%{version}/tinc.conf.sample
 TapDevice = /dev/tap0
 ConnectTo = $PEEREAL
 MyVirtualIP = $ME/32
@@ -71,21 +87,25 @@ grep -q '^tinc[[:space:]]' /etc/services || patch -s /etc/services << END
   # UNIX specific services
 END
 
+grep -q '^alias tap0' /etc/conf.modules || cat >> /etc/conf.modules << END
+# tinc uses ethertap/netlink
+alias tap0 ethertap
+alias char-major-36 netlink_dev
+END
+/sbin/install-info /usr/info/tinc.info.gz /usr/info/dir --entry= \
+	"* tinc: (tinc).				The tinc Manual."
+
 %preun
 %postun
 
 %files
-
-%doc AUTHORS ChangeLog NEWS README THANKS TODO *.html
-
-#%defattr(-,root,root)
-%config /etc/tinc
-/etc/rc.d
-/usr/sbin
-/usr/lib/tinc
-/usr/man
-/usr/info
-
-%changelog
-* Tue Apr 18 2000 Mads Kiileric <mads@kiilerich.com>
-- initial rpm
+%doc AUTHORS ChangeLog NEWS README THANKS *.html doc/tincd.conf.sample
+%config /etc/tinc/
+/etc/rc.d/init.d/tinc
+/usr/sbin/genauth
+/usr/sbin/tincd
+/usr/lib/tinc/
+/usr/man/man5/tincd.conf.5
+/usr/man/man8/genauth.8
+/usr/man/man8/tincd.8
+/usr/info/tinc.info.gz