From 65ec90dc5e440e8b86525d8bbdc67222cbf92696 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Jan 20 2016 18:08:30 +0000 Subject: Change define -> global --- diff --git a/retrace-server.spec b/retrace-server.spec index d06564d..f042caa 100644 --- a/retrace-server.spec +++ b/retrace-server.spec @@ -1,9 +1,9 @@ -%{!?python_site: %define python_site %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} +%{!?python_site: %global python_site %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} Summary: Application for remote coredump analysis Name: retrace-server Version: 1.13 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/wiki/AbrtRetraceServer @@ -81,7 +81,7 @@ rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %pre #retrace uid/gid reserved in setup, rhbz #706012 -%define retrace_gid_uid 174 +%global 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 @@ -93,13 +93,13 @@ exit 0 if [ "$1" = 1 ] then #add disabled crontab entries to retrace's crontab - %define retrace_crontab_entry0 "# 0 * * * * /usr/bin/retrace-server-cleanup >> /var/log/retrace-server/cleanup_error.log 2>&1" - %define retrace_crontab_entry1 "#0 0,12 * * * /usr/bin/retrace-server-reposync fedora 15 i386 >> /var/log/retrace-server/reposync_error.log 2>&1" - %define retrace_crontab_entry2 "#0 2,14 * * * /usr/bin/retrace-server-reposync fedora 15 x86_64 >> /var/log/retrace-server/reposync_error.log 2>&1" - %define retrace_crontab_entry3 "#0 4,16 * * * /usr/bin/retrace-server-reposync fedora 16 i386 >> /var/log/retrace-server/reposync_error.log 2>&1" - %define retrace_crontab_entry4 "#0 6,18 * * * /usr/bin/retrace-server-reposync fedora 16 x86_64 >> /var/log/retrace-server/reposync_error.log 2>&1" - %define retrace_crontab_entry5 "#0 8,20 * * * /usr/bin/retrace-server-reposync fedora rawhide i386 >> /var/log/retrace-server/reposync_error.log 2>&1" - %define retrace_crontab_entry6 "#0 10,22 * * * /usr/bin/retrace-server-reposync fedora rawhide x86_64 >> /var/log/retrace-server/reposync_error.log 2>&1" + %global retrace_crontab_entry0 "# 0 * * * * /usr/bin/retrace-server-cleanup >> /var/log/retrace-server/cleanup_error.log 2>&1" + %global retrace_crontab_entry1 "#0 0,12 * * * /usr/bin/retrace-server-reposync fedora 15 i386 >> /var/log/retrace-server/reposync_error.log 2>&1" + %global retrace_crontab_entry2 "#0 2,14 * * * /usr/bin/retrace-server-reposync fedora 15 x86_64 >> /var/log/retrace-server/reposync_error.log 2>&1" + %global retrace_crontab_entry3 "#0 4,16 * * * /usr/bin/retrace-server-reposync fedora 16 i386 >> /var/log/retrace-server/reposync_error.log 2>&1" + %global retrace_crontab_entry4 "#0 6,18 * * * /usr/bin/retrace-server-reposync fedora 16 x86_64 >> /var/log/retrace-server/reposync_error.log 2>&1" + %global retrace_crontab_entry5 "#0 8,20 * * * /usr/bin/retrace-server-reposync fedora rawhide i386 >> /var/log/retrace-server/reposync_error.log 2>&1" + %global retrace_crontab_entry6 "#0 10,22 * * * /usr/bin/retrace-server-reposync fedora rawhide x86_64 >> /var/log/retrace-server/reposync_error.log 2>&1" (crontab -u retrace -l 2> /dev/null; echo %{retrace_crontab_entry0}; \ echo %{retrace_crontab_entry1}; echo %{retrace_crontab_entry2}; \ @@ -143,6 +143,9 @@ fi %doc COPYING INSTALL README TODO %changelog +* Wed Jan 20 2016 Jason L Tibbitts III - 1.13-2.1 +- Change define -> global to fix build issue with epel-rpm-macros. + * Tue Jan 19 2016 Jakub Filak - 1.13-2 - Regenerate all auto generated files