Accepting request 98825 from YaST:Head

- bnc#707408 - Additional NTP server entries for NTP client Configuration 

- bnc#724762 - bad yast2 timezone NTP config

OBS-URL: https://build.opensuse.org/request/show/98825
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-ntp-client?expand=0&rev=57
This commit is contained in:
Stephan Kulow 2012-01-05 12:50:31 +00:00 committed by Git OBS Bridge
commit 748ddff5af
4 changed files with 29 additions and 19 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:308ac96b8ad65eef01fdd80aa28b714547e14d05e839de25af734a205f85158a
size 129078

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fe7fad771c233bfdd76a3f0b505bb6ffe4ad60cd54dd469228efc49d74c419f0
size 129358

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Jan 5 07:26:54 UTC 2012 - varkoly@suse.com
- bnc#707408 - Additional NTP server entries for NTP client Configuration
-------------------------------------------------------------------
Wed Jan 4 12:33:27 UTC 2012 - varkoly@suse.com
- bnc#724762 - bad yast2 timezone NTP config
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 29 13:17:51 CEST 2011 - visnov@suse.cz Thu Sep 29 13:17:51 CEST 2011 - visnov@suse.cz

View File

@ -1,7 +1,7 @@
# #
# spec file for package yast2-ntp-client # spec file for package yast2-ntp-client
# #
# 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,22 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: yast2-ntp-client Name: yast2-ntp-client
Version: 2.21.1 Version: 2.21.2
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-ntp-client-%{version}.tar.bz2 Source0: yast2-ntp-client-%{version}.tar.bz2
Prefix: /usr BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
Group: System/YaST BuildRequires: yast2
License: GPL-2.0+
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
BuildRequires: yast2-country-data BuildRequires: yast2-country-data
BuildRequires: yast2-devtools
BuildRequires: yast2-testsuite
#SLPAPI.pm #SLPAPI.pm
# Hostname::CurrentDomain # Hostname::CurrentDomain
# Wizard::SetDesktopTitleAndIcon # Wizard::SetDesktopTitleAndIcon
@ -40,6 +38,8 @@ Requires: yast2-country-data
BuildArch: noarch BuildArch: noarch
Summary: YaST2 - NTP Client Configuration Summary: YaST2 - NTP Client Configuration
License: GPL-2.0+
Group: System/YaST
%description %description
This package contains the YaST2 component for NTP client configuration. This package contains the YaST2 component for NTP client configuration.
@ -48,23 +48,23 @@ This package contains the YaST2 component for NTP client configuration.
%setup -n yast2-ntp-client-%{version} %setup -n yast2-ntp-client-%{version}
%build %build
%{prefix}/bin/y2tool y2autoconf %{_prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake %{_prefix}/bin/y2tool y2automake
autoreconf --force --install autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}} %{?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) # V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works # so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1 make %{?jobs:-j%jobs} V=1
%install %install
make install DESTDIR="$RPM_BUILD_ROOT" 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" [ -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 for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
d=${f##*/} d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done done
@ -81,9 +81,9 @@ rm -rf "$RPM_BUILD_ROOT"
/usr/share/YaST2/scrconf/cfg_ntp.scr /usr/share/YaST2/scrconf/cfg_ntp.scr
/usr/share/YaST2/scrconf/etc_ntp.scr /usr/share/YaST2/scrconf/etc_ntp.scr
/usr/share/YaST2/modules/*.y* /usr/share/YaST2/modules/*.y*
%{prefix}/share/applications/YaST2/ntp-client.desktop %{_prefix}/share/applications/YaST2/ntp-client.desktop
/usr/share/YaST2/data/ntp_servers.ycp /usr/share/YaST2/data/ntp_servers.ycp
%doc %{prefix}/share/doc/packages/yast2-ntp-client %doc %{_prefix}/share/doc/packages/yast2-ntp-client
/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc /usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
%changelog %changelog