From 8d2320e2ed7223127dedbf6a68e8f0df71676dc2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 10:51:21 +0000 Subject: [PATCH 1/4] Initialize branch F-7 for usermode --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From da7dff5ce17cb7a2d8903869c1cc5b8c494034f8 Mon Sep 17 00:00:00 2001 From: Miloslav Trmac Date: Fri, 15 Jun 2007 08:47:17 +0000 Subject: [PATCH 2/4] Prepare an usermode-1.92 update for F7. --- .cvsignore | 2 +- sources | 2 +- usermode.spec | 37 +++++++++++++++++++++---------------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0244043..77ed6e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -usermode-1.91.1.tar.bz2 +usermode-1.92.tar.bz2 diff --git a/sources b/sources index 410cd2d..877d938 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d036105f567bf0649bbec0c5866a0f81 usermode-1.91.1.tar.bz2 +6b962175592a2b4668b7251fa18d97f4 usermode-1.92.tar.bz2 diff --git a/usermode.spec b/usermode.spec index 63a1485..1eb0652 100644 --- a/usermode.spec +++ b/usermode.spec @@ -4,8 +4,8 @@ Summary: Tools for certain user account management tasks Name: usermode -Version: 1.91.1 -Release: 1 +Version: 1.92 +Release: 0.fc7 License: GPL Group: Applications/System Source: usermode-%{version}.tar.bz2 @@ -13,7 +13,7 @@ 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, libattr-devel, libSM-devel, gettext +BuildRequires: perl-XML-Parser, libSM-devel, gettext %if %{WITH_SELINUX} BuildRequires: libselinux-devel >= 1.17.13-2 %endif @@ -67,20 +67,15 @@ for wrappedapp in halt reboot poweroff ; do done for i in redhat-userinfo.desktop redhat-userpasswd.desktop; do - cat >>$RPM_BUILD_ROOT%{_datadir}/applications/$i <>$RPM_BUILD_ROOT%{_datadir}/applications/$i +done + +for i in redhat-userinfo.desktop redhat-userpasswd.desktop \ + redhat-usermount.desktop; do + desktop-file-install --vendor redhat --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + $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} @@ -121,6 +116,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Mon Jun 15 2007 Miloslav Trmač - 1.92-0.f7 +- Fix userhelper hangs in non-UTF8 locales + Resolves: #242420 +- Clean up menu categories in desktop files + +* Sat Jun 9 2007 Miloslav Trmač - 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 - 1.91.1-1 - New release with updated translations From e03eab771e04917378db46cafac3da539e3bb558 Mon Sep 17 00:00:00 2001 From: Miloslav Trmac Date: Wed, 5 Sep 2007 00:39:55 +0000 Subject: [PATCH 3/4] - Fix handling of PAM conversations with no questions Resolves: #267361 - Update License: --- .cvsignore | 2 +- sources | 2 +- usermode.spec | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 77ed6e0..315803a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -usermode-1.92.tar.bz2 +usermode-1.93.tar.bz2 diff --git a/sources b/sources index 877d938..d802adb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b962175592a2b4668b7251fa18d97f4 usermode-1.92.tar.bz2 +82a157127cc827c0ad4d33fc52a92cb0 usermode-1.93.tar.bz2 diff --git a/usermode.spec b/usermode.spec index 1eb0652..931fdc4 100644 --- a/usermode.spec +++ b/usermode.spec @@ -4,9 +4,9 @@ Summary: Tools for certain user account management tasks Name: usermode -Version: 1.92 -Release: 0.fc7 -License: GPL +Version: 1.93 +Release: 1%{?dist} +License: GPLv2+ Group: Applications/System Source: usermode-%{version}.tar.bz2 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd @@ -116,7 +116,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog -* Mon Jun 15 2007 Miloslav Trmač - 1.92-0.f7 +* Wed Sep 5 2007 Miloslav Trmač - 1.93-1 +- Fix handling of PAM conversations with no questions + Resolves: #267361 +- Update License: + +* Mon Jun 11 2007 Miloslav Trmač - 1.92-1 - Fix userhelper hangs in non-UTF8 locales Resolves: #242420 - Clean up menu categories in desktop files From 3278e2dd648c1f4092604ab77e179cffa93a2e95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:48:29 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 6 ------ branch | 1 - 3 files changed, 7 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 044dc97..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Makefile for source rpm: usermode -# $Id$ -NAME := usermode -SPECFILE = $(firstword $(wildcard *.spec)) - -include ../common/Makefile.common diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7