File tree Expand file tree Collapse file tree 7 files changed +11
-16
lines changed Expand file tree Collapse file tree 7 files changed +11
-16
lines changed Original file line number Diff line number Diff line change @@ -118,7 +118,7 @@ module Pgpm
118
118
end
119
119
p = Pgpm ::ScopedObject . new ( p , os , arch )
120
120
spec = p . to_rpm_spec
121
- builder = Pgpm ::RedHat ::Builder . new ( spec )
121
+ builder = Pgpm ::RPM ::Builder . new ( spec )
122
122
src_builder = builder . source_builder
123
123
p = c . nil? ? src_builder : c . and_then ( src_builder )
124
124
p . and_then ( builder . versionless_builder )
Original file line number Diff line number Diff line change @@ -13,7 +13,6 @@ def initialize(package)
13
13
@postgres_distribution = Pgpm ::Postgres ::Distribution . in_scope
14
14
@package = package
15
15
@package . postgres_major_version = @postgres_distribution . major_version
16
- @package . os = "debian"
17
16
@release = 1
18
17
end
19
18
Original file line number Diff line number Diff line change @@ -8,10 +8,10 @@ def configure_steps
8
8
end
9
9
10
10
def build_info
11
- case @os
11
+ case Pgpm :: OS . in_scope . class . name
12
12
when "debian" , "ubuntu"
13
13
{ rules : "" }
14
- when "rocky" , "redhat" , "fedora"
14
+ when "rocky+epel-9 " , "redhat" , "fedora"
15
15
{ build_steps : [ ] , install_steps : [ ] }
16
16
end
17
17
end
Original file line number Diff line number Diff line change @@ -7,15 +7,15 @@ module Dependencies
7
7
attr_accessor :postgres_major_version
8
8
9
9
def build_dependencies
10
- case @os
10
+ case Pgpm :: OS . in_scope . class . name
11
11
when "debian" , "ubuntu"
12
12
[
13
13
"build-essential" ,
14
14
"postgresql-#{ postgres_major_version } " ,
15
15
"postgresql-server-dev-#{ postgres_major_version } " ,
16
16
"postgresql-common"
17
17
]
18
- when "rocky" , "redhat" , "fedora"
18
+ when "rocky+epel-9 " , "redhat" , "fedora"
19
19
[
20
20
"build-essential" ,
21
21
"postgresql-#{ postgres_major_version } " ,
@@ -26,10 +26,10 @@ def build_dependencies
26
26
end
27
27
28
28
def dependencies
29
- case @os
29
+ case Pgpm :: OS . in_scope . class . name
30
30
when "debian" , "ubuntu"
31
31
[ "postgresql-#{ postgres_major_version } " ]
32
- when "rocky" , "redhat" , "fedora"
32
+ when "rocky+epel-9 " , "redhat" , "fedora"
33
33
[ "postgresql-#{ postgres_major_version } " ]
34
34
end
35
35
end
Original file line number Diff line number Diff line change @@ -4,8 +4,6 @@ module Pgpm
4
4
class Package
5
5
module Packaging
6
6
7
- attr_accessor :os
8
-
9
7
def to_rpm_spec ( **opts )
10
8
Pgpm ::RPM ::Spec . new ( self , **opts )
11
9
end
Original file line number Diff line number Diff line change @@ -15,8 +15,6 @@ def initialize(package)
15
15
16
16
# Needed in order to return correct dependencies for the selected
17
17
# version of postgres and selected OS.
18
- @package = package
19
- @package . os = "redhat"
20
18
@package . postgres_major_version = @postgres_distribution . major_version
21
19
end
22
20
Original file line number Diff line number Diff line change @@ -29,23 +29,23 @@ def dependencies
29
29
end
30
30
31
31
def build_dependencies
32
- deps = case @os
32
+ deps = case Pgpm :: OS . in_scope . class . name
33
33
when "debian" , "ubunut"
34
34
[ "libssl-dev" , "cmake" ]
35
- when "rocky" , "redhat" , "fedora"
35
+ when "rocky+epel-9 " , "redhat" , "fedora"
36
36
[ "openssl-devel" , "cmake" ]
37
37
end
38
38
super + deps
39
39
end
40
40
41
41
def build_info
42
- case @os
42
+ case Pgpm :: OS . in_scope . class . name
43
43
when "debian" , "ubuntu"
44
44
{
45
45
rules : "override_dh_auto_configure:\n " +
46
46
"\t dh_auto_configure -- -DCMAKE_BUILD_TYPE=\" Release\" "
47
47
}
48
- when "rocky" , "redhat" , "fedora"
48
+ when "rocky+epel-9 " , "redhat" , "fedora"
49
49
{
50
50
build_steps : [
51
51
"./bootstrap -DPG_CONFIG=$PG_CONFIG #{ bootstrap_flags . map { |f | "-D#{ f } " } . join ( " " ) } " ,
You can’t perform that action at this time.
0 commit comments