dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 14:48:43 +00:00 · 2009-11-26 01:16:25 +00:00 · 2008-11-07 03:31:11 +00:00 · 2008-11-06 09:31:22 +00:00 · 2008-10-28 22:12:45 +00:00 · 2008-08-03 06:52:45 +00:00
5 changed files with 31 additions and 34 deletions
@@ -1 +0,0 @@
-usermode-1.96.1.tar.bz2
@@ -0,0 +1 @@
+usermode-1.98.1.tar.bz2
@@ -1,21 +0,0 @@
-# Makefile for source rpm: usermode
-# $Id: Makefile,v 1.1 2004/09/09 13:52:40 cvsdist 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 $$/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 @@
-eb937aceae9ae725dfb77f19df02d928  usermode-1.96.1.tar.bz2
+82fe0d58b5af5f9ba043a6ae58a7ca91  usermode-1.98.1.tar.bz2
@@ -1,12 +1,11 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.96.1
-Release: 1
+Version: 1.98.1
+Release: 2
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
-# https://fedorahosted.org/usermode/attachment/wiki/UsermodeDownloads/usermode-%{version}.tar.bz2?format=raw
-Source: usermode-%{version}.tar.bz2
+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
@@ -45,7 +44,7 @@ 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
@@ -55,17 +54,15 @@ 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
-  echo 'NoDisplay=true' >>$RPM_BUILD_ROOT%{_datadir}/applications/$i
-done
-
 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
@@ -112,6 +109,27 @@ 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
Author	SHA1	Message	Date
Fedora Release Engineering	45d00f09c7	dist-git conversion	2010-07-29 14:48:43 +00:00
Bill Nottingham	e4d22aebcd	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:16:25 +00:00
Jesse Keating	8af529dd26	Initialize branch F-10 for usermode	2008-11-07 03:31:11 +00:00
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