|
@@ -65,16 +65,30 @@ dist() {
|
65
|
65
|
#
|
66
|
66
|
# Create distributable tarball
|
67
|
67
|
#
|
|
68
|
+ #FIXME: lacking Makefile skills, we do this step twice fot
|
|
69
|
+ # rpmstuff, hence -f hack for gzip
|
|
70
|
+ #
|
68
|
71
|
local version=$(get_version)
|
69
|
72
|
local dirname=$MKIT_PKGNAME-$version
|
70
|
73
|
mkdir -p "$dirname"
|
71
|
74
|
ini values "lists:dist" | xargs -I DIST_ITEM cp -R DIST_ITEM "$dirname"
|
72
|
75
|
sed -i -e "s/^VERSION = .*/VERSION = $version/" "$dirname/config.mk"
|
73
|
76
|
tar -cf "$dirname.tar" "$dirname"
|
74
|
|
- gzip "$dirname.tar"
|
|
77
|
+ gzip -f "$dirname.tar" # see above FIXME
|
75
|
78
|
rm -rf "$dirname"
|
76
|
79
|
}
|
77
|
80
|
|
|
81
|
+rpmstuff() {
|
|
82
|
+ #
|
|
83
|
+ # Build specfile
|
|
84
|
+ #
|
|
85
|
+ local specname="$(ini 1value ENV:PKGNAME).spec"
|
|
86
|
+ local specsrc="$(ini 1value "rpmstuff:spec_skel")"
|
|
87
|
+ test -n "$specsrc" || die "rpmstuff:spec_skel not specified"
|
|
88
|
+ test -f "$specsrc" || die "specfile template not found: $specsrc"
|
|
89
|
+ build1 "$specsrc" "$specname"
|
|
90
|
+}
|
|
91
|
+
|
78
|
92
|
expand_includes() {
|
79
|
93
|
#
|
80
|
94
|
# Expand include directives
|