Clean up desktop files

service config file Related: #213402

.cvsignore

@@ -1 +1 @@
-usermode-1.69-4.tar.gz
+usermode-1.91.tar.bz2

sources

@@ -1 +1 @@
-6d2ad6152aec78365dcc85f678d538d0  usermode-1.69-4.tar.gz
+3de0199d1393e57ca91e1b965c19908e  usermode-1.91.tar.bz2

usermode.spec

@@ -2,26 +2,25 @@
 %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.69
-Release: 4
+Version: 1.91
+Release: 2
 License: GPL
 Group: Applications/System
-Source: usermode-%{version}-%{release}.tar.gz
-%if %{build6x}
-Requires: util-linux, pam >= 0.66-5
-%else
-Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth
-%endif
+Source: usermode-%{version}.tar.bz2
+Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
 Conflicts: SysVinit < 2.74-14
-BuildPrereq: desktop-file-utils, glib2-devel, gtk2-devel
-BuildPrereq: libglade2-devel, libuser-devel, pam-devel, util-linux
+BuildRequires: desktop-file-utils, e2fsprogs-devel, glib2-devel, gtk2-devel
+BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
+BuildRequires: perl-XML-Parser, libattr-devel, libSM-devel, gettext
+%if %{WITH_SELINUX}
+BuildRequires: libselinux-devel >= 1.17.13-2
+%endif
 BuildRoot: %{_tmppath}/%{name}-root
 
 %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}
 
@@ -41,12 +40,12 @@ Install the usermode-gtk package if you would like to provide users with
 graphical tools for certain account management tasks.
 
 %prep
-%setup -q -n %{name}-%{version}-%{release}
+%setup -q
 
 %build
 %configure \
 %if %{WITH_SELINUX}
-	--with-selinux 
+	--with-selinux
 %endif
 
 make
@@ -55,24 +54,33 @@ make
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# 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
 done
-%if %{WITH_SELINUX}
-install -m644 userhelper_context $RPM_BUILD_ROOT/etc/security
-%endif
-%if ! %{build6x}
-rm -f $RPM_BUILD_ROOT/%{_bindir}/shutdown
-%endif
+
+for i in redhat-userinfo.desktop redhat-userpasswd.desktop; do
+  cat >>$RPM_BUILD_ROOT%{_datadir}/applications/$i <<EOF
+NoDisplay=true
+EOF
+  desktop-file-install --vendor redhat --delete-original    \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
+    --remove-category Application			    \
+    --add-category X-GNOME-PersonalSettings		    \
+    $RPM_BUILD_ROOT%{_datadir}/applications/$i
+done
+  
+desktop-file-install --vendor redhat --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications              \
+  --remove-category Application				     \
+  $RPM_BUILD_ROOT%{_datadir}/applications/redhat-usermount.desktop
 
 %find_lang %{name}
 
@@ -89,22 +97,18 @@ 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
-%if %{WITH_SELINUX}
-%config /etc/security/userhelper_context
-%endif
 
 %files gtk
 %defattr(-,root,root)
 %{_bindir}/usermount
+%{_bindir}/userformat
 %{_mandir}/man1/usermount.1*
 %{_bindir}/userinfo
 %{_mandir}/man1/userinfo.1*
