auto-import usermode-1.60-1 from usermode-1.60-1.src.rpm

Tue Mar 18 2003 D. Marlin <dmarlin@redhat.com>
- new s390 release number and rebuild for s390 (bug #85960)

.cvsignore

@@ -1 +1 @@
-usermode-1.42.tar.bz2
+usermode-1.60.tar.gz

sources

@@ -1 +1 @@
-174eee12925e631cbe23842ad5469c78  usermode-1.42.tar.bz2
+0f05a2f9f9deb2a08b803dc204416046  usermode-1.60.tar.gz

usermode.spec

@@ -1,62 +1,70 @@
 %define build6x 0
-Summary: Graphical tools for certain user account management tasks.
+Summary: Tools for certain user account management tasks.
 Name: usermode
-Version: 1.42
+Version: 1.60
 Release: 1
-Copyright: GPL
+License: GPL
 Group: Applications/System
-Source: usermode-%{version}.tar.bz2
+Source: usermode-%{version}.tar.gz
 %if %{build6x}
 Requires: util-linux, pam >= 0.66-5
 %else
-Requires: util-linux, pam >= 0.66-5, /etc/pam.d/system-auth
+Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth
 %endif
 Conflicts: SysVinit < 2.74-14
+BuildPrereq: desktop-file-utils, glib2-devel, gtk2-devel
+BuildPrereq: libglade2-devel, libuser-devel, pam-devel, util-linux
 BuildRoot: %{_tmppath}/%{name}-root
 
+%package gtk
+Summary: Graphical tools for certain user account management tasks.
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
 %description
-The usermode package contains several graphical tools for users:
+The usermode package contains the userhelper program, which can be
+used to allow configured programs to be run with superuser privileges
+by ordinary users.
+
+%description gtk
+The usermode-gtk package contains several graphical tools for users:
 userinfo, usermount and userpasswd.  Userinfo allows users to change
 their finger information.  Usermount lets users mount, unmount, and
 format filesystems.  Userpasswd allows users to change their
 passwords.
 
-Install the usermode package if you would like to provide users with
+Install the usermode-gtk package if you would like to provide users with
 graphical tools for certain account management tasks.
 
 %prep
 %setup -q
 
 %build
+%configure
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make PREFIX=$RPM_BUILD_ROOT \
-	bindir=%{_bindir} \
-	mandir=%{_mandir} \
-	sbindir=%{_sbindir} \
-	datadir=%{_datadir} \
-	install install-man install-po
+make install DESTDIR=$RPM_BUILD_ROOT
 
-# Stuff from pam_console, for sysvinit. Here for lack of a better
-# place....
+# We set up the shutdown programs to be wrapped in this package.  Other
+# packages are on their own....
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security/console.apps
-for wrapapp in halt reboot poweroff ; do
-  ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/$wrapapp
-  touch $RPM_BUILD_ROOT/etc/security/console.apps/$wrapapp
+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}
 %if %{build6x}
-  cp shutdown.pamd.6x $RPM_BUILD_ROOT/etc/pam.d/$wrapapp
+	cp shutdown.pamd.6x $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 %else
-  cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/$wrapapp
+	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 %endif
 done
+%if ! %{build6x}
+install -m644 pam_timestamp_init.console $RPM_BUILD_ROOT/etc/security/console.apps/pam_timestamp_init
+install -m644 pam_timestamp_init.pamd    $RPM_BUILD_ROOT/etc/pam.d/pam_timestamp_init
+ln -sf consolehelper $RPM_BUILD_ROOT/%{_bindir}/pam_timestamp_init
+%endif
 
-install -m755 shutdown $RPM_BUILD_ROOT%{_bindir}/
-
-# Strip it!
-strip $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* || :
-      
 %find_lang %{name}
 
 %clean
@@ -64,17 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%{_bindir}/usermount
-%{_mandir}/man1/usermount.1*
-%{_bindir}/userinfo
-%{_mandir}/man1/userinfo.1*
 %attr(4711,root,root) /usr/sbin/userhelper
