Hello community,
here is the log from the commit of package yast2-nis-client
checked in at Tue Aug 22 14:25:32 CEST 2006.
--------
--- yast2-nis-client/yast2-nis-client.changes 2006-05-11 16:55:15.000000000 +0200
+++ yast2-nis-client/yast2-nis-client.changes 2006-08-22 09:49:43.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Aug 22 09:32:35 CEST 2006 - jsuchome@suse.cz
+
+- behave as DHCP supports NIS when NetworkManager is enabled (#186179)
+- 2.13.5
+
+-------------------------------------------------------------------
Old:
----
yast2-nis-client-2.13.4.tar.bz2
New:
----
yast2-nis-client-2.13.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nis-client.spec ++++++
--- /var/tmp/diff_new_pack.Wo9kmn/_old 2006-08-22 14:25:26.000000000 +0200
+++ /var/tmp/diff_new_pack.Wo9kmn/_new 2006-08-22 14:25:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-nis-client (Version 2.13.4)
+# spec file for package yast2-nis-client (Version 2.13.5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-nis-client
-Version: 2.13.4
+Version: 2.13.5
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-nis-client-2.13.4.tar.bz2
+Source0: yast2-nis-client-2.13.5.tar.bz2
prefix: /usr
BuildRequires: doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-pam yast2-testsuite
Requires: yast2 yast2-pam
@@ -42,7 +42,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-nis-client-2.13.4
+%setup -n yast2-nis-client-2.13.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,9 @@
%doc %{prefix}/share/doc/packages/yast2-nis-client
%changelog -n yast2-nis-client
+* Tue Aug 22 2006 - jsuchome@suse.cz
+- behave as DHCP supports NIS when NetworkManager is enabled (#186179)
+- 2.13.5
* Thu May 11 2006 - jsuchome@suse.cz
- do not show message that DHCP doesn't support NIS when using
NetworkManager (#152262)
++++++ yast2-nis-client-2.13.4.tar.bz2 -> yast2-nis-client-2.13.5.tar.bz2 ++++++
++++ 25976 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-nis-client-2.13.4/Makefile.am new/yast2-nis-client-2.13.5/Makefile.am
--- old/yast2-nis-client-2.13.4/Makefile.am 2005-09-09 09:37:32.000000000 +0200
+++ new/yast2-nis-client-2.13.5/Makefile.am 2006-08-21 14:00:49.000000000 +0200
@@ -6,7 +6,9 @@
# (Edit ./SUBDIRS instead)
#
-PREFIX = /usr
+#where devtools are
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -30,6 +32,10 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
AUTOMAKE_OPTIONS = foreign dist-bzip2
+# where devtools instal m4 snippets
+# argh, executed literally
+#ACLOCAL_AMFLAGS = -I $(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
cmp -s $< $@ || cp -f $< $@
@@ -57,12 +63,8 @@
# info '(automake)Conditionals'
if CREATE_PKGCONFIG
-# pkg-config
-# if a package does not have its own pc, copy the generic one
-$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in
- test -f $@ || cp -p $< $@
# create the file here instead of by configure
-# because the prerequisite is made here
+# 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
@@ -94,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -115,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -142,20 +144,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 \
@@ -198,10 +200,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-nis-client-2.13.4/Makefile.am.common new/yast2-nis-client-2.13.5/Makefile.am.common
--- old/yast2-nis-client-2.13.4/Makefile.am.common 2005-09-09 09:37:32.000000000 +0200
+++ new/yast2-nis-client-2.13.5/Makefile.am.common 2006-08-21 14:00:49.000000000 +0200
@@ -9,7 +9,7 @@
# suffix mapping: info '(make)Static Usage'
# apply only to our modules, not external ones
${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $<
+ Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $<
# files to clean
CLEANFILES = ${ybcfiles}
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-nis-client-2.13.4/VERSION new/yast2-nis-client-2.13.5/VERSION
--- old/yast2-nis-client-2.13.4/VERSION 2006-05-11 16:32:24.000000000 +0200
+++ new/yast2-nis-client-2.13.5/VERSION 2006-08-22 09:33:44.000000000 +0200
@@ -1 +1 @@
-2.13.4
+2.13.5
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-nis-client-2.13.4/configure.in new/yast2-nis-client-2.13.5/configure.in
--- old/yast2-nis-client-2.13.4/configure.in 2005-09-09 09:37:32.000000000 +0200
+++ new/yast2-nis-client-2.13.5/configure.in 2006-08-21 14:00:49.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-nis-client
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-nis-client, 2.12.2, http://www.suse.de/feedback, yast2-nis-client)
+AC_INIT(yast2-nis-client, 2.13.4, http://bugs.opensuse.org/, yast2-nis-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.12.2"
+VERSION="2.13.4"
RPMNAME="yast2-nis-client"
MAINTAINER="Jiri Suchomel "
@@ -111,8 +111,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
-devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools`
-devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools`
+devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
+devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
dnl producing pkg-config for others?
AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)
@@ -139,6 +139,10 @@
if test "$YCPMAKEDEP" = "false"; then
AC_MSG_ERROR([ycpmakedep is not installed])
fi
+AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
+if test "$YCPC" = "false"; then
+ AC_MSG_ERROR([ycpc is not installed])
+fi
AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir)
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-nis-client-2.13.4/src/ui.ycp new/yast2-nis-client-2.13.5/src/ui.ycp
--- old/yast2-nis-client-2.13.4/src/ui.ycp 2006-05-11 16:32:21.000000000 +0200
+++ new/yast2-nis-client-2.13.5/src/ui.ycp 2006-08-22 09:36:26.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner
*
- * $Id: ui.ycp 29401 2006-03-27 08:33:59Z jsuchome $
+ * $Id: ui.ycp 30874 2006-05-11 15:01:43Z jsuchome $
*
* All user interface functions.
*
@@ -222,7 +222,7 @@
- boolean dhcp_wanted = Nis::dhcp_wanted;
+ boolean dhcp_wanted = Nis::dhcp_wanted || NetworkService::IsManaged ();
string domain = Nis::GetDomain ();
string servers = Nis::GetServers ();
@@ -260,14 +260,20 @@
y2debug("all_servers: %1", all_servers);
y2debug("additional_domains: %1", additional_domains);
+ string automatic_label = NetworkService::IsManaged () ?
+ // radio button label
+ _("Au&tomatic Setup (via NetworkManager and DHCP)") :
+ // radio button label
+ _("Au&tomatic Setup (via DHCP)");
+
term con = nil;
// frame label
term nis_frame = `Frame (_("NIS client"),
`VBox (
`VSpacing (0.2),
`RadioButtonGroup (`id (`dhcpg), `VBox (
- // radio button label
- `Left (`RadioButton (`id (`dhcpyes), `opt (`notify), _("Au&tomatic Setup (via DHCP)"), dhcp_wanted)),
+ `Left (`RadioButton (`id (`dhcpyes), `opt (`notify),
+ automatic_label, dhcp_wanted)),
// radio button label
`Left (`RadioButton (`id (`dhcpno), `opt (`notify), _("&Static Setup"), !dhcp_wanted))
)),
@@ -295,6 +301,7 @@
`HSpacing(1.2),
`VBox(
`Label(""),
+ // button label
`PushButton (`id (`edit), _("&Edit"))
)
),
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org