Use full pg version instead of major when forming package name

Author: qount25

lib/pgpm/deb/builder.rb

@@ -34,7 +34,7 @@ def build
 
       # Depends on postgres version and arch
       def image_name
-        "quay.io/qount25/pgpm-debian-pg#{@spec.package.postgres_major_version}-#{@spec.arch}"
+        "quay.io/qount25/pgpm-debian-pg#{@spec.package.postgres_version}-#{@spec.arch}"
       end
 
       def prepare_versioned_source
@@ -88,7 +88,7 @@ def prepare_default_source
 
         # 2. Determine the name of the .control file inside the versioned build
         deb_dir = "#{pbuilds_dir}/#{build_dir}/build/#{@spec.deb_pkg_name(:versioned)}-0/debian/#{@spec.deb_pkg_name(:versioned)}"
-        control_fn = "#{deb_dir}/usr/share/postgresql/#{@spec.package.postgres_major_version}/extension/#{@spec.package.extension_name}--#{@spec.package.version}.control"
+        control_fn = "#{deb_dir}/usr/share/postgresql/#{@spec.package.postgres_version}/extension/#{@spec.package.extension_name}--#{@spec.package.version}.control"
 
         # 3. Copy .control file to the source-default dir
         puts "Copying #{control_fn} into /root/pgpm/source-default/"

lib/pgpm/deb/spec.rb

@@ -7,12 +7,12 @@
 module Pgpm
   module Deb
     class Spec
-      attr_reader :package, :release, :postgres_version, :postgres_distribution
+      attr_reader :package, :release, :postgres_distribution
 
       def initialize(package)
         @postgres_distribution = Pgpm::Postgres::Distribution.in_scope
         @package = package
-        @package.postgres_major_version = @postgres_distribution.major_version
+        @package.postgres_version = @postgres_distribution.version
         @release = 1
       end
 
@@ -38,9 +38,9 @@ def source_version
 
       def deb_pkg_name(type = :versioned)
         if type == :versioned
-          "#{@package.name.gsub("_", "-")}+#{source_version}-pg#{@package.postgres_major_version}"
+          "#{@package.name.gsub("_", "-")}+#{source_version}-pg#{@package.postgres_version}"
         else
-          "#{@package.name.gsub("_", "-")}-pg#{@package.postgres_major_version}"
+          "#{@package.name.gsub("_", "-")}-pg#{@package.postgres_version}"
         end
       end
 

lib/pgpm/package/dependencies.rb

@@ -5,14 +5,14 @@
 module Pgpm
   class Package
     module Dependencies
-      attr_accessor :postgres_major_version
+      attr_accessor :postgres_version
 
       def build_dependencies
         case Pgpm::OS.in_scope.class.name
         when "debian", "ubuntu"
           deps = [
-            "postgresql-#{postgres_major_version}",
-            "postgresql-server-dev-#{postgres_major_version}",
+            "postgresql-#{postgres_version}",
+            "postgresql-server-dev-#{postgres_version}",
             "postgresql-common"
           ]
           if native?

lib/pgpm/rpm/spec.rb

@@ -6,16 +6,13 @@
 module Pgpm
   module RPM
     class Spec
-      attr_reader :package, :release, :postgres_version, :postgres_distribution
+      attr_reader :package, :release, :postgres_distribution
 
       def initialize(package)
         @postgres_distribution = Pgpm::Postgres::Distribution.in_scope
         @package = package
+        @package.postgres_version = @postgres_distribution.version
         @release = 1
-
-        # Needed in order to return correct dependencies for the selected
-        # version of postgres and selected OS.
-        @package.postgres_major_version = @postgres_distribution.major_version
       end
 
       def versionless