-%{_mandir}/man8/userhelper.8*
-%{_bindir}/userpasswd
-%{_mandir}/man1/userpasswd.1*
 %{_bindir}/consolehelper
+%{_mandir}/man8/userhelper.8*
 %{_mandir}/man8/consolehelper.8*
-%config /etc/X11/applnk/System/*
 # PAM console wrappers
 %{_bindir}/halt
 %{_bindir}/reboot
@@ -82,15 +83,172 @@ rm -rf $RPM_BUILD_ROOT
 %if %{build6x}
 %{_bindir}/shutdown
 %endif
-%{_datadir}/pixmaps/*
 %config(noreplace) /etc/pam.d/halt
 %config(noreplace) /etc/pam.d/reboot
 %config(noreplace) /etc/pam.d/poweroff
-%config(missingok) /etc/security/console.apps/halt
-%config(missingok) /etc/security/console.apps/reboot
-%config(missingok) /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)
+%{_bindir}/usermount
+%{_mandir}/man1/usermount.1*
+%{_bindir}/userinfo
+%{_mandir}/man1/userinfo.1*
+%{_bindir}/userpasswd
+%{_mandir}/man1/userpasswd.1*
+%{_bindir}/consolehelper-gtk
+%{_bindir}/pam-panel-icon
+%{_datadir}/%{name}
+%{_datadir}/pixmaps/*
+%{_datadir}/applications/*
+
+# If you're updating translations, do me a favor and bump the RELEASE number,
+# and not the VERSION number.  Version numbers indicate CODE changes.
 %changelog
+* Wed Aug 14 2002 Nalin Dahyabhai <nalin@redhat.com> 1.60-1
+- reconnect the "cancel" and "ok" buttons in userinfo
+- heed the cancel button when prompting for passwords in userinfo (#68578)
+- translation update
+
+* Wed Aug 14 2002 Nalin Dahyabhai <nalin@redhat.com> 1.59-2
+- change "forget password" to "forget authorization", because we don't actually
+  remember the password (that would be scary, #71476)
+- translation update
+
+* Tue Aug 13 2002 Nalin Dahyabhai <nalin@redhat.com> 1.59-1
+- pam-panel-icon: overhaul, change the 'locked' icon to keyring-small, nix the
+  'unlocked' icon
+- consolehelper-gtk: properly set up the dialog buttons (should be 'cancel/ok'
+  when we're asking questions, was always 'close')
+- disappear pam_timestamp_init
+
+* Wed Aug  7 2002 Nalin Dahyabhai <nalin@redhat.com> 1.58-2
+- install the new 'unlocked' icon
+
+* Tue Aug  6 2002 Jonathan Blandford <jrb@redhat.com>
+- New version.
+
+* Mon Aug  5 2002 Nalin Dahyabhai <nalin@redhat.com> 1.57-1
+- add support for BANNER and BANNER_DOMAIN in the userhelper configuration
+
+* Mon Aug  5 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-4
+- mark strings in the .glade file as translatable (#70278)
+- translation updates
+
+* Wed Jul 31 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-3
+- add icons for userpasswd and usermount
+
+* Wed Jul 24 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-2
+- actually include the icons
+- translation updates
+
+* Tue Jul 23 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-1
+- userinfo: prevent users from selecting "nologin" as a shell (#68579)
+- don't strip binaries by default; leave that to the buildroot policy
+- use desktop-file-install
+
+* Wed Jun 19 2002 Havoc Pennington <hp@redhat.com>
+- put pam-panel-icon in file list
+
+* Mon May 20 2002 Nalin Dahyabhai <nalin@redhat.com> 1.55-2
+- don't strip binaries which have no special privileges
+
+* Wed May 15 2002 Nalin Dahyabhai <nalin@redhat.com> 1.55-1
+- remove the pixmap we don't use any more (we use stock pixmaps now)
+- update translations
+
+* Thu Apr 16 2002 Nalin Dahyabhai <nalin@redhat.com> 1.54-1
+- suppress even error messages from Xlib when consolehelper calls
+  gtk_init_check() to see if the display is available
+
+* Mon Apr 15 2002 Nalin Dahyabhai <nalin@redhat.com> 1.53-2
+- refresh translations
+
+* Thu Apr 11 2002 Nalin Dahyabhai <nalin@redhat.com> 1.53-1
+- refresh shell variable code from authconfig (#63175)
+
+* Tue Apr  9 2002 Nalin Dahyabhai <nalin@redhat.com> 1.52-2
+- refresh translations
+
+* Mon Apr  1 2002 Nalin Dahyabhai <nalin@redhat.com> 1.52-1
+- attempt to make prompts at the console more meaningful
+- when falling back, reset the entire environment to the user's
+
+* Thu Mar 28 2002 Nalin Dahyabhai <nalin@redhat.com>
+- stop giving the user chances to enter the right password if we get a
+  conversation error reading a response (appears to be masked by libpam)
+  (#62195)
+- always center consolehelper dialog windows
+
+* Wed Mar 27 2002 Nalin Dahyabhai <nalin@redhat.com> 1.51-1
+- patch to make gettext give us UTF-8 strings (which GTK needs) from ynakai
+
+* Fri Mar 22 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-6
+- update translations
+- actually include the glade files (#61665)
+
+* Mon Mar 11 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-5
+- update translations
+
+* Mon Feb 25 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-4
+- rebuild
+
+* Fri Feb 22 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-3
+- update translations
+
+* Thu Jan 31 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-2
+- rebuild to fix dependencies
+
+* Thu Jan 31 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-1
+- fix userpasswd dialog message being incorrect for password changes
+- use a dumb conversation function when text mode is invoked without a tty -- if
+  the service's configuration doesn't call for prompts, then it'll still work
+- port from pwdb to libuser
+- catch child-exit errors correctly again
+- fix keyboard-grabbing
+
+* Wed Jan 23 2002 Nalin Dahyabhai <nalin@redhat.com> 1.49-3
+- add default locations for certain binaries to configure.in
+
+* Thu Jan  3 2002 Nalin Dahyabhai <nalin@redhat.com> 1.49-2
+- munge glade file to use stock items for buttons where possible
+
+* Mon Dec 10 2001 Nalin Dahyabhai <nalin@redhat.com> 1.49-1
+- the console.apps configs shouldn't be missingok
+- fix buildprereqs for gtk2/libglade2
+
+* Tue Dec  4 2001 Nalin Dahyabhai <nalin@redhat.com>
+- more gtk2 changes
+- split off a -gtk subpackage with all of the gtk-specific functionality
+
+* Wed Nov 28 2001 Nalin Dahyabhai <nalin@redhat.com>
+- the grand libglade/gtk2 overhaul
+- allow disabling display of GUI windows by setting "GUI=false" in the
+  console.apps configuration file (default: TRUE)
+- allow disabling display of GUI windows by recognizing a magic option
+  on the command-line of the program being wrapped (NOXOPTION, no default)
+
+* Fri Nov  9 2001 Nalin Dahyabhai <nalin@redhat.com> 1.46-1
+- restore the previous XAUTHORITY setting before opening PAM sessions
+
+* Fri Nov  2 2001 Nalin Dahyabhai <nalin@redhat.com> 1.45-1
+- propagate environment variables from libpam to applications
+
+* Fri Oct  3 2001 Nalin Dahyabhai <nalin@redhat.com> 1.44-1
+- only try to call gtk_main_quit() if we've got a loop to get out of (#54109)
+- obey RPM_OPT_FLAGS, obey
+
+* Tue Aug 28 2001 Trond Eivind Glomsrød <teg@redhat.com> 1.43-1
+- Update translations
+
+* Mon Aug  6 2001 Nalin Dahyabhai <nalin@redhat.com>
+- add build requirements on glib-devel, gtk+-devel, pam-devel (#49726)
+
+* Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
+- Bump release + rebuild.
+
 * Wed Feb 14 2001 Preston Brown <pbrown@redhat.com>
 - final translation merge.