Merge pull request #45 from EvgeniyPatlan/master

DISTPG-132 Improve packaging

percona-packaging/debian/changelog

@@ -1,4 +1,4 @@
-percona-pg-stat-monitor (1.0.0-1) unstable; urgency=medium
+percona-pg-stat-monitor (0.0.1-1) unstable; urgency=medium
 
   * Initial build.
 

percona-packaging/rpm/pg-stat-monitor.spec

@@ -2,16 +2,13 @@
 %global pgrel @@PG_REL@@
 %global rpm_release @@RPM_RELEASE@@
 %global pginstdir /usr/pgsql-@@PG_REL@@/
-%global pgstatmonmajver 1
-%global pgstatmonmidver 0
-%global pgstatmonminver 0
 
 Summary:        Statistics collector for PostgreSQL
 Name:           %{sname}%{pgrel}
-Version:        %{pgstatmonmajver}.%{pgstatmonmidver}.%{pgstatmonminver}
+Version:        @@VERSION@@
 Release:        %{rpm_release}%{?dist}
 License:        Apache 2.0
-Source0:        %{sname}%{pgrel}-%{pgstatmonmajver}.%{pgstatmonmidver}.%{pgstatmonminver}.tar.gz
+Source0:        %{sname}%{pgrel}-%{version}.tar.gz
 URL:            https://github.com/Percona-Lab/pg_stat_monitor
 BuildRequires:  percona-postgresql%{pgrel}-devel
 Requires:       postgresql-server
@@ -27,7 +24,7 @@ It provides all the features of pg_stat_statment plus its own feature set.
 
 
 %prep
-%setup -q -n %{sname}%{pgrel}-%{pgstatmonmajver}.%{pgstatmonmidver}.%{pgstatmonminver}
+%setup -q -n %{sname}%{pgrel}-%{version}
 
 
 %build

percona-packaging/scripts/pg_stat_monitor_builder.sh

@@ -21,6 +21,7 @@ Usage: $0 [OPTIONS]
         --rpm_release       RPM version( default = 1)
         --deb_release       DEB version( default = 1)
         --pg_release        PPG version build on( default = 11)
+        --version           product version
         --help) usage ;;
 Example $0 --builddir=/tmp/test --get_sources=1 --build_src_rpm=1 --build_rpm=1
 EOF
@@ -56,6 +57,7 @@ append_arg_to_args () {
             --rpm_release=*) RPM_RELEASE="$val" ;;
             --deb_release=*) DEB_RELEASE="$val" ;;
             --pg_release=*) PG_RELEASE="$val" ;;
+            --version=*) VERSION="$val" ;;
             --help) usage ;;
             *)
               if test -n "$pick_args"
@@ -136,6 +138,7 @@ get_sources(){
     done
 
     sed -i "s:@@RPM_RELEASE@@:${RPM_RELEASE}:g" rpm/pg-stat-monitor.spec
+    sed -i "s:@@VERSION@@:${VERSION}:g" rpm/pg-stat-monitor.spec
 
     cd ${WORKDIR}
     #