- Update to usermode-1.104 Resolves: #567117

.cvsignore

@@ -0,0 +1 @@
+usermode-1.104.tar.bz2

.gitignore

@@ -1,5 +0,0 @@
-usermode-1.105.tar.xz
-/usermode-1.106.tar.xz
-/usermode-1.106.1.tar.xz
-/usermode-1.107.tar.xz
-/usermode-1.108.tar.xz

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: usermode
+# $Id: Makefile,v 1.2 2007/10/15 19:29:38 notting Exp $
+NAME := usermode
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

branch

@@ -0,0 +1 @@
+F-13

config-util

@@ -1,2 +0,0 @@
-USER=root
-UGROUPS=wheel

sources

@@ -1 +1 @@
-bef795b757defb9fd27cfbd48ef79861  usermode-1.108.tar.xz
+64f6ba4490ef50977b1fe9c0525f9265  usermode-1.104.tar.bz2

usermode.spec

@@ -1,17 +1,17 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.108
+Version: 1.104
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
-Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.xz
-Source1: config-util
+Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.bz2
 Requires: pam, passwd, util-linux
 BuildRequires: desktop-file-utils, gettext, glib2-devel, gtk2-devel, intltool
 BuildRequires: libblkid-devel, libSM-devel, libselinux-devel, libuser-devel
 BuildRequires: pam-devel, perl-XML-Parser, startup-notification-devel
 BuildRequires: util-linux
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %package gtk
 Summary: Graphical tools for certain user account management tasks
@@ -42,6 +42,7 @@ graphical tools for certain account management tasks.
 make %{?_smp_mflags}
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 # make userformat symlink to usermount
@@ -57,8 +58,7 @@ for wrappedapp in halt reboot poweroff ; do
 		$RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
 	install -p -m644 shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 done
-install -p -m 644 %{SOURCE1} \
-	$RPM_BUILD_ROOT/etc/security/console.apps/config-util
+echo 'USER=root' > $RPM_BUILD_ROOT/etc/security/console.apps/config-util
 
 for i in redhat-userinfo.desktop redhat-userpasswd.desktop \
 	redhat-usermount.desktop; do
@@ -112,40 +112,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
-* Mon Oct  3 2011 Miloslav Trmač <mitr@redhat.com> - 1.108-1
-- Update to usermode-1.108
-  Resolves: #622813, #716524
-
-* Thu Mar 31 2011 Miloslav Trmač <mitr@redhat.com> - 1.107-1
-- Update to usermode-1.107
-  Resolves: #668731
-- Add UGROUPS=wheel to config-util
-  Resolves: #688690
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.106.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Sep 29 2010 jkeating - 1.106.1-2
-- Rebuilt for gcc bug 634757
-
-* Tue Sep 14 2010 Miloslav Trmač <mitr@redhat.com> - 1.106.1-1
-- Update to usermode-1.106.1
-
-* Thu Aug 26 2010 Miloslav Trmač <mitr@redhat.com> - 1.106-1
-- Update to usermode-1.106
-
-* Thu Apr  8 2010 Miloslav Trmač <mitr@redhat.com> - 1.105-1
-- Update to usermode-1.105
-  Resolves: #578124
-  Resolves: #580481
-
-* Fri Mar 26 2010 Miloslav Trmač <mitr@redhat.com> - 1.104.2-1
-- Update to usermode-1.104.2
-
-* Thu Mar  4 2010 Miloslav Trmač <mitr@redhat.com> - 1.104.1-1
-- Update to usermode-1.104.1
-- Drop no longer necessary references to BuildRoot:
-
 * Thu Feb 25 2010 Miloslav Trmač <mitr@redhat.com> - 1.104-1
 - Update to usermode-1.104
   Resolves: #567117