Module: sip-router Branch: master Commit: 40201ac316b1ca3b1bcc52c07537194938b9cacc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=40201ac… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 1 23:09:41 2012 +0100 pkg/kamailio/fedora: Changed directory structure a little and tweaked .spec for Fedora 17 --- pkg/kamailio/centos/6/kamailio.spec | 2 +- .../fedora/{fc16 => 16}/kamailio-build.appl | 0 pkg/kamailio/fedora/{fc16 => 16}/kamailio.appl | 0 pkg/kamailio/fedora/{fc16 => 16}/kamailio.service | 0 pkg/kamailio/fedora/{fc16 => 16}/kamailio.spec | 7 +++++-- .../fedora/{fc16 => 16}/kamailio.sysconfig | 0 pkg/kamailio/fedora/17/kamailio.service | 1 + pkg/kamailio/fedora/17/kamailio.spec | 1 + pkg/kamailio/fedora/17/kamailio.sysconfig | 1 + 9 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 3e20839..1e42ad2 120000 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1 +1 @@ -../../fedora/fc16/kamailio.spec \ No newline at end of file +../../fedora/16/kamailio.spec \ No newline at end of file diff --git a/pkg/kamailio/fedora/fc16/kamailio-build.appl b/pkg/kamailio/fedora/16/kamailio-build.appl similarity index 100% rename from pkg/kamailio/fedora/fc16/kamailio-build.appl rename to pkg/kamailio/fedora/16/kamailio-build.appl diff --git a/pkg/kamailio/fedora/fc16/kamailio.appl b/pkg/kamailio/fedora/16/kamailio.appl similarity index 100% rename from pkg/kamailio/fedora/fc16/kamailio.appl rename to pkg/kamailio/fedora/16/kamailio.appl diff --git a/pkg/kamailio/fedora/fc16/kamailio.service b/pkg/kamailio/fedora/16/kamailio.service similarity index 100% rename from pkg/kamailio/fedora/fc16/kamailio.service rename to pkg/kamailio/fedora/16/kamailio.service diff --git a/pkg/kamailio/fedora/fc16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec similarity index 99% rename from pkg/kamailio/fedora/fc16/kamailio.spec rename to pkg/kamailio/fedora/16/kamailio.spec index 0069151..78ba9d9 100644 --- a/pkg/kamailio/fedora/fc16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -364,11 +364,11 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ xmlops" mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -install -m644 pkg/kamailio/fedora/fc%{?fedora}/kamailio.service \ +install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.service \ $RPM_BUILD_ROOT/%{_unitdir}/kamailio.service mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig -install -m644 pkg/kamailio/fedora/fc%{?fedora}/kamailio.sysconfig \ +install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.sysconfig \ $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/kamailio %else make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ @@ -907,6 +907,9 @@ fi %changelog +* Fri Jun 1 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Tweak to the pkg/kamailio/fedora directory structure + - Tested with Fedora 17 * Thu May 31 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Updated rel to pre3 - Combined Fedora/CentOS .spec in preparation for Fedora 17 diff --git a/pkg/kamailio/fedora/fc16/kamailio.sysconfig b/pkg/kamailio/fedora/16/kamailio.sysconfig similarity index 100% rename from pkg/kamailio/fedora/fc16/kamailio.sysconfig rename to pkg/kamailio/fedora/16/kamailio.sysconfig diff --git a/pkg/kamailio/fedora/17/kamailio.service b/pkg/kamailio/fedora/17/kamailio.service new file mode 120000 index 0000000..bc15c15 --- /dev/null +++ b/pkg/kamailio/fedora/17/kamailio.service @@ -0,0 +1 @@ +../16/kamailio.service \ No newline at end of file diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec new file mode 120000 index 0000000..01b1f60 --- /dev/null +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -0,0 +1 @@ +../16/kamailio.spec \ No newline at end of file diff --git a/pkg/kamailio/fedora/17/kamailio.sysconfig b/pkg/kamailio/fedora/17/kamailio.sysconfig new file mode 120000 index 0000000..94886a8 --- /dev/null +++ b/pkg/kamailio/fedora/17/kamailio.sysconfig @@ -0,0 +1 @@ +../16/kamailio.sysconfig \ No newline at end of file