diff options
| author | Andrei Belov <defan@nginx.com> | 2018-03-01 23:03:03 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2018-03-01 23:03:03 +0300 |
| commit | 1f06ccb6d898b6dbb2506e4a893691a67da80130 (patch) | |
| tree | 8a9116b3728d87f694085402fa3e17c0edb3edf7 | |
| parent | 49c58909add5f45db093e57b5094a8780d5cc9a4 (diff) | |
| download | unit-1f06ccb6d898b6dbb2506e4a893691a67da80130.tar.gz unit-1f06ccb6d898b6dbb2506e4a893691a67da80130.tar.bz2 | |
Packages: fixed changelog generation for rpms.
| -rw-r--r-- | pkg/rpm/Makefile | 4 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.go | 1 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.perl | 1 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.php | 1 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.python | 1 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.python27 | 1 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.python34 | 1 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.python35 | 1 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.python36 | 1 |
9 files changed, 10 insertions, 2 deletions
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 7f4975cf..37132fa8 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -151,8 +151,8 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil -e "s#%%MODULE_POST%%#$${post}#g" \ > $@.tmp ; \ } - cd ../../docs && make ../build/unit-$*.rpm-changelog - cat ../../build/unit-$*.rpm-changelog | sed -e \ + cd ../../docs && make ../build/unit-$(MODULE_SUFFIX_$*).rpm-changelog + cat ../../build/unit-$(MODULE_SUFFIX_$*).rpm-changelog | sed -e \ "s/> - $(DEFAULT_VERSION)-$(DEFAULT_RELEASE)/> - $(MODULE_VERSION_$*)-$(MODULE_RELEASE_$*)/" \ >> $@.tmp mv $@.tmp $@ diff --git a/pkg/rpm/Makefile.go b/pkg/rpm/Makefile.go index 8c18c573..1fc3dcb5 100644 --- a/pkg/rpm/Makefile.go +++ b/pkg/rpm/Makefile.go @@ -1,4 +1,5 @@ MODULES+= go +MODULE_SUFFIX_go= go MODULE_SUMMARY_go= Go module for NGINX Unit diff --git a/pkg/rpm/Makefile.perl b/pkg/rpm/Makefile.perl index 93b0d0a7..d20c2539 100644 --- a/pkg/rpm/Makefile.perl +++ b/pkg/rpm/Makefile.perl @@ -1,4 +1,5 @@ MODULES+= perl +MODULE_SUFFIX_perl= perl MODULE_SUMMARY_perl= Perl module for NGINX Unit diff --git a/pkg/rpm/Makefile.php b/pkg/rpm/Makefile.php index a3cbcb8c..6a75a92f 100644 --- a/pkg/rpm/Makefile.php +++ b/pkg/rpm/Makefile.php @@ -1,4 +1,5 @@ MODULES+= php +MODULE_SUFFIX_php= php MODULE_SUMMARY_php= PHP module for NGINX Unit diff --git a/pkg/rpm/Makefile.python b/pkg/rpm/Makefile.python index f13179b5..e95665a7 100644 --- a/pkg/rpm/Makefile.python +++ b/pkg/rpm/Makefile.python @@ -1,4 +1,5 @@ MODULES+= python +MODULE_SUFFIX_python= python MODULE_SUMMARY_python= Python module for NGINX Unit diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27 index 327efff8..9f13ad9e 100644 --- a/pkg/rpm/Makefile.python27 +++ b/pkg/rpm/Makefile.python27 @@ -1,4 +1,5 @@ MODULES+= python27 +MODULE_SUFFIX_python27= python2.7 MODULE_SUMMARY_python27= Python 2.7 module for NGINX Unit diff --git a/pkg/rpm/Makefile.python34 b/pkg/rpm/Makefile.python34 index f6a5b744..ab4b285b 100644 --- a/pkg/rpm/Makefile.python34 +++ b/pkg/rpm/Makefile.python34 @@ -1,4 +1,5 @@ MODULES+= python34 +MODULE_SUFFIX_python34= python3.4 MODULE_SUMMARY_python34= Python 3.4 module for NGINX Unit diff --git a/pkg/rpm/Makefile.python35 b/pkg/rpm/Makefile.python35 index fc71398d..79b8cce3 100644 --- a/pkg/rpm/Makefile.python35 +++ b/pkg/rpm/Makefile.python35 @@ -1,4 +1,5 @@ MODULES+= python35 +MODULE_SUFFIX_python35= python3.5 MODULE_SUMMARY_python35= Python 3.5 module for NGINX Unit diff --git a/pkg/rpm/Makefile.python36 b/pkg/rpm/Makefile.python36 index 9d7cd065..a794c092 100644 --- a/pkg/rpm/Makefile.python36 +++ b/pkg/rpm/Makefile.python36 @@ -1,4 +1,5 @@ MODULES+= python36 +MODULE_SUFFIX_python36= python3.6 MODULE_SUMMARY_python36= Python 3.6 module for NGINX Unit |