Hello community, here is the log from the commit of package yast2-ldap-client for openSUSE:Factory checked in at Mon Jun 29 17:01:47 CEST 2009. -------- --- yast2-ldap-client/yast2-ldap-client.changes 2009-06-08 14:53:52.000000000 +0200 +++ yast2-ldap-client/yast2-ldap-client.changes 2009-06-26 15:25:04.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 25 22:12:56 CEST 2009 - jsuchome@suse.cz + +- manual installation of 32bit packages packages no longer needed + (bnc#354164) +- 2.18.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ldap-client-2.18.1.tar.bz2 New: ---- yast2-ldap-client-2.18.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.P18419/_old 2009-06-29 17:00:51.000000000 +0200 +++ /var/tmp/diff_new_pack.P18419/_new 2009-06-29 17:00:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-client (Version 2.18.1) +# spec file for package yast2-ldap-client (Version 2.18.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,13 @@ Name: yast2-ldap-client -Version: 2.18.1 -Release: 2 -License: GPL v2 or later -Group: System/YaST +Version: 2.18.4 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-client-2.18.1.tar.bz2 +Source0: yast2-ldap-client-2.18.4.tar.bz2 Prefix: /usr +Group: System/YaST +License: GPL v2 or later BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-network yast2-pam yast2-testsuite PreReq: %fillup_prereq # SLPAPI.pm @@ -46,15 +46,8 @@ With this YaST2 module you can configure an LDAP client so that an OpenLDAP server will be used for user authentication. - - -Authors: --------- - Thorsten Kukuk <kukuk@suse.de> - Jiri Suchomel <jsuchome@suse.cz> - %prep -%setup -n yast2-ldap-client-2.18.1 +%setup -n yast2-ldap-client-2.18.4 %build %{prefix}/bin/y2tool y2autoconf @@ -64,7 +57,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs} +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" ++++++ yast2-ldap-client-2.18.1.tar.bz2 -> yast2-ldap-client-2.18.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.18.1/autodocs-ycp.ami new/yast2-ldap-client-2.18.4/autodocs-ycp.ami --- old/yast2-ldap-client-2.18.1/autodocs-ycp.ami 2009-02-04 15:32:13.000000000 +0100 +++ new/yast2-ldap-client-2.18.4/autodocs-ycp.ami 2009-06-26 14:57:27.000000000 +0200 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -8,20 +8,25 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs -html_DATA = index.html $(wildcard *.html) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.18.1/configure new/yast2-ldap-client-2.18.4/configure --- old/yast2-ldap-client-2.18.1/configure 2009-02-04 15:32:16.000000000 +0100 +++ new/yast2-ldap-client-2.18.4/configure 2009-06-26 14:57:29.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-ldap-client 2.17.18. +# Generated by GNU Autoconf 2.63 for yast2-ldap-client 2.18.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ldap-client' PACKAGE_TARNAME='yast2-ldap-client' -PACKAGE_VERSION='2.17.18' -PACKAGE_STRING='yast2-ldap-client 2.17.18' +PACKAGE_VERSION='2.18.4' +PACKAGE_STRING='yast2-ldap-client 2.18.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ldap-client 2.17.18 to adapt to many kinds of systems. +\`configure' configures yast2-ldap-client 2.18.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ldap-client 2.17.18:";; + short | recursive ) echo "Configuration of yast2-ldap-client 2.18.4:";; esac cat <<\_ACEOF @@ -1426,7 +1426,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ldap-client configure 2.17.18 +yast2-ldap-client configure 2.18.4 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1440,7 +1440,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ldap-client $as_me 2.17.18, which was +It was created by yast2-ldap-client $as_me 2.18.4, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2287,7 +2287,7 @@ # Define the identity of the package. PACKAGE='yast2-ldap-client' - VERSION='2.17.18' + VERSION='2.18.4' cat >>confdefs.h <<_ACEOF @@ -2511,7 +2511,7 @@ -VERSION="2.17.18" +VERSION="2.18.4" RPMNAME="yast2-ldap-client" MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" @@ -3452,7 +3452,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ldap-client $as_me 2.17.18, which was +This file was extended by yast2-ldap-client $as_me 2.18.4, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3502,7 +3502,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-ldap-client config.status 2.17.18 +yast2-ldap-client config.status 2.18.4 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.18.1/configure.in new/yast2-ldap-client-2.18.4/configure.in --- old/yast2-ldap-client-2.18.1/configure.in 2009-02-04 15:32:13.000000000 +0100 +++ new/yast2-ldap-client-2.18.4/configure.in 2009-06-26 14:57:27.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ldap-client dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ldap-client, 2.17.18, http://bugs.opensuse.org/, yast2-ldap-client) +AC_INIT(yast2-ldap-client, 2.18.4, http://bugs.opensuse.org/, yast2-ldap-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.18" +VERSION="2.18.4" RPMNAME="yast2-ldap-client" MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.18.1/doc/autodocs/Makefile.in new/yast2-ldap-client-2.18.4/doc/autodocs/Makefile.in --- old/yast2-ldap-client-2.18.1/doc/autodocs/Makefile.in 2009-02-04 15:32:17.000000000 +0100 +++ new/yast2-ldap-client-2.18.4/doc/autodocs/Makefile.in 2009-06-26 14:57:30.000000000 +0200 @@ -17,7 +17,7 @@ # Makefile.am for YCP module .../doc/autodocs # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -26,6 +26,10 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -142,7 +146,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs imagedir = @imagedir@ includedir = @includedir@ infodir = @infodir@ @@ -183,7 +187,7 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ -html_DATA = index.html $(wildcard *.html) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp all: all-am @@ -369,14 +373,15 @@ AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.18.1/Makefile.am new/yast2-ldap-client-2.18.4/Makefile.am --- old/yast2-ldap-client-2.18.1/Makefile.am 2009-02-04 15:32:13.000000000 +0100 +++ new/yast2-ldap-client-2.18.4/Makefile.am 2009-06-26 14:57:27.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.18.1/Makefile.in new/yast2-ldap-client-2.18.4/Makefile.in --- old/yast2-ldap-client-2.18.1/Makefile.in 2009-02-04 15:32:17.000000000 +0100 +++ new/yast2-ldap-client-2.18.4/Makefile.in 2009-06-26 14:57:30.000000000 +0200 @@ -226,10 +226,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec POT_DST = $(shell find -type d -name testsuite -prune , \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.18.1/src/Ldap.ycp new/yast2-ldap-client-2.18.4/src/Ldap.ycp --- old/yast2-ldap-client-2.18.1/src/Ldap.ycp 2009-03-11 19:07:33.000000000 +0100 +++ new/yast2-ldap-client-2.18.4/src/Ldap.ycp 2009-06-25 22:11:39.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk@suse.de> * Anas Nashif <nashif@suse.de> * - * $Id: Ldap.ycp 54645 2009-01-15 13:46:41Z jsuchome $ + * $Id: Ldap.ycp 57490 2009-06-08 12:53:14Z jsuchome $ */ { @@ -13,7 +13,6 @@ module "Ldap"; textdomain "ldap-client"; - import "Arch"; import "Autologin"; import "Directory"; import "FileUtils"; @@ -278,23 +277,6 @@ // if /etc/passwd was read boolean passwd_read = false; - // packages to install for specific arhitectures (#49808) - global map arch_packages = $[ - "pam_ldap" : $[ - "ia64" : [ "pam_ldap-x86" ], - "ppc64" : [ "pam_ldap-64bit" ], - "s390_64" : [ "pam_ldap-32bit" ], - "x86_64" : [ "pam_ldap-32bit" ], - ], - "nss_ldap" : $[ - "ia64" : [ "nss_ldap-x86" ], - "ppc64" : [ "nss_ldap-64bit" ], - "s390_64" : [ "nss_ldap-32bit" ], - "x86_64" : [ "nss_ldap-32bit" ], - - ] - ]; - /** * if pam_mkhomedir is set in /etc/pam.d/commond-session */ @@ -370,21 +352,6 @@ } /** - * Return list of architecture specific packages (derived from package list - * given as parameter) merged with the packages in parameter - */ - global define list<string> UpdatedArchPackages (list<string> packages) { - - list<string> ret = packages; - string arch = Arch::architecture (); - - foreach (string package, packages, { - ret = (list<string>) union (ret, arch_packages[package,arch]:[]); - }); - return ret; - } - - /** * Return needed packages and packages to be removed * during autoinstallation. * @return map of lists. @@ -394,9 +361,7 @@ if (start) required_packages = (list<string>) union (required_packages, ["pam_ldap", "nss_ldap"]); - list<string> install_pkgs = UpdatedArchPackages (required_packages); - list remove_pkgs = []; - return ($["install": install_pkgs, "remove": remove_pkgs]); + return ($["install": required_packages, "remove": []]); } @@ -736,13 +701,15 @@ { list<string> map_attrs = ReadLdapConfEntries ("nss_map_attribute"); foreach (string map_attr, map_attrs, { - map_attr = tolower (map_attr); - if (issubstring (map_attr, "uniquemember")) + if (issubstring (tolower (map_attr), "uniquemember")) { list<string> attr = splitstring (map_attr, " \t"); - if (attr[0]:"" == "uniquemember") + if (tolower (attr[0]:"") == "uniquemember") { member_attribute = attr[1]:member_attribute; + // LDAP needs to know correct attribute name + if (member_attribute == "uniquemember") + member_attribute = "uniqueMember"; old_member_attribute = member_attribute; } } @@ -2614,8 +2581,7 @@ block<boolean> abort = ``{ return false; }; - list<string> needed_packages = - UpdatedArchPackages (["pam_ldap", "nss_ldap"]); + list<string> needed_packages = ["pam_ldap", "nss_ldap"]; if (_start_autofs && !Package::Installed("autofs")) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.18.1/src/ui.ycp new/yast2-ldap-client-2.18.4/src/ui.ycp --- old/yast2-ldap-client-2.18.1/src/ui.ycp 2009-02-04 15:33:10.000000000 +0100 +++ new/yast2-ldap-client-2.18.4/src/ui.ycp 2009-06-25 22:12:06.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk@suse.de> * Anas Nashif <nashif@suse.de> * - * $Id: ui.ycp 55208 2009-02-03 14:44:05Z jsuchome $ + * $Id: ui.ycp 57490 2009-06-08 12:53:14Z jsuchome $ * * All user interface functions. */ @@ -430,8 +430,7 @@ } } - list<string> needed_packages = - Ldap::UpdatedArchPackages (["pam_ldap", "nss_ldap"]); + list<string> needed_packages = ["pam_ldap", "nss_ldap"]; if (start && !Package::InstalledAll (needed_packages)) { @@ -613,9 +612,9 @@ list<term>member_attributes = [ `item (`id("member"), "member", member_attribute == "member"), - `item (`id("uniquemember"), "uniquemember", member_attribute == "uniquemember") + `item (`id("uniqueMember"), "uniqueMember", member_attribute == "uniqueMember") ]; - if (member_attribute != "member" && member_attribute != "uniquemember") + if (member_attribute != "member" && member_attribute != "uniqueMember") { member_attributes = add (member_attributes, `item (`id(member_attribute), member_attribute, true)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.18.1/VERSION new/yast2-ldap-client-2.18.4/VERSION --- old/yast2-ldap-client-2.18.1/VERSION 2009-03-11 19:12:42.000000000 +0100 +++ new/yast2-ldap-client-2.18.4/VERSION 2009-06-26 14:55:38.000000000 +0200 @@ -1 +1 @@ -2.18.1 +2.18.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org