- don't use epoch when not defined

[packages/stunnel.git] / stunnel.spec

diff --git a/stunnel.spec b/stunnel.spec
index 5cf6392f23db0800e2e420962a76cc488b20616a..0ea043386fa6ccd3e1316056b7ca8188e7c8e126 100644 (file)
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,12 +1,12 @@
 Summary:       Universal SSL tunnel
 Summary(pl):   Uniwersalne narzêdzie do bezpiecznego tunelowania
 Name:          stunnel
-Version:       4.05
-Release:       4
+Version:       4.14
+Release:       0.1
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       ftp://stunnel.mirt.net/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5: e28a03cf694a43a7f144ec3d5c064456
+# Source0-md5: 0969cc4868dfd75f22792ecccc9ec555
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.inet
@@ -21,17 +21,19 @@ URL:                http://www.stunnel.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: libwrap-devel
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: openssl-tools >= 0.9.7d
-BuildRequires: libwrap-devel
-PreReq:                rc-scripts
+BuildRequires: rpmbuild(macros) >= 1.202
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
-Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /sbin/ldconfig
+Provides:      group(stunnel)
+Provides:      user(stunnel)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,13 +48,15 @@ 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
-pop3s lub https.
+pop3s lub HTTPS.
 
 %package standalone
-Summary:       stunnel acts as standalone server 
+Summary:       stunnel acts as standalone server
 Summary(pl):   stunnel dzia³aj±cy jako samodzielny serwer
 Group:         Networking/Daemons
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+PreReq:                rc-scripts
+Requires(post,preun):  /sbin/chkconfig
+Requires:      %{name} = %{version}-%{release}
 Obsoletes:     %{name}-inetd
 
 %description standalone
@@ -61,17 +65,18 @@ stunnel acts as standalone server.
 %description standalone -l pl
 stunnel dzia³aj±cy jako samodzielny serwer.
 
-%package inetd 
+%package inetd
 Summary:       stunnel acts as inetd service
 Summary(pl):   stunnel dzia³aj±cy jako us³uga inetd
 Group:         Networking/Daemons
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+PreReq:                rc-inetd
+Requires:      %{name} = %{version}-%{release}
 Obsoletes:     %{name}-standalone
 
 %description inetd
 stunnel acts as inetd service.
 
-%description standalone -l pl
+%description inetd -l pl
 stunnel dzia³aj±cy jako us³uga inetd.
 
 %prep
@@ -106,31 +111,22 @@ 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`getgid stunnel`" ]; then
-       if [ "`getgid stunnel`" != "130" ]; then
-               echo "Error: group stunnel doesn't have gid=130. Correct this before installing stunnel." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/groupadd -g 130 -r -f stunnel
-fi
-if [ -n "`id -u stunnel 2>/dev/null`" ]; then
-       if [ "`id -u stunnel`" != "130" ]; then
-               echo "Error: user stunnel doesn't have uid=130. Correct this before installing stunnel." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -u 130 -r -d /var/run/stunnel -s /bin/false -c "stunnel User" -g stunnel stunnel 1>&2
-fi
+%groupadd -g 130 stunnel
+%useradd -u 130 -d /var/run/stunnel -s /bin/false -c "stunnel User" -g stunnel stunnel
+
+%post  -p /sbin/ldconfig
 
-%postun 
+%postun
+/sbin/ldconfig
 if [ "$1" = "0" ]; then
-       /usr/sbin/userdel stunnel
-       /usr/sbin/groupdel stunnel
+       %userremove stunnel
+       %groupremove stunnel
 fi
 
 %post standalone
@@ -151,9 +147,9 @@ fi
 
 %post inetd
 if [ -f /var/lock/subsys/rc-inetd ]; then
-        /etc/rc.d/init.d/rc-inetd restart 1>&2
+       /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
+       echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
 fi
 
 %postun inetd
@@ -165,14 +161,14 @@ fi
 %defattr(644,root,root,755)
 # note: this COPYING contains general information not GPL text
 %doc AUTHORS BUGS COPYING CREDITS ChangeLog NEWS PORTS README TODO doc/en/* doc/stunnel.html
-%doc src/stunnel.exe  tools/{ca.*,importCA.*}
+%doc src/stunnel.exe tools/{ca.*,importCA.*}
 %doc %lang(fr) doc/stunnel.fr.html
 %doc %lang(pl) doc/pl/* doc/stunnel.pl.html
 %attr(750,stunnel,stunnel) %{_var}/run/stunnel
 %dir %{_sysconfdir}/stunnel
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/stunnel/stunnel.conf
-%attr(600,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/stunnel/stunnel.pem
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/stunnel/stunnel.conf
 %attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_libdir}/libstunnel.so
 %{_mandir}/man8/*
 %lang(fr) %{_mandir}/fr/man8/*
 %lang(pl) %{_mandir}/pl/man8/*
@@ -180,8 +176,8 @@ fi
 %files standalone
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/stunnel
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/stunnel
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/stunnel
 
 %files inetd
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rc-inetd/stunnel
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/stunnel