Hello community,
here is the log from the commit of package yast2-dhcp-server for openSUSE:Factory checked in at 2012-03-30 14:20:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-dhcp-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dhcp-server", Maintainer is "jsrain@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-dhcp-server/yast2-dhcp-server.changes 2011-10-04 18:00:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new/yast2-dhcp-server.changes 2012-03-30 14:20:59.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Mar 29 14:28:18 CEST 2012 - jsuchome@suse.cz
+
+- merged proofed texts
+- confirmed license
+- 2.22.0
+
+-------------------------------------------------------------------
Old:
----
yast2-dhcp-server-2.21.2.tar.bz2
New:
----
yast2-dhcp-server-2.22.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dhcp-server.spec ++++++
--- /var/tmp/diff_new_pack.uqr0P7/_old 2012-03-30 14:21:00.000000000 +0200
+++ /var/tmp/diff_new_pack.uqr0P7/_new 2012-03-30 14:21:00.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-dhcp-server
#
-# 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,23 +15,36 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: yast2-dhcp-server
-Version: 2.21.2
+Version: 2.22.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-dhcp-server-2.21.2.tar.bz2
-
-Prefix: /usr
+Source0: yast2-dhcp-server-%{version}.tar.bz2
-Group: System/YaST
-License: GPL-2.0+
-BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1 perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-perl-bindings yast2-testsuite
-
-Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent
+BuildRequires: docbook-xsl-stylesheets
+BuildRequires: doxygen
+BuildRequires: libxslt
+BuildRequires: perl-Digest-SHA1
+BuildRequires: perl-X500-DN
+BuildRequires: perl-XML-Writer
+BuildRequires: popt-devel
+BuildRequires: sgml-skel
+BuildRequires: update-desktop-files
+BuildRequires: yast2
+BuildRequires: yast2-devtools
+BuildRequires: yast2-dns-server
+BuildRequires: yast2-perl-bindings
+BuildRequires: yast2-testsuite
+
+Requires: bind-utils
+Requires: perl-Digest-SHA1
+Requires: perl-Parse-RecDescent
+Requires: perl-X500-DN
+Requires: perl-gettext
+Requires: yast2-ldap
+Requires: yast2-perl-bindings
# Address::CheckMAC && Address::ValidMAC (2.13.73)
# Punycode
# Wizard::SetDesktopTitleAndIcon
@@ -42,32 +55,33 @@
BuildArch: noarch
Summary: YaST2 - DHCP Server Configuration
+License: GPL-2.0
+Group: System/YaST
%description
This package contains the YaST2 component for DHCP server
configuration.
%prep
-%setup -n yast2-dhcp-server-2.21.2
+%setup -n yast2-dhcp-server-%{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
@@ -82,11 +96,11 @@
/usr/share/YaST2/clients/dhcp-server.ycp
/usr/share/YaST2/clients/dhcp-server_*.ycp
/usr/share/YaST2/modules/*
-%{prefix}/share/applications/YaST2/dhcp-server.desktop
+%{_prefix}/share/applications/YaST2/dhcp-server.desktop
/usr/share/YaST2/scrconf/cfg_dhcpd.scr
/usr/share/YaST2/scrconf/etc_dhcpd_conf.scr
/usr/lib/YaST2/servers_non_y2/ag_dhcpd_conf
-%doc %{prefix}/share/doc/packages/yast2-dhcp-server
+%doc %{_prefix}/share/doc/packages/yast2-dhcp-server
/usr/share/YaST2/schema/autoyast/rnc/dhcp-server.rnc
%changelog
++++++ yast2-dhcp-server-2.21.2.tar.bz2 -> yast2-dhcp-server-2.22.0.tar.bz2 ++++++
++++ 5097 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-dhcp-server-2.21.2/Makefile.am new/yast2-dhcp-server-2.22.0/Makefile.am
--- old/yast2-dhcp-server-2.21.2/Makefile.am 2011-09-26 13:09:45.000000000 +0200
+++ new/yast2-dhcp-server-2.22.0/Makefile.am 2012-03-29 14:29:53.000000000 +0200
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
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)
COPYRIGHT_files_gpl = README COPYING
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
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-dhcp-server-2.21.2/VERSION new/yast2-dhcp-server-2.22.0/VERSION
--- old/yast2-dhcp-server-2.21.2/VERSION 2011-09-26 13:11:33.000000000 +0200
+++ new/yast2-dhcp-server-2.22.0/VERSION 2012-03-29 14:28:36.000000000 +0200
@@ -1 +1 @@
-2.21.2
+2.22.0
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-dhcp-server-2.21.2/configure.in new/yast2-dhcp-server-2.22.0/configure.in
--- old/yast2-dhcp-server-2.21.2/configure.in 2011-09-26 13:09:45.000000000 +0200
+++ new/yast2-dhcp-server-2.22.0/configure.in 2012-03-29 14:29:53.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-dhcp-server
dnl
-dnl -- This file is generated by y2autoconf 2.21.0 - 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-dhcp-server, 2.21.1, http://bugs.opensuse.org/, yast2-dhcp-server)
+AC_INIT(yast2-dhcp-server, 2.22.0, http://bugs.opensuse.org/, yast2-dhcp-server)
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-dhcp-server"
MAINTAINER="YaST2 Maintainers "
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-dhcp-server-2.21.2/src/dialogs2.ycp new/yast2-dhcp-server-2.22.0/src/dialogs2.ycp
--- old/yast2-dhcp-server-2.21.2/src/dialogs2.ycp 2011-09-26 13:08:49.000000000 +0200
+++ new/yast2-dhcp-server-2.22.0/src/dialogs2.ycp 2012-03-29 14:28:13.000000000 +0200
@@ -274,7 +274,7 @@
if (size(configured_interfaces) <= 0) {
// TRANSLATORS: popup error, DHCP Server requires selected interface to have
// at least minimal configuration
- return Popup::ContinueCancel(_("The selected network interface has currently no configuration (no assigned IP address
+ return Popup::ContinueCancel(_("The selected network interface is not configured (no assigned IP address
and netmask). Using it in the DHCP server configuration may not work.
Really use this interface?
"));
@@ -1663,9 +1663,9 @@
UI::SetFocus(`id("other_opts"));
correct = (Popup::ContinueCancel(sformat(_("You have specified an alternate configuration file for the DHCP server.
-This is not supported by YaST, as the DHCP server module can only read and write
-/etc/dhcpd.conf. The new configuration from %1 will not be imported and all changes
-will be saved to the default configuration file.
+YaST does not supported this. The DHCP server module can only read and write
+/etc/dhcpd.conf. The new configuration from %1 will not be imported. All
+changes will be saved to the default configuration file.
Really continue?
"), v)));
@@ -1880,7 +1880,7 @@
],
"other_options" : $[
"widget" : `custom,
- "custom_widget" : `TextEntry (`id("other_opts"), _("DHCP Server Start-Up Arguments")),
+ "custom_widget" : `TextEntry (`id("other_opts"), _("DHCP Server Start-up Arguments")),
"init" : OtherOptionsInit,
"validate_type" : `function,
"validate_function" : OtherOptionsValidate,
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-dhcp-server-2.21.2/src/dns-helps.ycp new/yast2-dhcp-server-2.22.0/src/dns-helps.ycp
--- old/yast2-dhcp-server-2.21.2/src/dns-helps.ycp 2011-09-26 13:08:49.000000000 +0200
+++ new/yast2-dhcp-server-2.22.0/src/dns-helps.ycp 2012-03-29 14:28:13.000000000 +0200
@@ -19,7 +19,7 @@
<b>First IP Address</b> defines
the starting address of the range and <b>Last IP Address</b> defines
the last one. <b>Hostname Base</b> is a string that determines how hostnames
-should be created (such as <tt>dhcp-%i</tt> or <tt>e25-%i-a</tt>).
+are created (such as <tt>dhcp-%i</tt> or <tt>e25-%i-a</tt>).
<tt>%i</tt> is replaced with the number of the host in the range.
If no <tt>%i</tt> is defined, the number is added at the end of the
string. <tt>%i</tt> can be used only once in <b>Hostname Base</b>.
@@ -30,15 +30,16 @@
map DNS_HELPS = $[
// TRANSLATORS: DNS Wizard - step 1 (part 1)
"wizard-zones" : _("<p><b><big>DNS Wizard</big></b><br />
-This wizard helps you create a new DNS zone
+In this wizard, create a new DNS zone
directly from the DHCP server configuration. This DNS zone is important
-if you also want to identify your DHCP clients by hostname. The DNS zone
-translates names to the IP addresses assigned to them. You can also
-create a reverse zone that translates IP addresses to names.</p>\n") +
+if you want to identify your DHCP clients by hostname. The DNS zone
+translates names to the assigned IP addresses. You can also
+create a reverse zone that translates IP addresses to names.</p>
+") +
// TRANSLATORS: DNS Wizard - step 1 (part 2)
_("<p><b>New Zone Name</b> or <b>Reverse Zone Name</b>
-are taken from your current DHCP server and network settings and, therefore, cannot be changed.</p>
+are taken from your current DHCP server and network settings and cannot be changed.</p>
") +
// TRANSLATORS: DNS Wizard - step 1 (part 3)
@@ -54,12 +55,12 @@
// TRANSLATORS: DNS Wizard - step 2 (part 2)
_("<p><b><big>DNS Queries</big></b><br />
-Every DNS query that must find out, for example, an IP address for a
-hostname in a DNS zone, first asks the parent zone
+Every DNS query (for example searching an IP address for a
+hostname in a DNS zone) first asks the parent zone
(<tt>com</tt> for <tt>example.com</tt>) for the current zone
-name servers, and then sends a DNS query to these name servers to get
-a reply containing the desired IP address.<br />
-This is why you should mention the current DNS server hostname as one of
+name servers. Then it sends a DNS query to these name servers requesting
+the desired IP address.<br />
+Therefore, always specify the current DNS server hostname as one of
the zone name servers.</p>
") +
@@ -77,10 +78,10 @@
// TRANSLATORS: DNS Wizard - step 3 (part 1)
"wizard-ranges" : _("<p><b><big>DNS Records</big></b><br />
-Here, define DNS hostnames for all DHCP clients. You do not need to define
-all hostnames one by one. Only set one or more simple rules for how
+Define DNS hostnames for all DHCP clients. You do not need to define
+all hostnames one by one. Set simple rules for how
the hostnames are created. These rules define the ranges of IP addresses to use
-and the string that is used to generate hostnames for a range.</p>
+and the string from which hostnames are generated for a range.</p>
") +
// TRANSLATORS: DNS Wizard - step 3 (part 2)
@@ -125,7 +126,7 @@
// TRANSLATORS: DNS for Experts (editing current settings) (part 2)
_("<b>Current Subnet</b> and <b>Netmask</b> show the current network settings.
<b>Domain</b> is taken from the current DHCP configuration.
-<b>First IP Address</b> and <b>Second ID Address</b> match the current
+<b>First IP Address</b> and <b>Second IP Address</b> match the current
Dynamic DHCP range.</p>
") +
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-dhcp-server-2.21.2/src/dns-server-dialogs.ycp new/yast2-dhcp-server-2.22.0/src/dns-server-dialogs.ycp
--- old/yast2-dhcp-server-2.21.2/src/dns-server-dialogs.ycp 2011-09-26 13:08:49.000000000 +0200
+++ new/yast2-dhcp-server-2.22.0/src/dns-server-dialogs.ycp 2012-03-29 14:28:13.000000000 +0200
@@ -158,7 +158,7 @@
if (last_ip_mask != network_bits) {
Report::Error (
sformat (_("IP address %1 does not match
-the current network %2/%3
+the current network %2/%3.
"),
last_ip, current_d_settings["network"]:"", current_d_settings["netmask"]:""
));
@@ -190,7 +190,8 @@
Report::Error (sformat (
// TRANSLATORS: popup error, %1 an IP address
// %2 is the first IP address of the range, %3 is the last one
- _("The IP address %1 is out of the current
+ _("The IP address %1 is
+outside the current
dynamic DHCP range %2-%3.
"),
first_ip, current_d_settings["from_ip"]:"", current_d_settings["to_ip"]:""
@@ -204,7 +205,7 @@
// TRANSLATORS: popup error, %1 an IP address
// %2 is the first IP address of the range, %3 is the last one
_("The IP address %1 is
-out of the current
+outside the current
dynamic DHCP range %2-%3.
"),
last_ip, current_d_settings["from_ip"]:"", current_d_settings["to_ip"]:""
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-dhcp-server-2.21.2/src/dns-server-management.ycp new/yast2-dhcp-server-2.22.0/src/dns-server-management.ycp
--- old/yast2-dhcp-server-2.21.2/src/dns-server-management.ycp 2011-09-26 13:12:18.000000000 +0200
+++ new/yast2-dhcp-server-2.22.0/src/dns-server-management.ycp 2012-03-29 14:28:13.000000000 +0200
@@ -737,7 +737,7 @@
}
// TRANSLATORS: popup question - canceling dns synchronization with dhcp
- if (Popup::YesNo(_("If you cancel, all changes made in the DNS server will be lost.
+ if (Popup::YesNo(_("If you cancel, all changes made to the DNS server will be lost.
Really cancel this operation?
"))) {
// Changes currently made will be reverted
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-dhcp-server-2.21.2/src/dns-server-wizard.ycp new/yast2-dhcp-server-2.22.0/src/dns-server-wizard.ycp
--- old/yast2-dhcp-server-2.21.2/src/dns-server-wizard.ycp 2011-09-26 13:12:18.000000000 +0200
+++ new/yast2-dhcp-server-2.22.0/src/dns-server-wizard.ycp 2012-03-29 14:28:13.000000000 +0200
@@ -195,8 +195,7 @@
UI::SetFocus (`id("ip"));
// TRANSLATORS: popup question
if (! Popup::YesNo(_("No IP address has been provided for a name server in the current DNS zone.
-This might not work because each zone needs its name server name and IP
-defined.
+This may not work because each zone needs the name and IP of its name server defined.
Really use the current settings?
"))) continue;
}
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-dhcp-server-2.21.2/src/helps.ycp new/yast2-dhcp-server-2.22.0/src/helps.ycp
--- old/yast2-dhcp-server-2.21.2/src/helps.ycp 2011-09-26 13:08:49.000000000 +0200
+++ new/yast2-dhcp-server-2.22.0/src/helps.ycp 2012-03-29 14:28:13.000000000 +0200
@@ -181,16 +181,16 @@
// Wizard Installation - Step 3 1/4
"dynamic_dhcp" :_("<p><b><big>Subnet Information</big></b></br>
-Here you can view the information about the current subnet, such as its address,
-netmask and minimum and maximum IP addresses available for the clients.
+View information about the current subnet, such as its address,
+netmask, minimum and maximum IP addresses available for the clients.
</p>
") +
// Wizard Installation - Step 3 2/4
_("<p><b><big>IP Address Range</big></b><br>
Set the <b>First IP Address</b> and the <b>Last IP Address</b>
-to lease to the clients. These addresses must have the same netmask.
-For instance, <tt>192.168.1.1</tt> and <tt>192.168.1.64</tt>. Check <b>
+of the address range to be leased to clients. These addresses must have the same netmask.
+For instance, <tt>192.168.1.1</tt> and <tt>192.168.1.64</tt>. Check the <b>
Allow Dynamic BOOTP</b> flag if the specified range may be dynamically
assigned to BOOTP clients as well as DHCP clients</p>.
") +
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org