rpms/usermode
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Preserve application exit code in consolehelper Resolves: #178991,

Browse Source 
#210893
- Drop the historical build6x spec file variable
- Fix some rpmlint warnings
This commit is contained in:
Miloslav Trmac 2007-03-09 03:15:21 +00:00
parent fd598b1944
commit 131e0bc795
3 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
usermode-1.87.tar.gz usermode-1.89.tar.bz2

2
sources
View File

@ -1 +1 @@
db4305b30115ebdfcd650babc370e03f usermode-1.87.tar.gz ccf617683a487e4ec27faaa3c343242d usermode-1.89.tar.bz2

57
usermode.spec
View File

@ -2,30 +2,25 @@
%define WITH_SELINUX 1 %define WITH_SELINUX 1
%endif %endif
%define build6x 0 Summary: Tools for certain user account management tasks
Summary: Tools for certain user account management tasks.
Name: usermode Name: usermode
Version: 1.87 Version: 1.89
Release: 3 Release: 1
License: GPL License: GPL
Group: Applications/System Group: Applications/System
Source: usermode-%{version}.tar.gz 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 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
%endif
Conflicts: SysVinit < 2.74-14 Conflicts: SysVinit < 2.74-14
BuildPrereq: desktop-file-utils, glib2-devel, gtk2-devel BuildRequires: desktop-file-utils, glib2-devel, gtk2-devel
BuildPrereq: libglade2-devel, libuser-devel, pam-devel, util-linux BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
BuildPrereq: perl-XML-Parser, libattr-devel, libSM-devel, gettext BuildRequires: perl-XML-Parser, libattr-devel, libSM-devel, gettext
%if %{WITH_SELINUX} %if %{WITH_SELINUX}
BuildPrereq: libselinux-devel >= 1.17.13-2 BuildRequires: libselinux-devel >= 1.17.13-2
%endif %endif
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
%package gtk %package gtk
Summary: Graphical tools for certain user account management tasks. Summary: Graphical tools for certain user account management tasks
Group: Applications/System Group: Applications/System
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -48,10 +43,9 @@ graphical tools for certain account management tasks.
%setup -q %setup -q
%build %build
export CFLAGS="$RPM_OPT_FLAGS"
%configure \ %configure \
%if %{WITH_SELINUX} %if %{WITH_SELINUX}
--with-selinux --with-selinux
%endif %endif
make make
@ -69,15 +63,8 @@ mkdir -p $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security/console.apps
for wrappedapp in halt reboot poweroff ; do for wrappedapp in halt reboot poweroff ; do
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/${wrappedapp} ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/${wrappedapp}
install -m644 $wrappedapp $RPM_BUILD_ROOT/etc/security/console.apps/${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} cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
%endif
done done
%if ! %{build6x}
rm -f $RPM_BUILD_ROOT/%{_bindir}/shutdown
%endif
%find_lang %{name} %find_lang %{name}
@ -94,9 +81,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/halt %{_bindir}/halt
%{_bindir}/reboot %{_bindir}/reboot
%{_bindir}/poweroff %{_bindir}/poweroff
%if %{build6x} %exclude %{_bindir}/shutdown
%{_bindir}/shutdown
%endif
%config(noreplace) /etc/pam.d/halt %config(noreplace) /etc/pam.d/halt
%config(noreplace) /etc/pam.d/reboot %config(noreplace) /etc/pam.d/reboot
%config(noreplace) /etc/pam.d/poweroff %config(noreplace) /etc/pam.d/poweroff
@ -120,6 +105,24 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/* %{_datadir}/applications/*
%changelog %changelog
* 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 * Tue Oct 3 2006 Martin Bacovsky <mbacovsky@redhat.com> 1.87-3
- Repackaging with new translations - Repackaging with new translations
@ -517,7 +520,7 @@ rm -rf $RPM_BUILD_ROOT
- only try to call gtk_main_quit() if we've got a loop to get out of (#54109) - only try to call gtk_main_quit() if we've got a loop to get out of (#54109)
- obey RPM_OPT_FLAGS, obey - 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 - Update translations
* Mon Aug 6 2001 Nalin Dahyabhai <nalin@redhat.com> * Mon Aug 6 2001 Nalin Dahyabhai <nalin@redhat.com>