diff --git a/.cvsignore b/.cvsignore index 884b9b9..185a151 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -usermode-1.46.tar.bz2 +usermode-1.53.tar.gz diff --git a/sources b/sources index 319a695..6894461 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8878f3c450fb4d56f0a9261d7cab8bf5 usermode-1.46.tar.bz2 +e13216766f6de8bb4a6891e95821aa7b usermode-1.53.tar.gz diff --git a/usermode.spec b/usermode.spec index 9ef23cf..8c3eb05 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,60 +1,66 @@ %define build6x 0 -Summary: Graphical tools for certain user account management tasks. +Summary: Tools for certain user account management tasks. Name: usermode -Version: 1.46 -Release: 1s.1 +Version: 1.53 +Release: 1 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 %endif Conflicts: SysVinit < 2.74-14 -BuildPrereq: glib-devel, gtk+-devel, pam-devel +BuildPrereq: glib2-devel, gtk2-devel, 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: -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 +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-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 -s 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} + touch $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 -install -m755 shutdown $RPM_BUILD_ROOT%{_bindir}/ - -# Strip it! +# Strip it! Strip it good! strip $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* || : - %find_lang %{name} %clean @@ -62,17 +68,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 @@ -80,19 +79,92 @@ 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) +%config /etc/X11/applnk/System/* +%{_bindir}/usermount +%{_mandir}/man1/usermount.1* +%{_bindir}/userinfo +%{_mandir}/man1/userinfo.1* +%{_bindir}/userpasswd +%{_mandir}/man1/userpasswd.1* +%{_bindir}/consolehelper-gtk +%{_datadir}/%{name} +%{_datadir}/pixmaps/* # 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 Mar 18 2003 D. Marlin -- new s390 release number and rebuild for s390 (bug #85960) +* Thu Apr 11 2002 Nalin Dahyabhai 1.53-1 +- refresh shell variable code from authconfig (#63175) + +* Tue Apr 9 2002 Nalin Dahyabhai 1.52-2 +- refresh translations + +* Mon Apr 1 2002 Nalin Dahyabhai 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 +- 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 1.51-1 +- patch to make gettext give us UTF-8 strings (which GTK needs) from ynakai + +* Fri Mar 22 2002 Nalin Dahyabhai 1.50-6 +- update translations +- actually include the glade files (#61665) + +* Mon Mar 11 2002 Nalin Dahyabhai 1.50-5 +- update translations + +* Mon Feb 25 2002 Nalin Dahyabhai 1.50-4 +- rebuild + +* Fri Feb 22 2002 Nalin Dahyabhai 1.50-3 +- update translations + +* Thu Jan 31 2002 Nalin Dahyabhai 1.50-2 +- rebuild to fix dependencies + +* Thu Jan 31 2002 Nalin Dahyabhai 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 1.49-3 +- add default locations for certain binaries to configure.in + +* Thu Jan 3 2002 Nalin Dahyabhai 1.49-2 +- munge glade file to use stock items for buttons where possible + +* Mon Dec 10 2001 Nalin Dahyabhai 1.49-1 +- the console.apps configs shouldn't be missingok +- fix buildprereqs for gtk2/libglade2 + +* Tue Dec 4 2001 Nalin Dahyabhai +- more gtk2 changes +- split off a -gtk subpackage with all of the gtk-specific functionality + +* Wed Nov 28 2001 Nalin Dahyabhai +- 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 1.46-1 - restore the previous XAUTHORITY setting before opening PAM sessions