From 4d8c3dc4daf82d5071c4ac20a0c8bc7f638407560c246077c8605bf709c322d6 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Thu, 1 Aug 2013 07:29:56 +0000
Subject: [PATCH 1/8] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=143
---
 yast2-ntp-client-3.0.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-ntp-client-3.0.0.tar.bz2 b/yast2-ntp-client-3.0.0.tar.bz2
index 3bc46cb..b21abc5 100644
--- a/yast2-ntp-client-3.0.0.tar.bz2
+++ b/yast2-ntp-client-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8aad33adf46f54848af96cb5e86747351aeec40f970736c8415fb0a26b476369
-size 130894
+oid sha256:2466cb079c6c1327480f41a9c994317a6c0f4e028850b4438b8234205426c953
+size 130927

From 5140559693cf8ab4779f713cf019b284694a1fcf2e4ac631232be6d54771cde6 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Fri, 2 Aug 2013 16:01:06 +0000
Subject: [PATCH 2/8] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=144
---
 yast2-ntp-client-3.0.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-ntp-client-3.0.0.tar.bz2 b/yast2-ntp-client-3.0.0.tar.bz2
index b21abc5..a51c6a0 100644
--- a/yast2-ntp-client-3.0.0.tar.bz2
+++ b/yast2-ntp-client-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2466cb079c6c1327480f41a9c994317a6c0f4e028850b4438b8234205426c953
-size 130927
+oid sha256:31f4ecbb75b11d80d82cde090a26e6979b1d816f470a4c6560896089094e8115
+size 131074

From e05ad492f5a507d67b792f60dba6db4e5d91708032bff5db7d62cacce000741e Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Wed, 7 Aug 2013 16:19:31 +0000
Subject: [PATCH 3/8] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=145
---
 yast2-ntp-client-3.0.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-ntp-client-3.0.0.tar.bz2 b/yast2-ntp-client-3.0.0.tar.bz2
index a51c6a0..d5c5da4 100644
--- a/yast2-ntp-client-3.0.0.tar.bz2
+++ b/yast2-ntp-client-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31f4ecbb75b11d80d82cde090a26e6979b1d816f470a4c6560896089094e8115
-size 131074
+oid sha256:2b1f54647f66da15561d826f5111cec54ba2cace2576b2576f30bbbdeb078f3f
+size 131073

From 978391018844721de840dcc9bd83dc3d470feb9f119bd64da1e06d76e22d97cf Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Tue, 13 Aug 2013 09:10:02 +0000
Subject: [PATCH 4/8] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=146
---
 yast2-ntp-client-3.0.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-ntp-client-3.0.0.tar.bz2 b/yast2-ntp-client-3.0.0.tar.bz2
index d5c5da4..66e17c8 100644
--- a/yast2-ntp-client-3.0.0.tar.bz2
+++ b/yast2-ntp-client-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b1f54647f66da15561d826f5111cec54ba2cace2576b2576f30bbbdeb078f3f
-size 131073
+oid sha256:5ea90b000fd2c9fa93e3016b6179a2d6761ac9688451c27ffde664d1cd3ef362
+size 131352

From 49a3dac7a5cce29dbc70ea2acd203852e1481ec0e25a30b844ebd57c66fea1cd Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Tue, 13 Aug 2013 14:10:33 +0000
Subject: [PATCH 5/8] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=147
---
 yast2-ntp-client-3.0.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-ntp-client-3.0.0.tar.bz2 b/yast2-ntp-client-3.0.0.tar.bz2
index 66e17c8..c84c0ee 100644
--- a/yast2-ntp-client-3.0.0.tar.bz2
+++ b/yast2-ntp-client-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ea90b000fd2c9fa93e3016b6179a2d6761ac9688451c27ffde664d1cd3ef362
-size 131352
+oid sha256:89c9a8eb325f572c52ae87cfda8810313432992a755ab16bbf836605b281997b
+size 131318

From 304a696ede136320a56e12541ed5adf94de84e1704d2a93c75d1f574c1ce6575 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Thu, 15 Aug 2013 09:22:15 +0000
Subject: [PATCH 6/8] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=148
---
 yast2-ntp-client-3.0.0.tar.bz2 |  3 ---
 yast2-ntp-client-3.0.1.tar.bz2 |  3 +++
 yast2-ntp-client.changes       | 12 ++++++++++++
 yast2-ntp-client.spec          | 24 +++++++++++++++++++++---
 4 files changed, 36 insertions(+), 6 deletions(-)
 delete mode 100644 yast2-ntp-client-3.0.0.tar.bz2
 create mode 100644 yast2-ntp-client-3.0.1.tar.bz2

