- Hide usermount from GNOME and KDE menus Resolves: #440029

- Only hide userinfo and userpasswd in GNOME and KDE
- Update to usermode-1.98.1-1
2008-11-06 09:31:22 +00:00 · 2008-10-28 22:12:45 +00:00 · 2008-08-03 06:52:45 +00:00 · 2008-05-01 12:57:05 +00:00 · 2008-04-09 22:49:35 +00:00 · 2008-02-29 15:54:18 +00:00
4 changed files with 102 additions and 36 deletions
@@ -1 +1 @@
-usermode-1.91.2.tar.bz2
+usermode-1.98.1.tar.bz2
@@ -1,6 +1,21 @@
 # Makefile for source rpm: usermode
-# $Id$
+# $Id: Makefile,v 1.1 2004/09/09 13:52:40 cvsdist Exp $
 NAME := usermode
 SPECFILE = $(firstword $(wildcard *.spec))

-include ../common/Makefile.common
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/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)
@@ -1 +1 @@
-84abb408057912b710bf51aea5bc59ce  usermode-1.91.2.tar.bz2
+82fe0d58b5af5f9ba043a6ae58a7ca91  usermode-1.98.1.tar.bz2
@@ -1,22 +1,17 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-%endif
-
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.91.2
-Release: 1
-License: GPL
+Version: 1.98.1
+Release: 2
+License: GPLv2+
 Group: Applications/System
-Source: usermode-%{version}.tar.bz2
+URL: https://fedorahosted.org/usermode/
+Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.bz2
 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
 Conflicts: SysVinit < 2.74-14
 BuildRequires: desktop-file-utils, e2fsprogs-devel, glib2-devel, gtk2-devel
 BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
-BuildRequires: perl-XML-Parser, libSM-devel, gettext
-%if %{WITH_SELINUX}
+BuildRequires: perl-XML-Parser, libSM-devel, startup-notification-devel, gettext
 BuildRequires: libselinux-devel >= 1.17.13-2
-%endif
 BuildRoot: %{_tmppath}/%{name}-root

 %package gtk
@@ -43,16 +38,13 @@ graphical tools for certain account management tasks.
 %setup -q

 %build
-%configure \
-%if %{WITH_SELINUX}
-	--with-selinux
-%endif
+%configure --with-selinux

 make

 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'

 # make userformat symlink to usermount
 ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
@@ -62,25 +54,19 @@ ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security/console.apps
 for wrappedapp in halt reboot poweroff ; do
 	ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/${wrappedapp}
-	install -m644 $wrappedapp $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
-	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
+	install -p -m644 $wrappedapp \
+		$RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
+	install -p -m644 shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 done
+echo 'USER=root' > $RPM_BUILD_ROOT/etc/security/console.apps/config-util

-for i in redhat-userinfo.desktop redhat-userpasswd.desktop; do
-  cat >>$RPM_BUILD_ROOT%{_datadir}/applications/$i <<EOF
-NoDisplay=true
-EOF
-  desktop-file-install --vendor redhat --delete-original    \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
-    --remove-category Application			    \
-    --add-category X-GNOME-PersonalSettings		    \
-    $RPM_BUILD_ROOT%{_datadir}/applications/$i
+for i in redhat-userinfo.desktop redhat-userpasswd.desktop \
+	redhat-usermount.desktop; do
+	echo 'NotShowIn=GNOME;KDE;' >>$RPM_BUILD_ROOT%{_datadir}/applications/$i
+	desktop-file-install --vendor redhat --delete-original \
+		--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+		$RPM_BUILD_ROOT%{_datadir}/applications/$i
 done
-  
-desktop-file-install --vendor redhat --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications              \
-  --remove-category Application				     \
-  $RPM_BUILD_ROOT%{_datadir}/applications/redhat-usermount.desktop

 %find_lang %{name}

@@ -89,6 +75,7 @@ rm -rf $RPM_BUILD_ROOT

 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc COPYING ChangeLog NEWS README
 %attr(4711,root,root) /usr/sbin/userhelper
 %{_bindir}/consolehelper
 %{_mandir}/man8/userhelper.8*
@@ -101,6 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/pam.d/halt
 %config(noreplace) /etc/pam.d/reboot
 %config(noreplace) /etc/pam.d/poweroff
+%config(noreplace) /etc/security/console.apps/config-util
 %config /etc/security/console.apps/halt
 %config /etc/security/console.apps/reboot
 %config /etc/security/console.apps/poweroff
@@ -121,6 +109,69 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*

 %changelog
