dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 14:48:51 +00:00 · 2009-11-26 01:16:27 +00:00 · 2008-08-03 07:04:23 +00:00 · 2008-04-22 00:16:00 +00:00
5 changed files with 21 additions and 93 deletions
@@ -1 +0,0 @@
-usermode-1.103.tar.bz2
@@ -0,0 +1 @@
+usermode-1.98.tar.bz2
@@ -1,21 +0,0 @@
-# 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)
@@ -1 +1 @@
-f3650586d3199b5ccefd6ab0b35c844c  usermode-1.103.tar.bz2
+b1c03b4ecc3eb1287139318f1f71800e  usermode-1.98.tar.bz2
@@ -1,17 +1,18 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.103
+Version: 1.98
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
 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)
+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, startup-notification-devel, gettext
+BuildRequires: libselinux-devel >= 1.17.13-2
+BuildRoot: %{_tmppath}/%{name}-root

 %package gtk
 Summary: Graphical tools for certain user account management tasks
@@ -39,7 +40,7 @@ graphical tools for certain account management tasks.
 %build
 %configure --with-selinux

-make %{?_smp_mflags}
+make

 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,7 +48,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'

 # make userformat symlink to usermount
 ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
-ln -s usermount.1 $RPM_BUILD_ROOT%{_mandir}/man1/userformat.1

 # We set up the shutdown programs to be wrapped in this package.  Other
 # packages are on their own....
@@ -60,9 +60,12 @@ for wrappedapp in halt reboot poweroff ; do
 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
@@ -74,7 +77,7 @@ done
 rm -rf $RPM_BUILD_ROOT

 %files -f %{name}.lang
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc COPYING ChangeLog NEWS README
 %attr(4711,root,root) /usr/sbin/userhelper
 %{_bindir}/consolehelper
@@ -89,80 +92,26 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/pam.d/reboot
 %config(noreplace) /etc/pam.d/poweroff
 %config(noreplace) /etc/security/console.apps/config-util
-%config(noreplace) /etc/security/console.apps/halt
-%config(noreplace) /etc/security/console.apps/reboot
-%config(noreplace) /etc/security/console.apps/poweroff
+%config /etc/security/console.apps/halt
+%config /etc/security/console.apps/reboot
+%config /etc/security/console.apps/poweroff

 %files gtk
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{_bindir}/usermount
-%{_mandir}/man1/usermount.1*
 %{_bindir}/userformat
-%{_mandir}/man1/userformat.1*
+%{_mandir}/man1/usermount.1*
 %{_bindir}/userinfo
 %{_mandir}/man1/userinfo.1*
 %{_bindir}/userpasswd
 %{_mandir}/man1/userpasswd.1*
 %{_bindir}/consolehelper-gtk
-%{_mandir}/man8/consolehelper-gtk.8*
 %{_bindir}/pam-panel-icon
-%{_mandir}/man1/pam-panel-icon.1*
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*

 %changelog
-* Tue Feb 16 2010 Miloslav Trmač <mitr@redhat.com> - 1.103-1
- Update to usermode-1.103
-
-* Fri Feb  5 2010 Miloslav Trmač <mitr@redhat.com> - 1.102-2
- Use %%{?_smp_mflags}
- Use the four-parameter version of %%defattr
- Be more paranoid about dropping privileges
-  Resolves: #562194
- Set PAM_TTY
-  Resolves: #562195
-
-* Mon Oct  5 2009 Miloslav Trmač <mitr@redhat.com> - 1.102-1
- Update to usermode-1.102
-
-* Tue Sep 15 2009 Miloslav Trmač <mitr@redhat.com> - 1.101-1
- Update to usermode-1.101
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.100-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jun 29 2009 Miloslav Trmač <mitr@redhat.com> - 1.100-3
- Require libblkid-devel instead of e2fsprogs-devel
-
-* Tue Apr 14 2009 Miloslav Trmač <mitr@redhat.com> - 1.100-2
- Add BuildRequires: intltool
-
-* Tue Apr 14 2009 Miloslav Trmač <mitr@redhat.com> - 1.100-1
- Update to usermode-1.100
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.99-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Jan 14 2009 Miloslav Trmač <mitr@redhat.com> - 1.99-2
- Fix problems pointed out in merge review:
-  - Drop Conflicts: SysVinit < very-old
-  - Remove very old version requirements from Requires and BuildRequires
-  - Make /etc/security/console.apps/* %%config(noreplace)
-  - Update BuildRoot
-
-* Tue Nov 11 2008 Miloslav Trmač <mitr@redhat.com> - 1.99-1
- Update to usermode-1.99
-  Resolves: #470834
-
-* 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
Author	SHA1	Message	Date
Fedora Release Engineering	3343cb26de	dist-git conversion	2010-07-29 14:48:51 +00:00
Bill Nottingham	4350e23d08	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:16:27 +00:00
Miloslav Trmac	2e222b3f81	- 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	2008-08-03 07:04:23 +00:00
Jesse Keating	e25e5f1775	Initialize branch F-9 for usermode	2008-04-22 00:16:00 +00:00