dist-git conversion

- Update License:

.gitignore

@@ -1 +1 @@
-usermode-1.100.tar.bz2
+usermode-1.93.tar.bz2

sources

@@ -1 +1 @@
-c7f1c6d353bed3d9c823e3620cab8d40  usermode-1.100.tar.bz2
+82a157127cc827c0ad4d33fc52a92cb0  usermode-1.93.tar.bz2

usermode.spec

@@ -1,17 +1,23 @@
+%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
+%define WITH_SELINUX 1
+%endif
+
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.100
-Release: 2
+Version: 1.93
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
-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, e2fsprogs-devel, gettext, glib2-devel
-BuildRequires: gtk2-devel, intltool, libSM-devel, libglade2-devel
-BuildRequires: libselinux-devel, libuser-devel, pam-devel, perl-XML-Parser
-BuildRequires: startup-notification-devel, util-linux
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source: usermode-%{version}.tar.bz2
+Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
+Conflicts: SysVinit < 2.74-14
+BuildRequires: desktop-file-utils, e2fsprogs-devel, glib2-devel, gtk2-devel
+BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
+BuildRequires: perl-XML-Parser, 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
@@ -37,13 +43,16 @@ graphical tools for certain account management tasks.
 %setup -q
 
 %build
-%configure --with-selinux
+%configure \
+%if %{WITH_SELINUX}
+	--with-selinux
+%endif
 
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # make userformat symlink to usermount
 ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
@@ -53,15 +62,16 @@ ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
 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 -p -m644 $wrappedapp \
-		$RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
-	install -p -m644 shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
+	install -m644 $wrappedapp $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
+	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
+done
+
+for i in redhat-userinfo.desktop redhat-userpasswd.desktop; do
+  echo 'NoDisplay=true' >>$RPM_BUILD_ROOT%{_datadir}/applications/$i
 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
@@ -74,7 +84,6 @@ 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*
@@ -87,10 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/pam.d/halt
 %config(noreplace) /etc/pam.d/reboot
 %config(noreplace) /etc/pam.d/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
+%config /etc/security/console.apps/halt
+%config /etc/security/console.apps/reboot
+%config /etc/security/console.apps/poweroff
 
 %files gtk
 %defattr(-,root,root)
@@ -108,79 +116,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
-* 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