SPECS (AC-branch): vtun.spec - merged with HEAD - use %service - m...

[tommat]

Author: tommat                       Date: Sun Sep  3 19:17:09 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged with HEAD
- use %service
- more pl
- added linking patch
- fixed init script
- adapterized
- rel. 3, STBR

---- Files affected:
SPECS:
   vtun.spec (1.61 -> 1.61.2.1) 

---- Diffs:

================================================================
Index: SPECS/vtun.spec
diff -u SPECS/vtun.spec:1.61 SPECS/vtun.spec:1.61.2.1
--- SPECS/vtun.spec:1.61	Sun Mar 14 02:04:38 2004
+++ SPECS/vtun.spec	Sun Sep  3 21:17:03 2006
@@ -7,13 +7,12 @@
 Summary(pl):	Wirtualne tunele poprzez sieci TCP/IP
 Name:		vtun
 Version:	2.6
-Release:	2
+Release:	3
 Epoch:		2
 License:	GPL
 Group:		Networking/Daemons
-Vendor:		Maxim Krasnyansky <max_mk at yahoo.com>
-# Source0-md5:	309534fd03c5d13a19c43916f61f4bbf
 Source0:	http://dl.sourceforge.net/vtun/%{name}-%{version}.tar.gz
+# Source0-md5:	309534fd03c5d13a19c43916f61f4bbf
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-makefile.patch
@@ -22,16 +21,18 @@
 Patch3:		%{name}-getpt.patch
 Patch4:		%{name}-sslauth.patch
 Patch5:		%{name}-ac.patch
+Patch6:		%{name}-linking.patch
 URL:		http://vtun.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	lzo-devel
-%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7c}
+%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 Obsoletes:	vppp
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,15 +49,19 @@
 kernel parts. You need SSLeay-devel and lzo-devel to build it.
 
 %description -l pl
-VTun umożliwia tworzenie Wirtualnych Tunelu poprzez sieci TCP/IP wraz
-z przydzielaniem pasma, kompresją, szyfrowaniem danych w tunelach.
+VTun umożliwia tworzenie tuneli poprzez sieci TCP/IP wraz z
+przydzielaniem pasma, kompresją, szyfrowaniem danych w tunelach.
 Wspierane typy tuneli to: PPP, IP, Ethernet i większość pozostałych
-protokołów szeregowych.
+protokołów szeregowych. VTun jest łatwy i elastyczny w konfiguracji.
+Może zostać wykorzystany do takich sieciowych zastosowań jak VPN,
+Mobil IP, łącza o określonym paśmie oraz innych. Działa w warstwie
+user space, więc nie wymaga dodatkowego wsparcia w jądrze.
 
 %prep
-%setup -q -n vtun
+%setup -q -n %{name}
 %patch2 -p1
 %patch5 -p1
+%patch6 -p1
 # must be ported
 #%%patch4 -p1
 
@@ -89,17 +94,11 @@
 
 %post
 /sbin/chkconfig --add vtund
-if [ -f /var/lock/subsys/vtund ]; then
-	/etc/rc.d/init.d/vtund restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/vtund start\" to start vtun daemons."
-fi
+%service vtund restart "vtun daemons"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/vtund ]; then
-		/etc/rc.d/init.d/vtund stop >&2
-	fi
+	%service vtund stop
 	/sbin/chkconfig --del vtund
 fi
 
@@ -107,8 +106,8 @@
 %defattr(644,root,root,755)
 %doc ChangeLog Credits README README.Setup README.Shaper FAQ TODO vtund.conf
 %attr(754,root,root) /etc/rc.d/init.d/vtund
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/vtun
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vtund.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vtun
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vtund.conf
 %attr(755,root,root) %{_sbindir}/vtund
 %attr(755,root,root) %dir /var/log/vtund
 %{_mandir}/man*/*
@@ -119,6 +118,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61.2.1  2006/09/03 19:17:03  tommat
+- merged with HEAD
+- use %service
+- more pl
+- added linking patch
+- fixed init script
+- adapterized
+- rel. 3, STBR
+
 Revision 1.61  2004/03/14 01:04:38  qboosh
 - release 2
 
@@ -142,7 +150,7 @@
 
 Revision 1.54  2003/05/27 21:49:27  wiget
 - updated to 2.6 (only patch4 must be forward ported)
-- don't install vtund.conf with default passwords (security issue) 
+- don't install vtund.conf with default passwords (security issue)
   but include it in docs for reference
 
 Revision 1.53  2003/05/27 10:00:17  wiget
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/vtun.spec?r1=1.61&r2=1.61.2.1&f=u