From 9c2cf552db9467d25793d704a3e45be66a87a4236215bb393c6354cdc2fb1213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Thu, 17 Feb 2011 10:10:48 +0000 Subject: [PATCH] 2,8d1 < Thu Feb 17 10:59:38 CET 2011 - jsuchome@suse.cz < < - do not run both 'user' and 'user_non_interactive' steps < (bnc#672139) < - 2.20.2 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-users?expand=0&rev=59 --- yast2-users-2.20.1.tar.bz2 | 3 --- yast2-users-2.20.2.tar.bz2 | 3 +++ yast2-users.changes | 7 ++++++ yast2-users.spec | 50 ++++++++++++++------------------------ 4 files changed, 28 insertions(+), 35 deletions(-) delete mode 100644 yast2-users-2.20.1.tar.bz2 create mode 100644 yast2-users-2.20.2.tar.bz2 diff --git a/yast2-users-2.20.1.tar.bz2 b/yast2-users-2.20.1.tar.bz2 deleted file mode 100644 index e54a596..0000000 --- a/yast2-users-2.20.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5f81f6cd62a04e6a6aa7ebdefe8dda0b0ef785c91d9f82558844f8c483a2dc0 -size 441942 diff --git a/yast2-users-2.20.2.tar.bz2 b/yast2-users-2.20.2.tar.bz2 new file mode 100644 index 0000000..0067ae8 --- /dev/null +++ b/yast2-users-2.20.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:547615aca34403c1cc42b52222564e96bb3441bfb588c1f960e628c1db3cb34e +size 441575 diff --git a/yast2-users.changes b/yast2-users.changes index 9ad39d7..364e348 100644 --- a/yast2-users.changes +++ b/yast2-users.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 17 10:59:38 CET 2011 - jsuchome@suse.cz + +- do not run both 'user' and 'user_non_interactive' steps + (bnc#672139) +- 2.20.2 + ------------------------------------------------------------------- Fri Dec 3 12:41:56 CET 2010 - jsuchome@suse.cz diff --git a/yast2-users.spec b/yast2-users.spec index 5dbd62a..0ae9cf3 100644 --- a/yast2-users.spec +++ b/yast2-users.spec @@ -1,56 +1,42 @@ # -# spec file for package yast2-users (Version 2.20.1) +# spec file for package yast2-users (Version 2.20.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - # norootforbuild +Name: yast2-users +Version: 2.20.2 +Release: 0 -Name: yast2-users -Version: 2.20.1 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-users-2.20.1.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-users-2.20.2.tar.bz2 -Prefix: /usr +prefix: /usr -Group: System/YaST -License: GPLv2+ -BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite +Group: System/YaST +License: GPL v2 or later +BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite yast2-core-devel -Requires: yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext -Obsoletes: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user -Provides: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user +Requires: yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext +Obsoletes: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user +Provides: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user # y2usernote, y2useritem -Requires: yast2-perl-bindings >= 2.18.0 +Requires: yast2-perl-bindings >= 2.18.0 # this forces using yast2-ldap with orrect LDAP object names (fate#303596) -Requires: yast2-ldap-client >= 2.17.1 +Requires: yast2-ldap-client >= 2.17.1 # String::RemoveShortcut Requires: yast2 >= 2.18.0 -Summary: YaST2 - User and Group Configuration +Summary: YaST2 - User and Group Configuration %description This package provides GUI for maintenance of linux users and groups. %prep -%setup -n yast2-users-2.20.1 +%setup -n yast2-users-2.20.2 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +60,7 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + %clean rm -rf "$RPM_BUILD_ROOT" @@ -96,4 +83,3 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/YaST2/plugin/libpy2ag_crack.so %{_libdir}/YaST2/plugin/libpy2ag_crack.la %doc %{prefix}/share/doc/packages/yast2-users -%changelog