[retrace-server/f15] update to 1.1

[Michal Toman]

commit 162d376af820823cc34295bf1f4553f6c6d76fa0
Author: Michal Toman <mtoman at redhat.com>
Date:   Mon Jun 13 10:48:16 2011 +0200

    update to 1.1

 .gitignore          |    1 +
 retrace-server.spec |   40 ++++++++++++++++++++++++++++++++++------
 sources             |    2 +-
 3 files changed, 36 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 533a08b..1cc8085 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /retrace-server-1.0.tar.gz
+/retrace-server-1.1.tar.gz
diff --git a/retrace-server.spec b/retrace-server.spec
index 1fcd50d..e56bfd3 100644
--- a/retrace-server.spec
+++ b/retrace-server.spec
@@ -2,8 +2,8 @@
 
 Summary: Application for remote coredump analysis
 Name: retrace-server
-Version: 1.0
-Release: 1%{?dist}
+Version: 1.1
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/wiki/AbrtRetraceServer
@@ -12,6 +12,8 @@ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
 BuildRequires: intltool
 BuildRequires: libtool
 BuildRequires: texinfo
+BuildRequires: asciidoc
+BuildRequires: xmlto
 
 %{?el6:Requires: python-argparse}
 Requires: rsync
@@ -44,6 +46,7 @@ make %{?_smp_mflags}
 make install DESTDIR=${RPM_BUILD_ROOT} mandir=%{_mandir}
 
 mkdir -p ${RPM_BUILD_ROOT}/%{_localstatedir}/cache/%{name}
+mkdir -p ${RPM_BUILD_ROOT}/%{_localstatedir}/log/%{name}
 mkdir -p ${RPM_BUILD_ROOT}/%{_localstatedir}/spool/%{name}
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
@@ -51,14 +54,21 @@ rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 %{find_lang} %{name}
 
+%pre
+#retrace uid/gid reserved in setup, rhbz #706012
+%define retrace_gid_uid 174
+getent group retrace > /dev/null || groupadd -f -g %{retrace_gid_uid} --system retrace
+getent passwd retrace > /dev/null || useradd --system -g retrace -u %{retrace_gid_uid} -d %{_datadir}/%{name} -s /sbin/nologin retrace
+exit 0
+
 %post
 /sbin/install-info %{_infodir}/%{name} %{_infodir}/dir 2> /dev/null || :
-/usr/bin/usermod -G mock root 2> /dev/null || :
+/usr/sbin/usermod -G mock apache 2> /dev/null || :
 
 %preun
 if [ "$1" = 0 ]
 then
-    /sbin/install-info --delete %{_infodir}/abrt-retrace-server %{_infodir}/dir 2> /dev/null || :
+    /sbin/install-info --delete %{_infodir}/retrace-server %{_infodir}/dir 2> /dev/null || :
 fi
 
 %files -f %{name}.lang
@@ -66,8 +76,10 @@ fi
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-httpd.conf
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
-%dir %{_localstatedir}/cache/%{name}
-%dir %attr(0755,apache,root) %{_localstatedir}/spool/%{name}
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%dir %attr(0755,retrace,retrace) %{_localstatedir}/cache/%{name}
+%dir %attr(0755,retrace,retrace) %{_localstatedir}/log/%{name}
+%dir %attr(0775,retrace,apache) %{_localstatedir}/spool/%{name}
 %dir %{_datadir}/%{name}
 %caps(cap_setuid=ep) %{_bindir}/%{name}-worker
 %{_bindir}/%{name}-cleanup
@@ -75,9 +87,25 @@ fi
 %{_bindir}/coredump2packages
 %{python_site}/retrace.py*
 %{_datadir}/%{name}/*
+%doc %{_mandir}/man1/%{name}-cleanup.1.gz
+%doc %{_mandir}/man1/%{name}-reposync.1.gz
+%doc %{_mandir}/man1/%{name}-worker.1.gz
 %doc %{_infodir}/%{name}*
 %doc COPYING INSTALL README TODO
 
 %changelog
+* Wed Jun 01 2011 Scott Dodson <sdodson at redhat.com> 1.1-2
+- Add asciidocs xmlto to BuildRequires
+* Wed Jun 01 2011 Michal Toman <mtoman at redhat.com> 1.1-1
+- add logrotate script
+- add asciidoc support and manpages
+- replace rm by os.remove() and shutil.rmtree()
+- call du and df without block factor
+- use communicate() instead of .stdout.read()
+- replace popen by execlp
+- import manual from ABRT git, minor changes
+- create log directory
+- use 'retrace' user and group
+
 * Wed May 18 2011 Michal Toman <mtoman at redhat.com> 1.0-1
 - initial packaging
diff --git a/sources b/sources
index 5a2555a..889bfc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1e9ca7685e1fc088dc51671d80d2537  retrace-server-1.0.tar.gz
+3631325d78aafc458687cbc7ce9e391f  retrace-server-1.1.tar.gz