diff --git a/yast2-ntp-client-3.0.0.tar.bz2 b/yast2-ntp-client-3.0.0.tar.bz2
deleted file mode 100644
index c84c0ee..0000000
--- a/yast2-ntp-client-3.0.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89c9a8eb325f572c52ae87cfda8810313432992a755ab16bbf836605b281997b
-size 131318
diff --git a/yast2-ntp-client-3.0.1.tar.bz2 b/yast2-ntp-client-3.0.1.tar.bz2
new file mode 100644
index 0000000..c15b9d8
--- /dev/null
+++ b/yast2-ntp-client-3.0.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a9ec25de38219c9bf19f2c947e3a113e283280381d13f43d4c56a718716a09f
+size 130836
diff --git a/yast2-ntp-client.changes b/yast2-ntp-client.changes
index a7a8d76..e168416 100644
--- a/yast2-ntp-client.changes
+++ b/yast2-ntp-client.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Aug 15 07:36:40 UTC 2013 - lslezak@suse.cz
+
+- move the development documentation to devel-doc subpackage
+- 3.0.1
+
+-------------------------------------------------------------------
+Fri Aug  2 07:04:14 UTC 2013 - lslezak@suse.cz
+
+- convert data file from YCP to YAML format (ntp_servers.ycp ->
+  ntp_servers.yml)
+
 -------------------------------------------------------------------
 Wed Jul 31 08:22:59 UTC 2013 - yast-devel@opensuse.org
 
diff --git a/yast2-ntp-client.spec b/yast2-ntp-client.spec
index a66a937..a3e4957 100644
--- a/yast2-ntp-client.spec
+++ b/yast2-ntp-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ntp-client
-Version:        3.0.0
+Version:        3.0.1
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -46,6 +46,15 @@ Group:          System/YaST
 %description
 This package contains the YaST2 component for NTP client configuration.
 
+%package devel-doc
+Requires:       yast2-ntp-client = %version
+Summary:        YaST2 - NTP Client - Development Documentation
+Group:          System/YaST
+
+%description devel-doc
+This package contains development documentation for using the API
+provided by yast2-ntp-client package.
+
 %prep
 %setup -n yast2-ntp-client-%{version}
 
