rpms/fedora-usermgmt/devel macros.fedora-usermgmt, NONE, 1.1 fedora-usermgmt.spec, 1.9, 1.10

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/fedora-usermgmt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15470

Modified Files:
	fedora-usermgmt.spec 
Added Files:
	macros.fedora-usermgmt 
Log Message:
- moved most content of the base package and used directories into a
  -core subpackage; this avoids dependencies loops.
- renamed -setup into the much longer -default-fedora-setup; because
  yum's depsolver is not very smart (and choses packages with smallest
  name) it might is more difficult to provide a custom -setup package
  else
- added -devel subpackages with a /etc/rpm/macros.fedora-usermgmt file



--- NEW FILE macros.fedora-usermgmt ---
## Use these macros like
##
## =====
## %bcond_without	fedora
## 
## BuildRequires:	fedora-usermgmt-devel
## %{?FE_USERADD_REQ}
## ...
## %pre
## %__fe_groupadd <uid> -r ... &>/dev/null || :
## %__fe_useradd  <uid> -r ... &>/dev/null || :
##
## %postun
## %__fe_userdel  ... &>/dev/null || :
## %__fe_groupdel ... &>/dev/null || :


%__fe_useradd		%{?with_fedora:/usr/sbin/fedora-useradd}%{!?with_fedora:__useradd() { shift; /usr/sbin/useradd "$@"; }; __useradd}
%__fe_userdel		test "$1" != 0 || %{?with_fedora:/usr/sbin/fedora-userdel}%{!?with_fedora:/usr/sbin/userdel}

%__fe_groupadd		%{?with_fedora:/usr/sbin/fedora-groupadd}%{!?with_fedora:__groupadd() { shift; /usr/sbin/groupadd "$@"; }; __groupadd}
%__fe_groupdel		test "$1" != 0 || %{?with_fedora:/usr/sbin/fedora-groupdel}%{!?with_fedora:/usr/sbin/groupdel}

%FE_USERADD_REQ	\
Requires(pre):		%{?with_fedora:fedora-usermgmt}%{!?with_fedora:shadow-utils}	\
Requires(postun):	%{?with_fedora:fedora-usermgmt}%{!?with_fedora:shadow-utils}


Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-usermgmt.spec	18 Feb 2006 09:39:08 -0000	1.9
+++ fedora-usermgmt.spec	27 Apr 2006 17:48:19 -0000	1.10
@@ -8,23 +8,28 @@
 
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
-Version:	0.8
+Version:	0.8.90
 Release:	%release_func 2
 
 License:	GPL
 BuildArch:	noarch
 Group:		Applications/System
 URL:		http://fedoraproject.org/wiki/PackageUserCreation
-Source0:	fedora-usermgmt-wrapper
-Source1:	fedora-usermgmt-README
+Requires(pre):	%name-core = %version-%release
 Requires(pre):	instance(fedora-usermgmt)
 Requires(pre):	setup(fedora-usermgmt)
 BuildRoot:	%_tmppath/%name-%version-%release-root
-Requires(pre):		%_sysconfdir/fedora
-Requires(postun):	%_sysconfdir/fedora
 
 
-%package setup
+%package core
+Summary:	Core utilities for the fedora-usermgmt
+Group:		Applications/System
+Source0:	fedora-usermgmt-wrapper
+Source1:	fedora-usermgmt-README
+Requires:	%name = %version-%release
+
+
+%package default-fedora-setup
 Summary:	Default values for baseuid/basegid
 Group:		System Environment/Base
 Provides:	setup(fedora-usermgmt)
@@ -32,6 +37,8 @@
 Conflicts:	flavor(fedora-usermgmt-setup) < default
 Conflicts:	flavor(fedora-usermgmt-setup) > default
 Source2:	fedora-usermgmt-baseid
+Provides:	%name-setup = %name-%version
+Obsoletes:	%name-setup < %name-%version
 
 
 %package shadow-utils
@@ -50,12 +57,32 @@
 Requires:		shadow-utils
 
 
+%package devel
+Summary:	Enhancements for fedora-usermgmt
+Group:		Development/System
+Source30:	macros.fedora-usermgmt
+Conflicts:	%name < %version-%release
+Conflicts:	%name > %version-%release
+Requires(pre):		%_sysconfdir/rpm
+Requires(postun):	%_sysconfdir/rpm
+
+
 %description
 This package provides wrapper around the useradd/-del and groupadd/-del
 programs to allow predictable uids/gids.
 
 
-%description setup
+%description core
+This package provides wrapper around the useradd/-del and groupadd/-del
+programs to allow predictable uids/gids.
+
+
+%description devel
+This package provides wrapper around the useradd/-del and groupadd/-del
+programs to allow predictable uids/gids.
+
+
+%description default-fedora-setup
 This package contains default values for the base of relative UIDs. It
 is designed to be overridden by local customizations; you should create
 a package with
@@ -109,6 +136,12 @@
 %__install -p -m755 %SOURCE21 ${RPM_BUILD_ROOT}%confdir/scripts.legacy/useradd
 
 
+## The -devel installation
+%__install -d -m755           ${RPM_BUILD_ROOT}%_sysconfdir/rpm
+%__install -p -m444 %SOURCE30 ${RPM_BUILD_ROOT}%_sysconfdir/rpm/
+
+
+
 %post shadow-utils
 %alternatives --install %confdir/scripts %name %confdir/scripts.legacy 60
 %alternatives --install %confdir/scripts %name %confdir/scripts.shadow-utils 50
@@ -126,27 +159,44 @@
 %files
 %defattr(-,root,root,-)
 %doc README
+
+
+%files core
+%defattr(-,root,root,-)
 %dir %_sysconfdir/fedora
+%dir %confdir
 %pkgdatadir
 %_sbindir/*
 
 
-%files setup
+%files default-fedora-setup
 %defattr(-,root,root,-)
-%dir %confdir
 %config(noreplace) %confdir/base*
-## Temporary hack: /etc/fedora should be provided by a filesystem-like
-## package
-%dir %_sysconfdir/fedora
 
 
 %files shadow-utils
 %defattr(-,root,root,-)
-%dir %confdir/scripts.*
+%dir    %confdir/scripts.*
 %config %confdir/scripts.*/*
 
 
+%files devel
+%defattr(-,root,root,-)
+# do not add %config here; rpm does not ignore the generated
+# *.rpmsave/rpmnew files
+%_sysconfdir/rpm/macros.*
+
+
 %changelog
+* Thu Apr 27 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8.90-2
+- moved most content of the base package and used directories into a
+  -core subpackage; this avoids dependencies loops.
+- renamed -setup into the much longer -default-fedora-setup; because
+  yum's depsolver is not very smart (and choses packages with smallest
+  name) it might is more difficult to provide a custom -setup package
+  else
+- added -devel subpackages with a /etc/rpm/macros.fedora-usermgmt file
+
 * Sat Feb 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8-2
 - added the %%dist release-tag