[sr-dev] git:5.2:b40d13d4: pkg/kamailio: Updated RPM spec release extracting for "-rc" [skip ci]

Sergey Safarov s.safarov at gmail.com
Thu Oct 24 22:08:49 CEST 2019


Module: kamailio
Branch: 5.2
Commit: b40d13d4e68112ff9598fd78fdd0bb7bcad410d8
URL: https://github.com/kamailio/kamailio/commit/b40d13d4e68112ff9598fd78fdd0bb7bcad410d8

Author: Sergey Safarov <s.safarov at gmail.com>
Committer: Sergey Safarov <s.safarov at gmail.com>
Date: 2019-10-24T23:08:03+03:00

pkg/kamailio: Updated RPM spec release extracting for "-rc" [skip ci]

(cherry picked from commit 1361ce6e980856ce7a3ffb77349cc45254ced6ab)

---

Modified: pkg/kamailio/Makefile

---

Diff:  https://github.com/kamailio/kamailio/commit/b40d13d4e68112ff9598fd78fdd0bb7bcad410d8.diff
Patch: https://github.com/kamailio/kamailio/commit/b40d13d4e68112ff9598fd78fdd0bb7bcad410d8.patch

---

diff --git a/pkg/kamailio/Makefile b/pkg/kamailio/Makefile
index a221ff085c..d6ce6672f4 100644
--- a/pkg/kamailio/Makefile
+++ b/pkg/kamailio/Makefile
@@ -7,7 +7,7 @@ $(error Please start "make cfg" first)
 endif
 
 RPMBUILD_TOP := /tmp/kamailio_rpmbuild
-RPM_VER = ${shell echo "$(RELEASE)" | sed -e "s/-dev[0-9]//" }
+RPM_VER = ${shell echo "$(RELEASE)" | sed -e "s/-dev[0-9]//" -e "s/-rc[0-9]//"}
 RPM_REL = ${shell echo "$(RELEASE)." | grep -o -P "dev[0-9]\." }
 DIST_ARCHIVE = ${shell echo "kamailio-$(RPM_VER)_src.tar.gz"}
 APK_VERSION = ${shell echo "$(RELEASE)" | grep -o "^[0-9.]*"}
@@ -45,7 +45,7 @@ src.rpm: tar
             -e 's/setup -n %{name}-%{ver}/setup -n kamailio-$(RELEASE)/' \
             -i obs/kamailio.spec
 	rpmbuild ${RPMBUILD_OPT} -bs obs/kamailio.spec
-	mv ${RPMBUILD_TOP}/SRPMS/kamailio-$(RELEASE)*.src.rpm ../..
+	mv ${RPMBUILD_TOP}/SRPMS/kamailio-${RPM_VER}*.src.rpm ../..
 	rm -Rf ${RPMBUILD_TOP}
 
 # build rpm packages




More information about the sr-dev mailing list