@@ -83,8 +92,17 @@ rm -rf "$RPM_BUILD_ROOT"
 /usr/share/YaST2/scrconf/etc_ntp.scr
 /usr/share/YaST2/modules/*.rb
 %{_prefix}/share/applications/YaST2/ntp-client.desktop
-/usr/share/YaST2/data/ntp_servers.ycp
-%doc %{_prefix}/share/doc/packages/yast2-ntp-client
+/usr/share/YaST2/data/ntp_servers.yml
 /usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
 
+%dir %{_prefix}/share/doc/packages/yast2-ntp-client
+%doc %{_prefix}/share/doc/packages/yast2-ntp-client/README
+%doc %{_prefix}/share/doc/packages/yast2-ntp-client/COPYING
+%doc %{_prefix}/share/doc/packages/yast2-ntp-client/TODO
+%doc %{_prefix}/share/doc/packages/yast2-ntp-client/spec.txt
+
+%files devel-doc
+%doc %{_prefix}/share/doc/packages/yast2-ntp-client/autodocs
+%doc %{_prefix}/share/doc/packages/yast2-ntp-client/ntp.conf_agent.txt
+
 %changelog

From ac35281d65c3763c4d7d9cf8f1c633d1db631b66d6d26c0d9a9f13a10233abc5 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Fri, 23 Aug 2013 11:17:24 +0000
Subject: [PATCH 7/8] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=149
---
 yast2-ntp-client-3.0.1.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-ntp-client-3.0.1.tar.bz2 b/yast2-ntp-client-3.0.1.tar.bz2
index c15b9d8..df5d81f 100644
--- a/yast2-ntp-client-3.0.1.tar.bz2
+++ b/yast2-ntp-client-3.0.1.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a9ec25de38219c9bf19f2c947e3a113e283280381d13f43d4c56a718716a09f
-size 130836
+oid sha256:d88a31938b2adea50332ad6487608421dd8eb99e5bb88b5413ee5f04094607ec
+size 130913

From 3f9702046404869ceb799942e84c8fa5bfb648e9ad2f3023a5ab5846302edce5 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Tue, 8 Oct 2013 12:49:09 +0000
Subject: [PATCH 8/8] - do not use *.spec.in template, use *.spec file with RPM
 macros   instead - 3.1.0

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=150
---
 yast2-ntp-client-3.0.1.tar.bz2 |  3 --
 yast2-ntp-client-3.1.0.tar.bz2 |  3 ++
 yast2-ntp-client.changes       |  7 ++++
 yast2-ntp-client.spec          | 64 ++++++++++++----------------------
 4 files changed, 33 insertions(+), 44 deletions(-)
 delete mode 100644 yast2-ntp-client-3.0.1.tar.bz2
 create mode 100644 yast2-ntp-client-3.1.0.tar.bz2

diff --git a/yast2-ntp-client-3.0.1.tar.bz2 b/yast2-ntp-client-3.0.1.tar.bz2
deleted file mode 100644
index df5d81f..0000000
--- a/yast2-ntp-client-3.0.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d88a31938b2adea50332ad6487608421dd8eb99e5bb88b5413ee5f04094607ec
-size 130913
diff --git a/yast2-ntp-client-3.1.0.tar.bz2 b/yast2-ntp-client-3.1.0.tar.bz2
new file mode 100644
index 0000000..70ab6fa
--- /dev/null
+++ b/yast2-ntp-client-3.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e346969e3e0a9ce217c3aa1f49e26f48f512aa0452acca82f77f3872055a535a
+size 55742
diff --git a/yast2-ntp-client.changes b/yast2-ntp-client.changes
index e168416..0483f54 100644
--- a/yast2-ntp-client.changes
+++ b/yast2-ntp-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 19 12:09:02 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Thu Aug 15 07:36:40 UTC 2013 - lslezak@suse.cz
 
diff --git a/yast2-ntp-client.spec b/yast2-ntp-client.spec
index a3e4957..5b1c865 100644
--- a/yast2-ntp-client.spec
+++ b/yast2-ntp-client.spec
@@ -17,17 +17,17 @@
 
 
 Name:           yast2-ntp-client
-Version:        3.0.1
+Version:        3.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-ntp-client-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 BuildRequires:  perl-XML-Writer
 BuildRequires:  update-desktop-files
 BuildRequires:  yast2
 BuildRequires:  yast2-country-data
-BuildRequires:  yast2-devtools
+BuildRequires:  yast2-devtools >= 3.0.6
 BuildRequires:  yast2-testsuite
 #SLPAPI.pm 
 # Hostname::CurrentDomain
@@ -56,53 +56,35 @@ This package contains development documentation for using the API
 provided by yast2-ntp-client package.
 
 %prep
-%setup -n yast2-ntp-client-%{version}
+%setup -n %{name}-%{version}
 
 %build
-%{_prefix}/bin/y2tool y2autoconf
-%{_prefix}/bin/y2tool y2automake
-autoreconf --force --install
-
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-
-./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
+%yast_build
 
 %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
-    d=${f##*/}
-    %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
-done
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+%yast_install
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/YaST2/include/ntp-client
-/usr/share/YaST2/include/ntp-client/*
-/usr/share/YaST2/clients/ntp-client.rb
-/usr/share/YaST2/clients/ntp-client_*.rb
-/usr/share/YaST2/scrconf/cfg_ntp.scr
-/usr/share/YaST2/scrconf/etc_ntp.scr
-/usr/share/YaST2/modules/*.rb
-%{_prefix}/share/applications/YaST2/ntp-client.desktop
-/usr/share/YaST2/data/ntp_servers.yml
-/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
+%dir %{yast_yncludedir}/ntp-client
+%{yast_yncludedir}/ntp-client/*
+%{yast_clientdir}/ntp-client.rb
+%{yast_clientdir}/ntp-client_*.rb
+%{yast_scrconfdir}/cfg_ntp.scr
+%{yast_scrconfdir}/etc_ntp.scr
+%{yast_moduledir}/*.rb
+%{yast_desktopdir}/ntp-client.desktop
+%{yast_ydatadir}/ntp_servers.yml
+%{yast_schemadir}/autoyast/rnc/ntpclient.rnc
 
-%dir %{_prefix}/share/doc/packages/yast2-ntp-client
-%doc %{_prefix}/share/doc/packages/yast2-ntp-client/README
-%doc %{_prefix}/share/doc/packages/yast2-ntp-client/COPYING
-%doc %{_prefix}/share/doc/packages/yast2-ntp-client/TODO
-%doc %{_prefix}/share/doc/packages/yast2-ntp-client/spec.txt
+%dir %{yast_docdir}
+%doc %{yast_docdir}/README
+%doc %{yast_docdir}/COPYING
+%doc %{yast_docdir}/TODO
+%doc %{yast_docdir}/spec.txt
 
 %files devel-doc
-%doc %{_prefix}/share/doc/packages/yast2-ntp-client/autodocs
-%doc %{_prefix}/share/doc/packages/yast2-ntp-client/ntp.conf_agent.txt
+%doc %{yast_docdir}/autodocs
+%doc %{yast_docdir}/ntp.conf_agent.txt
 
 %changelog