From 2e2c88665843b4bd805dbd1a2c71e5959fa9d5bb Mon Sep 17 00:00:00 2001
From: Timo Tietavainen <timo.tietavainen@nokia.com>
Date: Sat, 16 May 2020 19:45:23 +0300
Subject: [PATCH] Rename rpm and Debian makefile targets

Current makefile targets build_rpm and build_deb are not well named
targets. Rename targets to rpm-pkg and deb-pkg.
Also update CI Dockerfile to utilize rpm-pkg and deb-pkg makefile
targets.

Signed-off-by: Timo Tietavainen <timo.tietavainen@nokia.com>
Change-Id: Ib8509e5d19abbef8c1199d1f42c0edbddbbc3728
---
 Makefile.am            |  4 ++--
 ci/Dockerfile          | 14 +++++++++++---
 ci/publish.sh          |  2 +-
 configure.ac           |  4 ++--
 debian/changelog.in    |  7 +++++++
 docs/release-notes.rst |  5 +++++
 rpm/sdl.spec.in        |  6 +++++-
 7 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5421f28..8471b4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -401,7 +401,7 @@ test_gcov: test
 endif
 
 if ENABLE_RPM_BUILD
-build_rpm:
+rpm-pkg:
 	rpmbuild --nodeps --nocheck -bb rpm/sdl.spec --define="_sourcedir $(top_srcdir)" --define="_builddir $(top_srcdir)" --define="_rpmdir .."
 	mkdir -p @RPM_DIR@
 	cp ../x86_64/*.rpm @RPM_DIR@
@@ -409,7 +409,7 @@ endif
 
 
 if ENABLE_DEB_BUILD
-build_deb:
+deb-pkg:
 	DEB_BUILD_OPTIONS='nocheck noddebs' debuild -b -us -uc
 	mkdir -p @DEB_DIR@
 	cp ../*.deb @DEB_DIR@
diff --git a/ci/Dockerfile b/ci/Dockerfile
index b63f518..83a2c2c 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -34,8 +34,11 @@ RUN apt-get update && \
         gawk \
         debhelper \
         autoconf-archive \
-        libboost-all-dev \
-        libhiredis-dev && \
+        libboost-filesystem-dev \
+        libboost-program-options-dev \
+        libboost-system-dev \
+        libhiredis-dev \
+        valgrind && \
     apt-get clean
 
 # Copy sourcefiles:
@@ -52,7 +55,12 @@ RUN ./autogen.sh && \
 # Build packages:
 RUN make clean && \
     make distclean && \
-    ./package.sh --skip-test debian rpm
+    ./configure --with-rpm-dir=/tmp/pkgs && \
+    make rpm-pkg && \
+    make clean && \
+    make distclean && \
+    ./configure --with-deb-dir=/tmp/pkgs && \
+    make deb-pkg
 
 RUN cp /tmp/build/ci/publish.sh /bin
 ENTRYPOINT ["/bin/publish.sh"]
diff --git a/ci/publish.sh b/ci/publish.sh
index 2115e3c..be40ba3 100755
--- a/ci/publish.sh
+++ b/ci/publish.sh
@@ -13,4 +13,4 @@ then
     exit 1
 fi
 
-cp -v /tmp/*.rpm /tmp/*.deb "$TARGET"
+cp -v /tmp/pkgs/*.rpm /tmp/pkgs/*.deb "$TARGET"
diff --git a/configure.ac b/configure.ac
index 3522bef..349e84a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@
 
 m4_define([SDL_MAJOR], [1])
 m4_define([SDL_MINOR], [1])
-m4_define([SDL_MICRO], [2])
+m4_define([SDL_MICRO], [3])
 
 # SDL ABI version with libtool
 #
@@ -28,7 +28,7 @@ m4_define([SDL_MICRO], [2])
 # Change the numbers just before release.
 
 m4_define([SDL_CURRENT], [2])
-m4_define([SDL_REVISION], [6])
+m4_define([SDL_REVISION], [7])
 m4_define([SDL_AGE], [1])
 
 AC_INIT([shareddatalayer], [SDL_MAJOR.SDL_MINOR.SDL_MICRO], [], [], [https://gerrit.o-ran-sc.org/r/admin/repos/ric-plt/sdl])
diff --git a/debian/changelog.in b/debian/changelog.in
index 386ed42..9963428 100644
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -1,3 +1,10 @@
+sdl (1.1.3-1) UNRELEASED; urgency=low
+
+  * Rename rpm and Debian makefile targets to rpm-pkg and deb-pkg.
+  * Update CI Dockerfile to utilize rpm-pkg and deb-pkg makefile targets.
+
+ -- Timo Tietavainen <timo.tietavainen@nokia.com>  Sat, 16 May 2020 12:25:59 +0300
+
 sdl (1.1.2-1) UNRELEASED; urgency=low
 
   * Add makefile targets to build rpm and Debian packages.
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 761fced..1a8d85e 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -30,6 +30,11 @@ ric-plt/sdl.
 Version history
 ---------------
 
+[1.1.3] - 2020-05-16
+
+* Rename rpm and Debian makefile targets to rpm-pkg and deb-pkg.
+* Update CI Dockerfile to utilize rpm-pkg and deb-pkg makefile targets.
+
 [1.1.2] - 2020-05-15
 
 * Add makefile targets to build rpm and Debian packages.
diff --git a/rpm/sdl.spec.in b/rpm/sdl.spec.in
index 7de0541..f7973ec 100755
--- a/rpm/sdl.spec.in
+++ b/rpm/sdl.spec.in
@@ -1,5 +1,5 @@
 Name:     sdl
-Version:  1.1.2
+Version:  1.1.3
 Release:  1%{?dist}
 Summary:  C++ API library for Shared Data Layer clients
 
@@ -50,6 +50,10 @@ rm -f %{buildroot}%{_libdir}/lib*.*a
 %{_includedir}/sdl
 
 %changelog
+* Sat May 16 2020 Timo Tietavainen <timo.tietavainen@nokia.com> - 1.1.3-1
+- Rename rpm and Debian makefile targets to rpm-pkg and deb-pkg.
+- Update CI Dockerfile to utilize rpm-pkg and deb-pkg makefile targets.
+
 * Fri May 15 2020 Timo Tietavainen <timo.tietavainen@nokia.com> - 1.1.2-1
 - Add makefile targets to build rpm and Debian packages.
 
-- 
2.16.6