Module: sip-router
Branch: master
Commit: 8c789cdeb969af921e74a4ece194ccda5c297e6a
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c789cd…
Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Date: Sat Jun 30 21:05:40 2012 +0100
pkg/kamailio/fedora: Updated some packaging related stuff
- Updated the rel in the .spec to dev1
- Replaced local %{_sharedir} macro in .spec with standard %{_datadir} macro
- Tweak/update to Fedora 16 test appliance
- Added BoxGrinder appliances for Fedora 17
---
pkg/kamailio/fedora/16/kamailio.appl | 2 +-
pkg/kamailio/fedora/16/kamailio.spec | 30 ++++++++++---------
pkg/kamailio/fedora/17/kamailio-build.appl | 44 ++++++++++++++++++++++++++++
pkg/kamailio/fedora/17/kamailio.appl | 39 ++++++++++++++++++++++++
4 files changed, 100 insertions(+), 15 deletions(-)
diff --git a/pkg/kamailio/fedora/16/kamailio.appl b/pkg/kamailio/fedora/16/kamailio.appl
index be24a7f..f65ecd2 100644
--- a/pkg/kamailio/fedora/16/kamailio.appl
+++ b/pkg/kamailio/fedora/16/kamailio.appl
@@ -25,7 +25,7 @@ packages:
- mod_perl # kamailio-perl
- mono-core # kamailio-mono
- mysql-libs # kamailio-mysql
- - net-snmp-agent-libs # kamailio-snmpstats
+ - net-snmp-libs # kamailio-snmpstats
- openldap # kamailio-ldap
- openssl # kamailio-tls
- pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr
diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec
index ecd9405..47f7234 100644
--- a/pkg/kamailio/fedora/16/kamailio.spec
+++ b/pkg/kamailio/fedora/16/kamailio.spec
@@ -1,7 +1,6 @@
%define name kamailio
%define ver 3.4.0
-%define rel dev0%{dist}
-%define _sharedir %{_prefix}/share
+%define rel dev1%{dist}
@@ -682,10 +681,10 @@ fi
%{_mandir}/man5/*
%{_mandir}/man8/*
-%dir %{_sharedir}/kamailio
-%dir %{_sharedir}/kamailio/dbtext
-%dir %{_sharedir}/kamailio/dbtext/kamailio
-%{_sharedir}/kamailio/dbtext/kamailio/*
+%dir %{_datadir}/kamailio
+%dir %{_datadir}/kamailio/dbtext
+%dir %{_datadir}/kamailio/dbtext/kamailio
+%{_datadir}/kamailio/dbtext/kamailio/*
%files mysql
@@ -694,8 +693,8 @@ fi
%{_libdir}/kamailio/modules/db_mysql.so
%{_libdir}/kamailio/kamctl/kamctl.mysql
%{_libdir}/kamailio/kamctl/kamdbctl.mysql
-%dir %{_sharedir}/kamailio/mysql
-%{_sharedir}/kamailio/mysql/*
+%dir %{_datadir}/kamailio/mysql
+%{_datadir}/kamailio/mysql/*
%files postgresql
@@ -704,8 +703,8 @@ fi
%{_libdir}/kamailio/modules/db_postgres.so
%{_libdir}/kamailio/kamctl/kamctl.pgsql
%{_libdir}/kamailio/kamctl/kamdbctl.pgsql
-%dir %{_sharedir}/kamailio/postgres
-%{_sharedir}/kamailio/postgres/*
+%dir %{_datadir}/kamailio/postgres
+%{_datadir}/kamailio/postgres/*
%files unixODBC
@@ -721,8 +720,8 @@ fi
%{_libdir}/kamailio/modules/db_berkeley.so
%{_libdir}/kamailio/kamctl/kamctl.db_berkeley
%{_libdir}/kamailio/kamctl/kamdbctl.db_berkeley
-%dir %{_sharedir}/kamailio/db_berkeley
-%{_sharedir}/kamailio/db_berkeley/*
+%dir %{_datadir}/kamailio/db_berkeley
+%{_datadir}/kamailio/db_berkeley/*
%files sqlite
@@ -731,8 +730,8 @@ fi
%{_libdir}/kamailio/modules_k/db_sqlite.so
%{_libdir}/kamailio/kamctl/kamctl.sqlite
%{_libdir}/kamailio/kamctl/kamdbctl.sqlite
-%dir %{_sharedir}/kamailio/db_sqlite
-%{_sharedir}/kamailio/db_sqlite/*
+%dir %{_datadir}/kamailio/db_sqlite
+%{_datadir}/kamailio/db_sqlite/*
%files utils
@@ -941,6 +940,9 @@ fi
%changelog
+* Sat Jun 30 2012 Peter Dunkley <peter(a)dunkley.me.uk>
+ - Updated rel to dev1
+ - Removed %_sharedir and replaced with standard macro %_datadir
* Mon Jun 11 2012 Peter Dunkley <peter(a)dunkley.me.uk>
- Updated ver to 3.4.0 and rel to dev0
* Mon Jun 4 2012 Peter Dunkley <peter(a)dunkley.me.uk>
diff --git a/pkg/kamailio/fedora/17/kamailio-build.appl
b/pkg/kamailio/fedora/17/kamailio-build.appl
new file mode 100644
index 0000000..4b194d4
--- /dev/null
+++ b/pkg/kamailio/fedora/17/kamailio-build.appl
@@ -0,0 +1,44 @@
+name: "kamailio-build-#OS_NAME#-#OS_VERSION#-#BASE_ARCH#"
+summary: "#OS_NAME# #OS_VERSION# for building Kamailio #BASE_ARCH# RPMs"
+os:
+ name: fedora
+ version: 17
+ password: kamailio
+hardware:
+ memory: 1024
+ partitions:
+ "/":
+ size: 4
+packages:
+ - @core
+ - bison # kamailio
+ - db4-devel # kamailio-bdb
+ - expat-devel # kamailio-xmpp
+ - flex # kamailio
+ - GeoIP-devel # kamailio-GeoIP
+ - gcc # kamailio
+ - glib-devel # kamailio-purple
+ - hiredis-devel # kamailio-redis
+ - json-c-devel # kamailio-json
+ - libconfuse-devel # kamailio-carrierroute
+ - libcurl-devel # kamailio-utils, kamailio-presence
+ - libevent-devel # kamailio-json
+ - libpurple-devel # kamailio-purple
+ - libxml2-devel # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple,
kamailio-xmlrpc, kamailio-xmlops
+ - lua-devel # kamailio-lua
+ - make # kamailio
+ - mod_perl-devel # kamailio-perl
+ - mono-devel # kamailio-mono
+ - mysql-devel # kamailio-mysql
+ - net-snmp-devel # kamailio-snmpstats
+ - openldap-devel # kamailio-ldap
+ - openssl-devel # kamailio-tls
+ - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr
+ - postgresql-devel # kamailio-postgresql
+ - python-devel # kamailio-python
+ - radiusclient-ng-devel # kamailio-radius
+ - redhat-rpm-config # kamailio-debuginfo
+ - rpm-build
+ - sqlite-devel # kamailio-sqlite
+ - unixODBC-devel # kamailio-unixODBC
+ - zlib-devel # kamailio-mysql
diff --git a/pkg/kamailio/fedora/17/kamailio.appl b/pkg/kamailio/fedora/17/kamailio.appl
new file mode 100644
index 0000000..e71964a
--- /dev/null
+++ b/pkg/kamailio/fedora/17/kamailio.appl
@@ -0,0 +1,39 @@
+name: "kamailio-#OS_NAME#-#OS_VERSION#-#BASE_ARCH#"
+summary: "#OS_NAME# #OS_VERSION# for installing Kamailio #BASE_ARCH# RPMs"
+os:
+ name: fedora
+ version: 17
+ password: kamailio
+hardware:
+ memory: 1024
+ partitions:
+ "/":
+ size: 2
+packages:
+ - @core
+ - db4 # kamailio-bdb
+ - expat # kamailio-xmpp
+ - GeoIP # kamailio-GeoIP
+ - glib # kamailio-purple
+ - hiredis # kamailio-redis
+ - json-c # kamailio-json
+ - libconfuse # kamailio-carrierroute
+ - libcurl # kamailio-utils, kamailio-presence
+ - libevent # kamailio-json
+ - libpurple # kamailio-purple
+ - libxml2 # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple,
kamailio-xmlrpc, kamailio-xmlops
+ - mod_perl # kamailio-perl
+ - mono-core # kamailio-mono
+ - mysql-libs # kamailio-mysql
+ - net-snmp-libs # kamailio-snmpstats
+ - openldap # kamailio-ldap
+ - openssl # kamailio-tls
+ - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr
+ - perl-Authen-SASL # kamailio-perl
+ - perl-LDAP # kamailio-perl
+ - postgresql-libs # kamailio-postgresql
+ - python # kamailio-python
+ - radiusclient-ng # kamailio-radius
+ - sqlite # kamailio-sqlite
+ - unixODBC # kamailio-unixODBC
+ - zlib # kamailio-mysql