From a2d8cb4bb9cf8c6c223f1f81b13efe9810eb743a8570f98b8ab15e31a3cc1058 Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Wed, 4 Jan 2012 12:29:06 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=32 --- yast2-ntp-client-2.21.1.tar.bz2 | 3 --- yast2-ntp-client-2.21.2.tar.bz2 | 3 +++ yast2-ntp-client.spec | 32 ++++++++++++++++---------------- 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 yast2-ntp-client-2.21.1.tar.bz2 create mode 100644 yast2-ntp-client-2.21.2.tar.bz2 diff --git a/yast2-ntp-client-2.21.1.tar.bz2 b/yast2-ntp-client-2.21.1.tar.bz2 deleted file mode 100644 index ab125ac..0000000 --- a/yast2-ntp-client-2.21.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:308ac96b8ad65eef01fdd80aa28b714547e14d05e839de25af734a205f85158a -size 129078 diff --git a/yast2-ntp-client-2.21.2.tar.bz2 b/yast2-ntp-client-2.21.2.tar.bz2 new file mode 100644 index 0000000..8ddfb59 --- /dev/null +++ b/yast2-ntp-client-2.21.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fcd3dded17f4f6facdfa2e0ff5f2a3fafc20713a58ea2e7865eaf78429f9d315 +size 129214 diff --git a/yast2-ntp-client.spec b/yast2-ntp-client.spec index cd0d3df..cb0b93e 100644 --- a/yast2-ntp-client.spec +++ b/yast2-ntp-client.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-ntp-client -Version: 2.21.1 +Version: 2.21.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ntp-client-%{version}.tar.bz2 -Prefix: /usr - -Group: System/YaST -License: GPL v2 or later -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 BuildRequires: yast2-country-data +BuildRequires: yast2-devtools +BuildRequires: yast2-testsuite #SLPAPI.pm # Hostname::CurrentDomain # Wizard::SetDesktopTitleAndIcon @@ -40,6 +38,8 @@ Requires: yast2-country-data BuildArch: noarch Summary: YaST2 - NTP Client Configuration +License: GPL-2.0+ +Group: System/YaST %description 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} %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 @@ -81,9 +81,9 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/cfg_ntp.scr /usr/share/YaST2/scrconf/etc_ntp.scr /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 -%doc %{prefix}/share/doc/packages/yast2-ntp-client +%doc %{_prefix}/share/doc/packages/yast2-ntp-client /usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc %changelog From 58da757726b7e6933d282a62cc035705cd93d4f0566e9e9aa6adf0d5a2f933a4 Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Wed, 4 Jan 2012 12:35:23 +0000 Subject: [PATCH 2/3] - bnc#724762 - bad yast2 timezone NTP config OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=33 --- yast2-ntp-client.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yast2-ntp-client.changes b/yast2-ntp-client.changes index e7b65a2..8502506 100644 --- a/yast2-ntp-client.changes +++ b/yast2-ntp-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 From fa075bffe948b6b09c374ffc7fed3ce13dfbd1cb266cfc7533390a2cbe244c2c Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Thu, 5 Jan 2012 07:28:48 +0000 Subject: [PATCH 3/3] - bnc#707408 - Additional NTP server entries for NTP client Configuration OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=34 --- yast2-ntp-client-2.21.2.tar.bz2 | 4 ++-- yast2-ntp-client.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/yast2-ntp-client-2.21.2.tar.bz2 b/yast2-ntp-client-2.21.2.tar.bz2 index 8ddfb59..cdee875 100644 --- a/yast2-ntp-client-2.21.2.tar.bz2 +++ b/yast2-ntp-client-2.21.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcd3dded17f4f6facdfa2e0ff5f2a3fafc20713a58ea2e7865eaf78429f9d315 -size 129214 +oid sha256:fe7fad771c233bfdd76a3f0b505bb6ffe4ad60cd54dd469228efc49d74c419f0 +size 129358 diff --git a/yast2-ntp-client.changes b/yast2-ntp-client.changes index 8502506..0621f3c 100644 --- a/yast2-ntp-client.changes +++ b/yast2-ntp-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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