From e0049086a4395c95193c11f59d1ea6ff80e03057 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 20 Dec 2011 09:23:13 +0100 Subject: [PATCH] Remove fedora-usermgmt. --- bacula.spec | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/bacula.spec b/bacula.spec index 34cc36e..3080bc4 100644 --- a/bacula.spec +++ b/bacula.spec @@ -1,14 +1,9 @@ -# Avoid dependency on fedora-usermgmt at install time by passing "--without fedora". -# http://fedoraproject.org/wiki/PackageUserCreation -# Otherwise you can trigger disabling by default by setting "% bcond_with fedora" -%bcond_without fedora - -%global uid 33 -%global username bacula +%global uid 33 +%global username bacula Name: bacula Version: 5.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: GPLv2 with exceptions @@ -45,7 +40,6 @@ BuildRequires: mysql-devel, postgresql-devel, sqlite-devel BuildRequires: desktop-file-utils, python-devel, lzo-devel, sed BuildRequires: libacl-devel, tetex-latex, tetex, ghostscript BuildRequires: readline-devel, libcap-devel -BuildRequires: fedora-usermgmt-devel %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 BuildRequires: qt4-devel >= 4.6.2 @@ -98,7 +92,8 @@ Group: System Environment/Daemons Obsoletes: bacula-sysconfdir <= 2.4 Provides: group(%username) = %uid Provides: user(%username) = %uid -%{?FE_USERADD_REQ} +Requires(pre): shadow-utils +Requires(postun): shadow-utils %description common Bacula is a set of programs that allow you to manage the backup, @@ -524,14 +519,15 @@ fi %pre common -%__fe_groupadd %uid -r %username &>/dev/null || : -%__fe_useradd %uid -r -s /sbin/nologin -d /var/spool/bacula -M \ - -c 'Bacula Backup System' -g %username %username &>/dev/null || : +getent group %username >/dev/null || groupadd -g %uid -r %username &>/dev/null || : +getent passwd %username >/dev/null || useradd -u %uid -r -s /sbin/nologin \ + -d /var/spool/bacula -M -c 'Bacula Backup System' -g %username %username &>/dev/null || : +exit 0 %postun common -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - +test "$1" != 0 || userdel %username &>/dev/null || : +test "$1" != 0 || groupdel %username &>/dev/null || : +exit 0 %if 0%{?fedora} >= 15 || 0%{?rhel} > 6 @@ -873,6 +869,10 @@ fi %changelog +* Mon Dec 19 2011 Simone Caronni - 5.2.3-3 +- Remove fedora-usermgmt entirely, see thread at: + http://lists.fedoraproject.org/pipermail/packaging/2011-December/008034.html + * Mon Dec 19 2011 Simone Caronni - 5.2.3-2 - Remove leftover users when removing bacula-common. - Allow building "--without fedora" to avoid RHEL dependency on EPEL: