X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=radsecproxy.spec;h=8cb499ea6a56ceb8e6e7750cc4e4d422dbe37a5b;hb=f2a5299;hp=a8bc39493b30fcec05b183b920af825c5472ebd4;hpb=a275063fa2ae8ee09227a1de3b856e8a1c8ebbf3;p=packages%2Fradsecproxy.git

diff --git a/radsecproxy.spec b/radsecproxy.spec
index a8bc394..8cb499e 100644
--- a/radsecproxy.spec
+++ b/radsecproxy.spec
@@ -1,20 +1,27 @@
-####
 # TODO:
-# - docbook2x is required for manual build
+# - own UID/GID
 Summary:	RADIUS proxy that in addition to to usual RADIUS UDP transport, also supports TLS (RadSec)
 Name:		radsecproxy
-Version:	1.4
-Release:	0.9
+Version:	1.6
+Release:	1
 License:	GPLv2+ or BSD-like
 Group:		Networking/Daemons/Radius
 Source0:	http://software.uninett.no/radsecproxy/%{name}-%{version}.tar.gz
-# Source0-md5:	7b5248b2a7a133561cf685730824c893
+# Source0-md5:	8d17ba6b97feeaff8c4e4baf5aca256d
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
+Source3:	%{name}.upstart
+Patch0:		%{name}-docbook2x.patch
+## will be included in 1.6
+Patch1:		%{name}-fticks.patch
+Patch2:		%{name}-visinst.patch
 URL:		http://software.uninett.no/radsecproxy/
-#For manual creation:
-#BuildRequires:	docbook2x-to-man
-BuildRequires:	openssl-devel
+# For manual creation:
+BuildRequires:	docbook2X
+BuildRequires:	nettle-devel
+Requires:	openssl >= 1.0.0b
+Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts >= 0.4.3.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -25,25 +32,51 @@ time to be small, efficient and easy to configure. Currently the
 executable on Linux is only about 48 Kb, and it uses about 64 Kb
 (depending on the number of peers) while running.
 
+%package upstart
+Summary:	Upstart job description for %{name}
+Summary(pl.UTF-8):	Opis zadania Upstart dla %{name}
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	upstart >= 0.6
+
+%description upstart
+Upstart job description for %{name}.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dla %{name}.
+
 %prep
 %setup -q
+%patch0 -p1
+#patch1 -p1
+#patch2 -p1
 
 %build
-%configure
+%{__aclocal}
+%{__autoconf}
+%configure \
+	--enable-fticks
+# Some trash comes with tar:
+%{__make} clean
 %{__make}
+# FIXME:
+mv ______radsecproxy.conf\ ____.5 radsecproxy.conf.5
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/radsecproxy.conf.d \
-	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d}
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d,init}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install radsecproxy.conf-example $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
+cp -p radsecproxy.conf-example $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
+
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/init/%{name}.conf
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+install -p radsecproxy.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,10 +87,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun
 if [ "$1" = "0" ]; then
-        %service %{name} stop
-        /sbin/chkconfig --del %{name}
+	%service %{name} stop
+	/sbin/chkconfig --del %{name}
 fi
 
+%post upstart
+%upstart_post %{name}
+
+%postun upstart
+%upstart_postun %{name}
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
@@ -65,8 +104,12 @@ fi
 %attr(640,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(750,root,root) %dir %{_sysconfdir}/radsecproxy.conf.d
 %attr(755,root,root) %{_sbindir}/radsecproxy
-%attr(755,root,root) %{_bindir}/catgconf
+%attr(755,root,root) %{_bindir}/radsecproxy-conf
+%attr(755,root,root) %{_bindir}/radsecproxy-hash
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %{_mandir}/man1/*
-# With manual created:
-#%{_mandir}/man5/*
+%{_mandir}/man5/*
+
+%files upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf