Hello community,
here is the log from the commit of package yast2-ldap-client
checked in at Tue Feb 13 14:12:39 CET 2007.
--------
--- yast2-ldap-client/yast2-ldap-client.changes 2007-01-29 09:53:26.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-ldap-client/yast2-ldap-client.changes 2007-02-13 07:53:20.216913000 +0100
@@ -1,0 +2,6 @@
+Tue Feb 6 12:58:12 CET 2007 - jsuchome@suse.cz
+
+- remove a dependency on yast2-slp (#238680)
+- 2.15.3
+
+-------------------------------------------------------------------
Old:
----
yast2-ldap-client-2.15.2.tar.bz2
New:
----
yast2-ldap-client-2.15.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-client.spec ++++++
--- /var/tmp/diff_new_pack.d32508/_old 2007-02-13 14:12:27.000000000 +0100
+++ /var/tmp/diff_new_pack.d32508/_new 2007-02-13 14:12:27.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ldap-client (Version 2.15.2)
+# spec file for package yast2-ldap-client (Version 2.15.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,16 +11,16 @@
# norootforbuild
Name: yast2-ldap-client
-Version: 2.15.2
+Version: 2.15.3
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-client-2.15.2.tar.bz2
+Source0: yast2-ldap-client-2.15.3.tar.bz2
prefix: /usr
BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-network yast2-pam yast2-testsuite
PreReq: %fillup_prereq
-Requires: yast2 yast2-ldap yast2-slp yast2-network
+Requires: yast2 yast2-ldap yast2-network
# new API of Pam.ycp
Requires: yast2-pam >= 2.14.0
Provides: yast2-config-ldap_client
@@ -42,7 +42,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-ldap-client-2.15.2
+%setup -n yast2-ldap-client-2.15.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +76,7 @@
/usr/share/YaST2/include/ldap/*
/usr/share/YaST2/modules/Ldap.y*
/usr/share/YaST2/modules/LdapPopup.y*
+/usr/share/YaST2/modules/SLPAPI.*
/usr/share/YaST2/clients/ldap*.ycp
/usr/share/YaST2/scrconf/*.scr
/usr/share/YaST2/schema/autoyast/rnc/ldap_client.rnc
@@ -83,6 +84,9 @@
/var/adm/fillup-templates/sysconfig.ldap
%changelog -n yast2-ldap-client
+* Tue Feb 06 2007 - jsuchome@suse.cz
+- remove a dependency on yast2-slp (#238680)
+- 2.15.3
* Fri Jan 26 2007 - jsuchome@suse.cz
- enable creating default configuration object from command line
(patch provided by mc@suse.de)
++++++ yast2-ldap-client-2.15.2.tar.bz2 -> yast2-ldap-client-2.15.3.tar.bz2 ++++++
++++ 5354 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.15.2/configure.in new/yast2-ldap-client-2.15.3/configure.in
--- old/yast2-ldap-client-2.15.2/configure.in 2006-01-27 08:43:12.000000000 +0100
+++ new/yast2-ldap-client-2.15.3/configure.in 2007-02-06 10:47:21.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ldap-client
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ldap-client, 2.13.7, http://www.suse.de/feedback, yast2-ldap-client)
+AC_INIT(yast2-ldap-client, 2.15.2, http://bugs.opensuse.org/, yast2-ldap-client)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.7"
+VERSION="2.15.2"
RPMNAME="yast2-ldap-client"
MAINTAINER="Jiri Suchomel "
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -142,6 +144,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
AC_CONFIG_FILES(Makefile agents/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.15.2/Makefile.am new/yast2-ldap-client-2.15.3/Makefile.am
--- old/yast2-ldap-client-2.15.2/Makefile.am 2006-01-27 08:43:12.000000000 +0100
+++ new/yast2-ldap-client-2.15.3/Makefile.am 2007-02-06 10:47:22.000000000 +0100
@@ -7,7 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -19,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -33,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#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
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -66,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
@@ -95,7 +95,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +116,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +143,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -199,10 +199,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.15.2/Makefile.am.common new/yast2-ldap-client-2.15.3/Makefile.am.common
--- old/yast2-ldap-client-2.15.2/Makefile.am.common 2006-01-27 08:43:12.000000000 +0100
+++ new/yast2-ldap-client-2.15.3/Makefile.am.common 2007-02-06 10:47:21.000000000 +0100
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.15.2/src/ldap.ycp new/yast2-ldap-client-2.15.3/src/ldap.ycp
--- old/yast2-ldap-client-2.15.2/src/ldap.ycp 2007-01-26 16:20:20.000000000 +0100
+++ new/yast2-ldap-client-2.15.3/src/ldap.ycp 2007-01-29 09:54:01.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Thorsten Kukuk
* Anas Nashif
*
- * $Id: ldap.ycp 35269 2007-01-12 11:04:13Z jsuchome $
+ * $Id: ldap.ycp 35671 2007-01-29 08:53:58Z jsuchome $
*/
/***
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.15.2/src/Ldap.ycp new/yast2-ldap-client-2.15.3/src/Ldap.ycp
--- old/yast2-ldap-client-2.15.2/src/Ldap.ycp 2007-01-26 16:25:21.000000000 +0100
+++ new/yast2-ldap-client-2.15.3/src/Ldap.ycp 2007-01-29 09:54:01.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Thorsten Kukuk
* Anas Nashif
*
- * $Id: Ldap.ycp 35269 2007-01-12 11:04:13Z jsuchome $
+ * $Id: Ldap.ycp 35671 2007-01-29 08:53:58Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.15.2/src/Makefile.am new/yast2-ldap-client-2.15.3/src/Makefile.am
--- old/yast2-ldap-client-2.15.2/src/Makefile.am 2006-10-26 15:10:43.000000000 +0200
+++ new/yast2-ldap-client-2.15.3/src/Makefile.am 2007-02-06 10:39:15.000000000 +0100
@@ -24,7 +24,8 @@
module_DATA = \
Ldap.ycp \
- LdapPopup.ycp
+ LdapPopup.ycp \
+ SLPAPI.pm
rnc_DATA = \
ldap_client.rnc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.15.2/src/SLPAPI.pm new/yast2-ldap-client-2.15.3/src/SLPAPI.pm
--- old/yast2-ldap-client-2.15.2/src/SLPAPI.pm 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ldap-client-2.15.3/src/SLPAPI.pm 2007-02-06 10:52:18.000000000 +0100
@@ -0,0 +1,35 @@
+#
+# SLPAPI.pm
+# wrapper for SPL.ycp functions, included in yast2-slp package
+#
+
+package SLPAPI;
+
+use strict;
+use YaST::YCP qw(:LOGGING Boolean sformat);;
+#use YaPI;
+use Data::Dumper;
+
+YaST::YCP::Import ("SLP");
+
+our %TYPEINFO;
+
+use strict;
+#use Errno qw(ENOENT);
+
+
+# Issue the query for services
+# @param pcServiceType The Service Type String, including authority string if
+# any, for the request, such as can be discovered using SLPSrvTypes().
+# This could be, for example "service:printer:lpr" or "service:nfs".
+# @param pcScopeList comma separated list of scope names to search for
+# service types.
+# @return list<map> List of Services
+BEGIN{ $TYPEINFO{FindSrvs} = ["function", ["list", ["map", "string", "any"] ], "string", "string"];}
+sub FindSrvs {
+
+ my ($self, $pcServiceType, $pcScopeList) = @_;
+ return SLP->FindSrvs ($pcServiceType, $pcScopeList);
+}
+
+42
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.15.2/src/ui.ycp new/yast2-ldap-client-2.15.3/src/ui.ycp
--- old/yast2-ldap-client-2.15.2/src/ui.ycp 2007-01-12 12:04:17.000000000 +0100
+++ new/yast2-ldap-client-2.15.3/src/ui.ycp 2007-02-06 11:41:57.000000000 +0100
@@ -25,7 +25,7 @@
import "Popup";
import "Report";
import "Service";
- import "SLP";
+ import "SLPAPI";
import "Stage";
import "Wizard";
@@ -127,7 +127,7 @@
UI::BusyCursor ();
list items = [];
- foreach (map service, SLP::FindSrvs ("service:ldap", ""), {
+ foreach (map service, SLPAPI::FindSrvs ("service:ldap", ""), {
string s = service["pcHost"]:"";
/* TODO take address+port from url
if (service["pcHost"]:"" == "")
@@ -343,7 +343,16 @@
if (result == `slp)
{
- string srv = BrowseServers ();
+ string srv = "";
+ if (!Package::Installed ("yast-slp"))
+ {
+ if (Package::Install ("yast2-slp"))
+ {
+ SCR::RegisterAgent (.slp, `ag_slp(`SlpAgent()));
+ srv = BrowseServers ();
+ }
+ }
+ else srv = BrowseServers ();
if (srv != "")
UI::ChangeWidget (`id(`server), `Value, srv);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.15.2/VERSION new/yast2-ldap-client-2.15.3/VERSION
--- old/yast2-ldap-client-2.15.2/VERSION 2007-01-26 16:21:25.000000000 +0100
+++ new/yast2-ldap-client-2.15.3/VERSION 2007-02-06 12:58:50.000000000 +0100
@@ -1 +1 @@
-2.15.2
+2.15.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org