@@ -117,6 +121,210 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* 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)
+- add missing checks for some PAM error codes
+- fix ungettextized error message
+- update translations
+
+* Tue Mar 15 2005 Matthias Clasen <mclasen@redhat.com> 1.79-2
+- rebuild against new libwnck
+
+* Wed Mar 02 2005 Jindrich Novy <jnovy@rdhat.com> 1.79-1
+- fix problem with root passwords starting with space (#124980)
+
+* Wed Feb 16 2005 Jindrich Novy <jnovy@rdhat.com> 1.78-2
+- add $RPM_OPT_FLAGS to CFLAGS
+
+* Thu Jan 27 2005 Jindrich Novy <jnovy@redhat.com> 1.78-1
+- pam-panel-icon has popup menu to choose to forget/keep
+  authentization by right clicking as usual for other panel applets (#75845)
+- fix race condition (#142254)
+
+* Thu Jan 20 2005 Jindrich Novy <jnovy@redhat.com> 1.77-1
+- preserve LANGUAGE environment variable in userhelper (#82300)
+- use badge instead of keyring icon for pam-panel-icon (#122487)
+- icon is not showed in the panel when logged as root (#75234)
+- use new environment variable USERHELPER_UID to identify
+  an user who executed an application via userhelper  (#116186)
+
+* Thu Dec 02 2004 Jindrich Novy <jnovy@redhat.com> 1.76-1
+- fix dependencies to Perl-XML-Parser #124170
+- use pamconsole instead of user in /etc/fstab to let
+  usermount work with hal #139820
+
+* Tue Nov 16 2004 Jindrich Novy <jnovy@redhat.com>
+- update libuser interface to libuser-0.6
+
+* Wed Nov 10 2004 Jindrich Novy <jnovy@redhat.com> 1.75-1
+- make pam-panel-icon using localized strings (#138609)
+- update translations
+- fix usermount to use "-I" option only for vfat and msdos fs
+- fix Makefile.am to not to use "Release" from spec to name dist tarballs
+
+* Wed Oct 20 2004 Jindrich Novy <jnovy@redhat.com> 1.74-1
+- add patch from Mathew Miller (mattdm@mattdm.org) to use
+  own user's password instead of root's in authentization
+  (the user must be a member of specific group to enable it)
+
+* Mon Oct 04 2004 Jindrich Novy <jnovy@redhat.com> 1.73-1
+- add support to configure.in for more languages
+- update translations from upstream
+- generate build scripts by autogen.sh
+
+* Tue Sep 28 2004 Rik van Riel <riel@redhat.com> 1.72-2
+- add dependency on passwd (bz #125010)
+- make sure the Release: isn't part of the path name and tarball name
+
+* Mon Sep 27 2004 Ray Strode <rstrode@redhat.com> 1.72-1
+- remove X-Red-Hat-Base category from userinfo.desktop
+- fix `make distcheck'
+- use proper value types for Terminal keys in desktop entries
+- remove upstreamed mkfs patch
+
+* Fri Sep 24 2004 Jindrich Novy <jnovy@redhat.com> 1.71-4
+- updated dependencies to SELinux
+
+* Wed Sep 22 2004 Jindrich Novy <jnovy@redhat.com> 1.71-3
+- installation to Preferences/More Preferences as a request
+  of Ray Strode (rstrode@redhat.com) and #131605
+
+* Mon Sep 20 2004 Jindrich Novy <jnovy@redhat.com> 1.71-2
+- added "-I" option to mkfs in the .mkfs patch (#117793)
+
+* Thu Aug 26 2004 Alexander Larsson <alexl@redhat.com> - 1.71-1
+- consolehelper: work if root is readonly
+
+* Mon Jul 12 2004 Dan Walsh <dwalsh@redhat.com> 1.70-8
+- Additional diffs from NSA
+- Clean up comments
+
+* Thu Jul 8 2004 Dan Walsh <dwalsh@redhat.com> 1.70-7
+- More fixes for SELinux.  roll back to only use root for auth.
+- Add getenforce checks
+- Add root_passwd check
+
+* Tue Jul 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-6
+- More fixes to make targeted policy work correctly
+
+* Tue Jul 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-5
+- Fix to use root if user not defined
+
+* Tue May 25 2004 Dan Walsh <dwalsh@redhat.com> 1.70-4
+- Support new policy files
+
+* Thu May 20 2004 Dan Walsh <dwalsh@redhat.com> 1.70-3
+- Change user context to default name if username context not in passwd file
+
+* Thu Apr 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-1
+- Change user context to "root" if username context "user_t" not in passwd file
+
+* Wed Mar 31 2004 Nalin Dahyabhai <nalin@redhat.com> 1.70-1
+- fix accidental mixup of role and type setting up new selinux context
+- log the new selinux context if we're running an app in a new selinux context
+
+* Sat Feb 21 2004 Dan Walsh <dwalsh@redhat.com> 1.69-5
+- Change to fall back to root auth if selinux user does not exist
+
 * Tue Jan 27 2004 Dan Walsh <dwalsh@redhat.com> 1.69-4
 - fix call to is_selinux_enabled
 
@@ -348,7 +556,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>