- release 2

[packages/stunnel.git] / stunnel.spec

diff --git a/stunnel.spec b/stunnel.spec
index fbeb21b99da04f33b093b95e23e9fac0a3b04e9d..860ee07d8269f2a9c98d84b902ad4b2eeba31fb0 100644 (file)
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,12 +1,12 @@
 Summary:       Universal SSL tunnel
-Summary(pl):   Uniwersalne narzêdzie do bezpiecznego tunelowania
+Summary(pl.UTF-8):     Uniwersalne narzędzie do bezpiecznego tunelowania
 Name:          stunnel
-Version:       4.10
-Release:       0.1
-License:       GPL v2
+Version:       4.34
+Release:       2
+License:       GPL v2+
 Group:         Networking/Daemons
 Source0:       ftp://stunnel.mirt.net/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5: 9de7a62a44083114779ca4e109d70776
+# Source0-md5: bbd274e8364ea3ceca0ee5190e13edd1
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.inet
@@ -14,9 +14,8 @@ Patch0:               %{name}-gethostbyname_is_in_libc_aka_no_libnsl.patch
 Patch1:                %{name}-authpriv.patch
 Patch2:                %{name}-ac_fixes.patch
 Patch3:                %{name}-am.patch
-Patch4:                %{name}-getgrnam.patch
-Patch5:                %{name}-libwrap_srv_name_log.patch
-Patch6:                %{name}-config.patch
+Patch4:                %{name}-libwrap_srv_name_log.patch
+Patch5:                %{name}-config.patch
 URL:           http://www.stunnel.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -24,14 +23,14 @@ BuildRequires:      libtool
 BuildRequires: libwrap-devel
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: openssl-tools >= 0.9.7d
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires(postun):      /sbin/ldconfig
+Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/groupdel
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /sbin/ldconfig
 Provides:      group(stunnel)
 Provides:      user(stunnel)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,39 +44,39 @@ secure SSL channel. stunnel can be used to add SSL functionality to
 commonly used inetd daemons like POP-2, POP-3 and IMAP servers without
 any changes in the programs' code.
 
-%description -l pl
-Stunnel umo¿liwia stawianie silnie kodowanych tuneli pomiêdzy serwerem
-a komputerem klienta. Przy jego u¿yciu mo¿na ³atwo zrealizowaæ us³ugi
+%description -l pl.UTF-8
+Stunnel umożliwia stawianie silnie kodowanych tuneli pomiędzy serwerem
+a komputerem klienta. Przy jego użyciu można łatwo zrealizować usługi
 pop3s lub HTTPS.
 
 %package standalone
 Summary:       stunnel acts as standalone server
-Summary(pl):   stunnel dzia³aj±cy jako samodzielny serwer
+Summary(pl.UTF-8):     stunnel działający jako samodzielny serwer
 Group:         Networking/Daemons
-PreReq:                rc-scripts
 Requires(post,preun):  /sbin/chkconfig
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Obsoletes:     %{name}-inetd
+Requires:      %{name} = %{version}-%{release}
+Requires:      rc-scripts
+Obsoletes:     stunnel-inetd
 
 %description standalone
 stunnel acts as standalone server.
 
-%description standalone -l pl
-stunnel dzia³aj±cy jako samodzielny serwer.
+%description standalone -l pl.UTF-8
+stunnel działający jako samodzielny serwer.
 
 %package inetd
 Summary:       stunnel acts as inetd service
-Summary(pl):   stunnel dzia³aj±cy jako us³uga inetd
+Summary(pl.UTF-8):     stunnel działający jako usługa inetd
 Group:         Networking/Daemons
-PreReq:                rc-inetd
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Obsoletes:     %{name}-standalone
+Requires:      %{name} = %{version}-%{release}
+Requires:      rc-inetd
+Obsoletes:     stunnel-standalone
 
 %description inetd
 stunnel acts as inetd service.
 
-%description inetd -l pl
-stunnel dzia³aj±cy jako us³uga inetd.
+%description inetd -l pl.UTF-8
+stunnel działający jako usługa inetd.
 
 %prep
 %setup -q
@@ -87,9 +86,9 @@ stunnel dzia
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -111,7 +110,9 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/stunnel
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/stunnel
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/stunnel
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libstunnel.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/stunnel
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/stunnel/stunnel.pem
+rm -rf $RPM_BUILD_ROOT%{_docdir}/stunnel
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -131,30 +132,20 @@ fi
 
 %post standalone
 /sbin/chkconfig --add stunnel
-if [ -f /var/lock/subsys/stunnel ]; then
-       /etc/rc.d/init.d/stunnel restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/stunnel start\" to start stunnel daemon."
-fi
+%service stunnel restart "stunnel daemon"
 
 %preun standalone
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/stunnel ]; then
-               /etc/rc.d/init.d/stunnel stop 1>&2
-       fi
+       %service stunnel stop
        /sbin/chkconfig --del stunnel
 fi
 
 %post inetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart 1>&2
-else
-       echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
 
 %postun inetd
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd reload 1>&2
+if [ "$1" = "0" ]; then
+       %service -q rc-inetd reload
 fi
 
 %files
@@ -167,8 +158,7 @@ fi
 %attr(750,stunnel,stunnel) %{_var}/run/stunnel
 %dir %{_sysconfdir}/stunnel
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/stunnel/stunnel.conf
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/libstunnel.so
+%attr(755,root,root) %{_bindir}/*
 %{_mandir}/man8/*
 %lang(fr) %{_mandir}/fr/man8/*
 %lang(pl) %{_mandir}/pl/man8/*