|
|
|
@@ -1,31 +1,20 @@
|
|
|
|
|
%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
|
|
|
|
|
%define WITH_SELINUX 1
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%define build6x 0
|
|
|
|
|
Summary: Tools for certain user account management tasks.
|
|
|
|
|
Summary: Tools for certain user account management tasks
|
|
|
|
|
Name: usermode
|
|
|
|
|
Version: 1.80
|
|
|
|
|
Version: 1.101
|
|
|
|
|
Release: 1
|
|
|
|
|
License: GPL
|
|
|
|
|
License: GPLv2+
|
|
|
|
|
Group: Applications/System
|
|
|
|
|
Source: usermode-%{version}.tar.bz2
|
|
|
|
|
%if %{build6x}
|
|
|
|
|
Requires: util-linux, pam >= 0.66-5
|
|
|
|
|
%else
|
|
|
|
|
Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
|
|
|
|
|
%endif
|
|
|
|
|
Conflicts: SysVinit < 2.74-14
|
|
|
|
|
BuildPrereq: desktop-file-utils, glib2-devel, gtk2-devel
|
|
|
|
|
BuildPrereq: libglade2-devel, libuser-devel, pam-devel, util-linux
|
|
|
|
|
BuildPrereq: perl-XML-Parser
|
|
|
|
|
%if %{WITH_SELINUX}
|
|
|
|
|
BuildPrereq: libselinux-devel >= 1.17.13-2
|
|
|
|
|
%endif
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-root
|
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
|
%package gtk
|
|
|
|
|
Summary: Graphical tools for certain user account management tasks.
|
|
|
|
|
Summary: Graphical tools for certain user account management tasks
|
|
|
|
|
Group: Applications/System
|
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
|
@@ -48,33 +37,35 @@ graphical tools for certain account management tasks.
|
|
|
|
|
%setup -q
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
export CFLAGS="$RPM_OPT_FLAGS"
|
|
|
|
|
%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
|
|
|
|
|
|
|
|
|
|
# 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 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/${wrappedapp}
|
|
|
|
|
%else
|
|
|
|
|
cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
|
|
|
|
|
%endif
|
|
|
|
|
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 \
|
|
|
|
|
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
|
|
|
|
|
%if ! %{build6x}
|
|
|
|
|
rm -f $RPM_BUILD_ROOT/%{_bindir}/shutdown
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%find_lang %{name}
|
|
|
|
|
|
|
|
|
@@ -83,6 +74,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*
|
|
|
|
@@ -91,19 +83,19 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
%{_bindir}/halt
|
|
|
|
|
%{_bindir}/reboot
|
|
|
|
|
%{_bindir}/poweroff
|
|
|
|
|
%if %{build6x}
|
|
|
|
|
%{_bindir}/shutdown
|
|
|
|
|
%endif
|
|
|
|
|
%exclude %{_bindir}/shutdown
|
|
|
|
|
%config(noreplace) /etc/pam.d/halt
|
|
|
|
|
%config(noreplace) /etc/pam.d/reboot
|
|
|
|
|
%config(noreplace) /etc/pam.d/poweroff
|
|
|
|
|
%config /etc/security/console.apps/halt
|
|
|
|
|
%config /etc/security/console.apps/reboot
|
|
|
|
|
%config /etc/security/console.apps/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
|
|
|
|
|
|
|
|
|
|
%files gtk
|
|
|
|
|
%defattr(-,root,root)
|
|
|
|
|
%{_bindir}/usermount
|
|
|
|
|
%{_bindir}/userformat
|
|
|
|
|
%{_mandir}/man1/usermount.1*
|
|
|
|
|
%{_bindir}/userinfo
|
|
|
|
|
%{_mandir}/man1/userinfo.1*
|
|
|
|
@@ -116,6 +108,204 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
%{_datadir}/applications/*
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* 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
|
|
|
|
|
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
|
|
|
|
|
- Remove BuildRequires: libattr-devel
|
|
|
|
|
|
|
|
|
|
* Thu Apr 19 2007 Miloslav Trmac <mitr@redhat.com> - 1.91.1-1
|
|
|
|
|
- New release with updated translations
|
|
|
|
|
|
|
|
|
|
* Tue Mar 27 2007 Matthias Clasen <mclasen@redhat.com> 1.91-2
|
|
|
|
|
- Clean up desktop files
|
|
|
|
|
|
|
|
|
|
* Mon Mar 19 2007 Miloslav Trmac <mitr@redhat.com> - 1.91-1
|
|
|
|
|
- Preserve environment variables in consolehelper if specified in the service
|
|
|
|
|
config file
|
|
|
|
|
Related: #213402
|
|
|
|
|
|
|
|
|
|
* Wed Mar 14 2007 Miloslav Trmac <mitr@redhat.com> - 1.90-1
|
|
|
|
|
- Fix GUI=no handling
|
|
|
|
|
Resolves: #110701
|
|
|
|
|
- Add a dialog caption when changing user password
|
|
|
|
|
Resolves: #154861
|
|
|
|
|
- Fix an use of PAM data after free
|
|
|
|
|
Resolves: #176992
|
|
|
|
|
- Support "user", "users", LABEL= and UUID= in usermount and userformat
|
|
|
|
|
Resolves: #189907
|
|
|
|
|
- Use less memory in pam-panel-icon until the icon is actually displayed
|
|
|
|
|
- Don't use deprecated GTK+ widgets
|
|
|
|
|
|
|
|
|
|
* Fri Mar 9 2007 Miloslav Trmac <mitr@redhat.com> - 1.89-1
|
|
|
|
|
- Preserve application exit code in consolehelper
|
|
|
|
|
Resolves: #178991, #210893
|
|
|
|
|
- Drop the historical build6x spec file variable
|
|
|
|
|
- Fix some rpmlint warnings
|
|
|
|
|
|
|
|
|
|
* Mon Dec 11 2006 Martin Bacovsky <mbacovsk@redhat.com> - 1.88-3.el5
|
|
|
|
|
- Updated translations
|
|
|
|
|
- Resolves: #216622
|
|
|
|
|
|
|
|
|
|
* Fri Dec 1 2006 Martin Bacovsky <mbacovsk@redhat.com> - 1.88-2.el5
|
|
|
|
|
- Updated translations
|
|
|
|
|
- Resolves: #216622
|
|
|
|
|
|
|
|
|
|
* Thu Nov 30 2006 Martin Bacovsky <mbacovsk@redhat.com> - 1.88-1.el5
|
|
|
|
|
- Updated translations
|
|
|
|
|
- Resolves: #216622
|
|
|
|
|
|
|
|
|
|
* Tue Oct 3 2006 Martin Bacovsky <mbacovsky@redhat.com> 1.87-3
|
|
|
|
|
- Repackaging with new translations
|
|
|
|
|
|
|
|
|
|
* Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 1.87-2
|
|
|
|
|
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
|
|
|
|
|
|
|
|
|
|
* Wed Sep 20 2006 Martin Bacovsky <mbacovsky@redhat.com> 1.87-1
|
|
|
|
|
- pam-panel-icon is now transparent on GTK+ >2.10 (#207181),
|
|
|
|
|
thanks to Bill Nottingham
|
|
|
|
|
|
|
|
|
|
* Wed Aug 30 2006 Martin Bacovsky <mbacovsky@redhat.com> 1.86-1
|
|
|
|
|
- fix userpasswd - Query window pops up three times if cancelling passwd (#202924)
|
|
|
|
|
- Serbian latin script translation added (#203003)
|
|
|
|
|
|
|
|
|
|
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.85-2.2.1
|
|
|
|
|
- rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.85-2.2
|
|
|
|
|
- bump again for double-long bug on ppc(64)
|
|
|
|
|
|
|
|
|
|
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.85-2.1
|
|
|
|
|
- rebuilt for new gcc4.1 snapshot and glibc changes
|
|
|
|
|
|
|
|
|
|
* Tue Jan 31 2006 Jindrich Novy <jnovy@redhat.com> 1.85-2
|
|
|
|
|
- add gettext, libattr-devel, libSM-devel dependencies
|
|
|
|
|
|
|
|
|
|
* Tue Jan 3 2006 Jindrich Novy <jnovy@redhat.com> 1.85-1
|
|
|
|
|
- fix userpasswd - don't crash if pam produces multi-line output (#175735)
|
|
|
|
|
Thanks to toddp@bestweb.net
|
|
|
|
|
- added Serbian translation (#176152)
|
|
|
|
|
|
|
|
|
|
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
|
|
|
|
- rebuilt
|
|
|
|
|
|
|
|
|
|
* Thu Dec 1 2005 Jindrich Novy <jnovy@redhat.com> 1.84-1
|
|
|
|
|
- usermode-gtk dialog stays always on top, thanks to Pierre Ossman (#80634)
|
|
|
|
|
|
|
|
|
|
* Tue Nov 15 2005 Jindrich Novy <jnovy@redhat.com> 1.83-1
|
|
|
|
|
- accept gecos information on commandline for userinfo,
|
|
|
|
|
patch by mclasen@redhat.com (#173232)
|
|
|
|
|
- update translations
|
|
|
|
|
|
|
|
|
|
* Wed Oct 26 2005 Jindrich Novy <jnovy@redhat.com> 1.82-1
|
|
|
|
|
- don't use pam_stack.so
|
|
|
|
|
- introduce userformat to better handle device formatting
|
|
|
|
|
and removing usermount from menus (#132559)
|
|
|
|
|
|
|
|
|
|
* Tue Aug 16 2005 Jindrich Novy <jnovy@redhat.com> 1.81-1
|
|
|
|
|
- apply SELinux functionality enhancement patch from Dan Walsh
|
|
|
|
|
- rebuilt because of the new cairo
|
|
|
|
|
|
|
|
|
|
* Thu Aug 11 2005 Ray Strode <rstrode@redhat.com> 1.80-4
|
|
|
|
|
- rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jul 12 2005 Jindrich Novy <jnovy@redhat.com> 1.80-3
|
|
|
|
|
- rebuild again because of libwnck change
|
|
|
|
|
|
|
|
|
|
* Tue Jul 12 2005 Jindrich Novy <jnovy@redhat.com> 1.80-2
|
|
|
|
|
- rebuild because of broken libwnck dependency
|
|
|
|
|
|
|
|
|
|
* Wed May 11 2005 Jindrich Novy <jnovy@redhat.com> 1.80-1
|
|
|
|
|
- fix "Unknown error" when password is mistyped in userpasswd (#135500)
|
|
|
|
|
- add icons to windows for usermode-gtk applications (#155867)
|
|
|
|
@@ -453,7 +643,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
- 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
|
|
|
|
|
* 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>
|
|
|
|
|
Miloslav Trmac