Hello community, here is the log from the commit of package yast2-autofs for openSUSE:Factory checked in at 2012-03-30 14:20:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-autofs (Old) and /work/SRC/openSUSE:Factory/.yast2-autofs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-autofs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-autofs/yast2-autofs.changes 2011-10-04 17:04:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-autofs.new/yast2-autofs.changes 2012-03-30 14:20:56.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 29 13:51:43 CEST 2012 - [email protected] + +- merged proofread texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Old: ---- yast2-autofs-2.21.1.tar.bz2 New: ---- yast2-autofs-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-autofs.spec ++++++ --- /var/tmp/diff_new_pack.jxowFN/_old 2012-03-30 14:20:57.000000000 +0200 +++ /var/tmp/diff_new_pack.jxowFN/_new 2012-03-30 14:20:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-autofs # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,27 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-autofs -Version: 2.21.1 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-autofs-%{version}.tar.bz2 -Prefix: /usr - -Group: System/YaST -License: GPL-2.0+ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools +BuildRequires: yast2-testsuite BuildArch: noarch Summary: YaST2 - Module to Create and Manage autofs Entries in LDAP +License: GPL-2.0 +Group: System/YaST %description This makes possible to create and manage autofs entries in an LDAP @@ -47,23 +47,22 @@ %setup -n yast2-autofs-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # 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" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -78,7 +77,7 @@ /usr/share/YaST2/clients/autofs.ycp #/usr/share/YaST2/clients/autofs_*.ycp /usr/share/YaST2/modules/Autofs* -%{prefix}/share/applications/YaST2/autofs.desktop -%doc %{prefix}/share/doc/packages/yast2-autofs +%{_prefix}/share/applications/YaST2/autofs.desktop +%doc %{_prefix}/share/doc/packages/yast2-autofs %changelog ++++++ yast2-autofs-2.21.1.tar.bz2 -> yast2-autofs-2.22.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-autofs-2.21.1/VERSION new/yast2-autofs-2.22.0/VERSION --- old/yast2-autofs-2.21.1/VERSION 2011-09-29 09:57:31.000000000 +0200 +++ new/yast2-autofs-2.22.0/VERSION 2012-03-29 13:52:40.000000000 +0200 @@ -1 +1 @@ -2.21.1 +2.22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-autofs-2.21.1/configure new/yast2-autofs-2.22.0/configure --- old/yast2-autofs-2.21.1/configure 2011-09-29 10:01:06.000000000 +0200 +++ new/yast2-autofs-2.22.0/configure 2012-03-29 13:52:45.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-autofs 2.21.1. +# Generated by GNU Autoconf 2.68 for yast2-autofs 2.22.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-autofs' PACKAGE_TARNAME='yast2-autofs' -PACKAGE_VERSION='2.21.1' -PACKAGE_STRING='yast2-autofs 2.21.1' +PACKAGE_VERSION='2.22.0' +PACKAGE_STRING='yast2-autofs 2.22.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,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-autofs 2.21.1 to adapt to many kinds of systems. +\`configure' configures yast2-autofs 2.22.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-autofs 2.21.1:";; + short | recursive ) echo "Configuration of yast2-autofs 2.22.0:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-autofs configure 2.21.1 +yast2-autofs configure 2.22.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,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-autofs $as_me 2.21.1, which was +It was created by yast2-autofs $as_me 2.22.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-autofs' - VERSION='2.21.1' + VERSION='2.22.0' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.1" +VERSION="2.22.0" RPMNAME="yast2-autofs" MAINTAINER="Peter Varkoly <[email protected]>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-autofs $as_me 2.21.1, which was +This file was extended by yast2-autofs $as_me 2.22.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-autofs config.status 2.21.1 +yast2-autofs config.status 2.22.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-autofs-2.21.1/configure.in new/yast2-autofs-2.22.0/configure.in --- old/yast2-autofs-2.21.1/configure.in 2011-09-29 10:01:04.000000000 +0200 +++ new/yast2-autofs-2.22.0/configure.in 2012-03-29 13:52:43.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-autofs dnl -dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-autofs, 2.21.1, http://bugs.opensuse.org/, yast2-autofs) +AC_INIT(yast2-autofs, 2.22.0, http://bugs.opensuse.org/, yast2-autofs) 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.21.1" +VERSION="2.22.0" RPMNAME="yast2-autofs" MAINTAINER="Peter Varkoly <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-autofs-2.21.1/src/Autofs.pm new/yast2-autofs-2.22.0/src/Autofs.pm --- old/yast2-autofs-2.21.1/src/Autofs.pm 2011-09-29 09:56:45.000000000 +0200 +++ new/yast2-autofs-2.22.0/src/Autofs.pm 2012-03-29 13:51:28.000000000 +0200 @@ -210,7 +210,7 @@ y2milestone("------LDAP_CLIENT_NOT_CONFIGURED------"); return YaPI->SetError( summary => __("You must configure LDAP to use the autofs module."). "\n". - __("You can do it by using the YaST ldap module."), + __("Use the YaST LDAP module."), code => "LDAP_CLIENT_NOT_CONFIGURED" ); } $LDAPServer = $ldapMap->{ldap_server}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-autofs-2.21.1/src/helps.ycp new/yast2-autofs-2.22.0/src/helps.ycp --- old/yast2-autofs-2.21.1/src/helps.ycp 2011-09-29 09:56:45.000000000 +0200 +++ new/yast2-autofs-2.22.0/src/helps.ycp 2012-03-29 13:51:28.000000000 +0200 @@ -38,7 +38,7 @@ /* Read dialog help 1/2 */ "read" : _("<p><b>Initializing autofs configuration</b><br> -Please wait...<br></p> +</p> ") + /* Read dialog help 2/2 */ @@ -48,7 +48,7 @@ /* Write dialog help 1/2 */ "write" : _("<p><b>Saving autofs configuration</b><br> -Please wait...<br></p> +</p> ") + /* Write dialog help 2/2 */ @@ -103,18 +103,19 @@ /* EntryDialog for Other entry */ "EntryDialogOther" : _("<p><b><big>Other Entry</big></b><br/> -The options are comma separated, as customary for the <b>mount</b>(8) command.<br/> +The options are comma-separated, which is customary for the <b>mount</b>(8) command.<br/> The location specifies from where the file system is to be mounted. -Please consult the <b>autofs</b>(5) manual page for more information. -<br/></p>\n"), +Consult the <b>autofs</b>(5) manual page for more information. +<br/></p> +"), /* GetLDAPServer dialog if the ldapserver is localhost */ - "GetLDAPServer" : _("<p><b><big>Warning</big></b><br> -In your system <b>localhost</b> is configured as the LDAP server. -However, the clients cannot reach the <b>localhost</b> and therefore, it cannot be the LDAP server for autofs. -Please insert an IP address or DNS name for the LDAP server that is suitable for the clients, or choose the suggested hostname of your server -and press <b>Ok</b>. -<br></p>"), + "GetLDAPServer" : _("<p><b><big>Warning</big></b><br> In your system <b>localhost</b> is configured +as the LDAP server. Since clients cannot reach <b>localhost</b>, it +cannot act as LDAP server for autofs. Specify an IP address or DNS name of a +suitable LDAP server or choose the suggested hostname of your server and press +<b>Ok</b>. <br></p> +"), ]; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
