[sr-dev] git:5.1:d078160a: pkg/kamailio: Fixed db_redis RPM packaging after ee95675177466a7ae5f9575db300df32e42661f2

[Henning Westerholt]

Module: kamailio
Branch: 5.1
Commit: d078160a018171e856eb0ed90db3019a02a5253c
URL: https://github.com/kamailio/kamailio/commit/d078160a018171e856eb0ed90db3019a02a5253c

Author: Sergey Safarov <s.safarov at gmail.com>
Committer: Henning Westerholt <hw at kamailio.org>
Date: 2018-10-14T21:19:55+02:00

pkg/kamailio: Fixed db_redis RPM packaging after ee95675177466a7ae5f9575db300df32e42661f2
Please look ticket #1676

(cherry picked from commit c70c4c5486831b0b8e87450869fee091ecfbda04)

---

Modified: pkg/kamailio/Makefile
Modified: pkg/kamailio/obs/kamailio.spec

---

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

---

diff --git a/pkg/kamailio/Makefile b/pkg/kamailio/Makefile
index 86f826a788..63c024c158 100644
--- a/pkg/kamailio/Makefile
+++ b/pkg/kamailio/Makefile
@@ -40,7 +40,7 @@ src.rpm: tar
 	mv ../../kamailio-$(RELEASE)_src.tar.gz ${RPMBUILD_TOP}/SOURCES/${DIST_ARCHIVE}
 	sed -i -e 's/setup -n %{name}-%{ver}/setup -n kamailio-$(RELEASE)/' obs/kamailio.spec
 	rpmbuild ${RPMBUILD_OPT} -bs obs/kamailio.spec
-	mv ${RPMBUILD_TOP}/SRPMS/kamailio-$(RELEASE).*.src.rpm ../..
+	mv ${RPMBUILD_TOP}/SRPMS/kamailio-$(RELEASE)*.src.rpm ../..
 	rm -Rf ${RPMBUILD_TOP}
 
 # build rpm packages
diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec
index 8d6c134f14..fb3ae45af3 100644
--- a/pkg/kamailio/obs/kamailio.spec
+++ b/pkg/kamailio/obs/kamailio.spec
@@ -965,7 +965,11 @@ ln -s ../obs pkg/kamailio/centos/7
 %if 0%{?fedora} || 0%{?suse_version}
 export FREERADIUS=1
 %endif
-make cfg prefix=/usr basedir=%{buildroot} cfg_prefix=%{buildroot} doc_prefix=%{buildroot} \
+make cfg prefix=/usr \
+    basedir=%{buildroot} \
+    cfg_prefix=%{buildroot} \
+    doc_prefix=%{buildroot} \
+    share_prefix=%{_prefix} \
     doc_dir=%{_docdir}/kamailio/ \
     cfg_target=%{_sysconfdir}/kamailio/ modules_dirs="modules"
 make