ctrlproxy-3.0.6

[Bernie Innocenti]

Ciao,

I updated ctrlproxy to 3.0.6, and the resulting packages are here:
  http://www.codewiz.org/pub/fedora/pkgs/

Patch follows.  Can I commit it to CVS?


diff -u -p -r1.15 ctrlproxy.spec
--- ctrlproxy.spec	19 Feb 2008 07:31:45 -0000	1.15
+++ ctrlproxy.spec	25 May 2008 14:25:14 -0000
@@ -1,12 +1,18 @@
+%define ctrlproxy_homedir %{_var}/lib/ctrlproxy
+%define ctrlproxy_logdir  %{_var}/log/irc
+%define ctrlproxy_service ctrlproxy
+%define ctrlproxy_user    ctrlproxy
+
 Summary: ctrlproxy
 Name: ctrlproxy
-Version: 3.0.5
-Release: 2%{?dist}
+Version: 3.0.6
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source: http://jelmer.vernstok.nl/releases/ctrlproxy-%{version}.tar.gz
 Url: http://jelmer.vernstok.nl/ctrlproxy/
-Patch0: ctrlproxy-fix-ansi-build.patch
+Source100: ctrlproxy.init
+Source101: ctrlproxy.config
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, popt, gnutls-devel
 
@@ -31,7 +37,6 @@ ctrlproxy development headers
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure
@@ -45,6 +50,23 @@ mkdir $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT -C doc install
 chmod 0644 ${RPM_BUILD_ROOT}%{_datadir}/ctrlproxy/motd
+install -D -m 0755 %{SOURCE100} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/ctrlproxy
+install -D -m 0640 %{SOURCE101} $RPM_BUILD_ROOT/%{ctrlproxy_homedir}/config
+install -D -d -m 0750 $RPM_BUILD_ROOT/%{ctrlproxy_logdir}
+
+
+%pre
+/usr/sbin/useradd -s /sbin/nologin -M -r -d %{ctrlproxy_homedir} \
+    -c "ctrlproxy IRC daemon" %{ctrlproxy_user} &>/dev/null || :
+
+%post
+/sbin/chkconfig --add %{ctrlproxy_service}
+
+%preun
+if [ $1 = 0 ]; then
+	/sbin/service %{ctrlproxy_service} stop > /dev/null 2>&1 || :
+	/sbin/chkconfig --del %{ctrlproxy_service}
+fi
 
 %clean
 [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -59,12 +81,24 @@ chmod 0644 ${RPM_BUILD_ROOT}%{_datadir}/
 %dir %{_docdir}/ctrlproxy
 %{_docdir}/ctrlproxy/*
 
+%{_sysconfdir}/init.d/ctrlproxy
+%attr(0750, ctrlproxy, ctrlproxy) %dir %{ctrlproxy_logdir}
+%attr(0750, ctrlproxy, ctrlproxy) %dir %{ctrlproxy_homedir}
+%attr(0750, ctrlproxy, ctrlproxy) %config(noreplace) %{ctrlproxy_homedir}/config
+
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/ctrlproxy-3.0/*
 %{_libdir}/pkgconfig/ctrlproxy.pc
 
 %changelog
+* Sun May 25 2008 Bernardo Innocenti <bernie at codewiz.org> 3.0.6-1
+- Update to latest upstream
+- Drop ctrlproxy-fix-irssi-log.patch
+- Add initscript
+- Create a ctrlproxy user to run ctrlproxy as a daemon
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.5-2
 - Autorebuild for GCC 4.3
 

-- 
   \___/
  _| X |  Bernie Innocenti - http://www.codewiz.org/
  \|_O_|  "It's an education project, not a laptop project!"