Browse Source

Use macros for dependency version ranges

Alois Mahdal 5 years ago
parent
commit
3cfa8bebd5
3 changed files with 14 additions and 10 deletions
  1. 4
    0
      mkit.ini
  2. 8
    8
      packaging/debian/control
  3. 2
    2
      packaging/template.spec

+ 4
- 0
mkit.ini View File

@@ -40,6 +40,10 @@
40 40
     __SATURNIN_CONFIG_LOCAL__ = [roots:etc]
41 41
     __SATURNIN_LIBEXEC__      = [roots:libexec]
42 42
     __SATURNIN_SHARE__        = [roots:share]
43
+    __VDEP_SHELLFU_GE__  = 0.10.10
44
+    __VDEP_SHELLFU_LT__  = 0.11.0
45
+    __VDEP_SATURNIN_GE__ = 0.4.13
46
+    __VDEP_SATURNIN_LT__ = 0.5.0
43 47
 
44 48
 [modes]
45 49
     bin     = 755

+ 8
- 8
packaging/debian/control View File

@@ -9,24 +9,24 @@ Build-Depends: debhelper (>= 9)
9 9
 Package: dottum
10 10
 Architecture: all
11 11
 Depends:
12
- shellfu (>= 0.10.10),
13
- shellfu (<< 0.11),
12
+ shellfu (>= __VDEP_SHELLFU_GE__),
13
+ shellfu (<< __VDEP_SHELLFU_LT__),
14 14
  shellfu-bash,
15 15
  shellfu-bash-dottum,
16 16
  shellfu-bash-pretty,
17
- shellfu-bash-saturnin (>= 0.4.13),
18
- shellfu-bash-saturnin (<< 5.0),
17
+ shellfu-bash-saturnin (>= __VDEP_SATURNIN_GE__),
18
+ shellfu-bash-saturnin (<< __VDEP_SATURNIN_LT__),
19 19
 Description: __MKIT_PROJ_TAGLINE__
20 20
 
21 21
 Package: shellfu-bash-dottum
22 22
 Architecture: all
23 23
 Depends:
24
- shellfu (>= 0.10.10),
25
- shellfu (<< 0.11),
24
+ shellfu (>= __VDEP_SHELLFU_GE__),
25
+ shellfu (<< __VDEP_SHELLFU_LT__),
26 26
  shellfu-bash,
27 27
  shellfu-bash-pretty,
28
- shellfu-bash-saturnin (>= 0.4.13),
29
- shellfu-bash-saturnin (<< 5.0),
28
+ shellfu-bash-saturnin (>= __VDEP_SATURNIN_GE__),
29
+ shellfu-bash-saturnin (<< __VDEP_SATURNIN_LT__),
30 30
 Description: __MKIT_PROJ_TAGLINE__
31 31
 
32 32
 # control file built with MKit __MKIT_SELF_VERSION__

+ 2
- 2
packaging/template.spec View File

@@ -1,6 +1,6 @@
1 1
 %global sfincb %{_datadir}/shellfu/include-bash
2
-%global shellfu_req shellfu >= 0.10.10, shellfu < 0.11
3
-%global saturnin_req shellfu-bash-saturnin >= 0.4.13, shellfu-bash-saturnin < 0.5
2
+%global shellfu_req shellfu >= __VDEP_SHELLFU_GE__, shellfu < __VDEP_SHELLFU_LT__
3
+%global saturnin_req shellfu-bash-saturnin >= __VDEP_SATURNIN_GE__, shellfu-bash-saturnin < __VDEP_SATURNIN_LT__
4 4
 
5 5
 Name:       __MKIT_PROJ_PKGNAME__
6 6
 Version:    __MKIT_PROJ_VERSION__