From dbebecd2cf6f82e3d3003805cb9cd3165d97f7d2 Mon Sep 17 00:00:00 2001
From: Michal Toman <mtoman@redhat.com>
Date: Jun 29 2011 09:56:50 +0000
Subject: Update to 1.2


---

diff --git a/.gitignore b/.gitignore
index 1cc8085..0be2a4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /retrace-server-1.0.tar.gz
 /retrace-server-1.1.tar.gz
+/retrace-server-1.2.tar.gz
diff --git a/retrace-server.spec b/retrace-server.spec
index e56bfd3..5e1bc79 100644
--- a/retrace-server.spec
+++ b/retrace-server.spec
@@ -2,13 +2,15 @@
 
 Summary: Application for remote coredump analysis
 Name: retrace-server
-Version: 1.1
-Release: 2%{?dist}
+Version: 1.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/wiki/AbrtRetraceServer
 Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
 
+BuildArch: noarch
+
 BuildRequires: intltool
 BuildRequires: libtool
 BuildRequires: texinfo
@@ -63,12 +65,19 @@ exit 0
 
 %post
 /sbin/install-info %{_infodir}/%{name} %{_infodir}/dir 2> /dev/null || :
-/usr/sbin/usermod -G mock apache 2> /dev/null || :
+/usr/sbin/usermod -a -G mock apache 2> /dev/null || :
+
+#add disabled crontab entry to apache's crontab
+%define apache_crontab_entry "# 0 * * * * /usr/bin/retrace-server-cleanup >> /var/log/retrace-server/cleanup_error.log 2>&1"
+
+(crontab -u apache -l 2> /dev/null; echo %{apache_crontab_entry}) | crontab -u apache - 2> /dev/null
 
 %preun
 if [ "$1" = 0 ]
 then
     /sbin/install-info --delete %{_infodir}/retrace-server %{_infodir}/dir 2> /dev/null || :
+#remove retrace-server related entries from apache's crontab
+    (crontab -u apache -l 2> /dev/null | sed "/%{name}/d") | crontab -u apache - 2> /dev/null
 fi
 
 %files -f %{name}.lang
@@ -81,12 +90,13 @@ fi
 %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}-worker
 %{_bindir}/%{name}-cleanup
 %{_bindir}/%{name}-reposync
 %{_bindir}/coredump2packages
 %{python_site}/retrace.py*
 %{_datadir}/%{name}/*
+%attr(0600,root,root) %{_localstatedir}/spool/cron/retrace
 %doc %{_mandir}/man1/%{name}-cleanup.1.gz
 %doc %{_mandir}/man1/%{name}-reposync.1.gz
 %doc %{_mandir}/man1/%{name}-worker.1.gz
@@ -94,6 +104,17 @@ fi
 %doc COPYING INSTALL README TODO
 
 %changelog
+* Wed Jun 29 2011 Michal Toman <mtoman@redhat.com> 1.2-1
+- add option to verify GPG signatures
+- make HTTPS optional
+- use RetraceTask class
+- validate input
+- limit allowed files
+- do not allow worker to start twice
+- ship cron configuration
+- do not require suid launcher
+- minor bug and typo fixes
+
 * Wed Jun 01 2011 Scott Dodson <sdodson@redhat.com> 1.1-2
 - Add asciidocs xmlto to BuildRequires
 * Wed Jun 01 2011 Michal Toman <mtoman@redhat.com> 1.1-1
diff --git a/sources b/sources
index 889bfc3..b71f78d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3631325d78aafc458687cbc7ce9e391f  retrace-server-1.1.tar.gz
+67b1a1f8707389fc5a7989210ed7a64e  retrace-server-1.2.tar.gz