+* Thu Nov  6 2008 Miloslav Trmač <mitr@redhat.com> - 1.98.1-2
+- Hide usermount from GNOME and KDE menus
+  Resolves: #440029
+- Only hide userinfo and userpasswd in GNOME and KDE
+
+* Tue Oct 28 2008 Miloslav Trmač <mitr@redhat.com> - 1.98.1-1
+- Update to usermode-1.98.1-1
+
+* Sun Aug  3 2008 Miloslav Trmač <mitr@redhat.com> - 1.98-1
+- Support dialogs with no text entries
+- Preserve timestamps of some installed files
+  Resolves: #456749
+- Remove /usr/X11R6/bin from the default path.
+  Resolves: #446849
+- Left-justify messages
+- Preserve file timestamps where possible.
+
+* Thu May  1 2008 Miloslav Trmač <mitr@redhat.com> - 1.97-1
+- Fix display of '_' in prompts
+  Resolves: #444545
+
+* Thu Apr 10 2008 Miloslav Trmač <mitr@redhat.com> - 1.96.1-1
+- New release with updated translations
+
+* Fri Feb 29 2008 Miloslav Trmač <mitr@redhat.com> - 1.96-1
+- Remove code that overrides SELinux contexts of processes started by
+  userhelper.
+  Related: #247967
+- Delete the WITH_SELINUX variable.
+
+* Mon Feb 25 2008 Miloslav Trmač <mitr@redhat.com> - 1.95-1
+- New home page at https://fedorahosted.org/usermode/
+- Correctly preserve exit code when SESSION=yes
+- Fix minor errors in the .desktop files
+- Ship documentation
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.94-2
+- Autorebuild for GCC 4.3
+
+* Thu Jan 10 2008 Miloslav Trmač <mitr@redhat.com> - 1.94-1
+- Add support for including files from wrapper configuration files.  Original
+  patch by Carlo de Wolf.
+  Resolves: #426095
+- Add /etc/security/console.apps/config-util for use by system-config-*
+- Rename sr@Latn.po to sr@latin.po
+  Resolves: #425842
+
+* Tue Oct 16 2007 Miloslav Trmač <mitr@redhat.com> - 1.93.1-1
+- New release with updated translations
+  Resolves: #332441
+- Build with startup notification
+  Resolves: #294591
+
+* Wed Sep  5 2007 Miloslav Trmač <mitr@redhat.com> - 1.93-1
+- Fix handling of PAM conversations with no questions
+  Resolves: #267361
+- Update License:
+
+* Mon Jun 11 2007 Miloslav Trmač <mitr@redhat.com> - 1.92-1
+- Fix userhelper hangs in non-UTF8 locales
+  Resolves: #242420
+- Clean up menu categories in desktop files
+
 * Sat Jun  9 2007 Miloslav Trmač <mitr@redhat.com> - 1.91.2-1
 - Show the user we're authenticating as in an i18n-safe way.
  Resolves: #233210
Author	SHA1	Message	Date
Miloslav Trmac	7978757f83	- Hide usermount from GNOME and KDE menus Resolves: #440029 - Only hide userinfo and userpasswd in GNOME and KDE	2008-11-06 09:31:22 +00:00
Miloslav Trmac	a801c45a23	- Update to usermode-1.98.1-1	2008-10-28 22:12:45 +00:00
Miloslav Trmac	042c0f3fb6	- Support dialogs with no text entries - Preserve timestamps of some installed files Resolves: #456749 - Remove /usr/X11R6/bin from the default path. Resolves: #446849 - Left-justify messages - Preserve file timestamps where possible.	2008-08-03 06:52:45 +00:00
Miloslav Trmac	b2e118ac49	- Fix display of '_' in prompts Resolves: #444545	2008-05-01 12:57:05 +00:00
Miloslav Trmac	6b8fd28929	- New release with updated translations	2008-04-09 22:49:35 +00:00
Miloslav Trmac	01e1dae06b	- Remove code that overrides SELinux contexts of processes started by userhelper. Related: #247967 - Delete the WITH_SELINUX variable.	2008-02-29 15:54:18 +00:00
Miloslav Trmac	f706a49df4	- New home page at https://fedorahosted.org/usermode/ - Correctly preserve exit code when SESSION=yes - Fix minor errors in the .desktop files - Ship documentation	2008-02-25 00:16:28 +00:00
Jesse Keating	3ee2c268bc	- Autorebuild for GCC 4.3	2008-02-19 13:57:41 +00:00
Miloslav Trmac	c554b16208	- Add support for including files from wrapper configuration files. Original patch by Carlo de Wolf. Resolves: #426095 - Add /etc/security/console.apps/config-util for use by system-config-* - Rename sr@Latn.po to sr@latin.po Resolves: #425842	2008-01-10 20:42:41 +00:00
Miloslav Trmac	c9c819fa09	- New release with updated translations Resolves: #332441 - Build with startup notification Resolves: #294591	2007-10-16 11:34:14 +00:00
Bill Nottingham	4344797e70	makefile update to properly grab makefile.common	2007-10-15 19:29:38 +00:00
Miloslav Trmac	1afcb34066	- Fix handling of PAM conversations with no questions Resolves: #267361 - Update License:	2007-09-05 00:37:17 +00:00
Miloslav Trmac	b17cf718dd	- Fix userhelper hangs in non-UTF8 locales Resolves: #242420 - Clean up menu categories in desktop files	2007-06-11 21:35:02 +00:00