--- opensips.spec-4.1.orig 2009-02-25 09:43:37.000000000 -1000 +++ opensips.spec-4.1 2009-02-25 11:27:04.000000000 -1000 @@ -1,14 +1,14 @@ %define name opensips -%define ver 1.4.0 +%define ver 1.4.4 %define rel 0 -%define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc -%define MYSQL_MODULES mysql -%define UNIXODBC_MODULES unixodbc -%define POSTGRES_MODULES postgres +%define EXCLUDED_MODULES db_mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pua db_postgres osp tlsops db_unixodbc +%define MYSQL_MODULES db_mysql +%define UNIXODBC_MODULES db_unixodbc +%define POSTGRES_MODULES db_postgres %define JABBER_MODULES jabber %define CPL_MODULES cpl-c -%define PA_MODULES pa +%define PUA_MODULES pua %define RADIUS_MODULES avp_radius auth_radius group_radius uri_radius %define RADIUS_MOD_PATH modules/avp_radius modules/auth_radius modules/group_radius modules/uri_radius @@ -17,14 +17,14 @@ Version: %ver Release: %rel Packager: Bogdan-Andrei Iancu -Copyright: GPL +License: GPL Group: System Environment/Daemons -Source: http://opensips.org/pub/opensips/stable/%{name}-%{ver}_src.tar.gz +source: http://opensips.org/pub/opensips/%{ver}/src/%{name}-%{ver}-tls_src.tar.gz Source2: opensips.init URL: http://opensips.org/ Vendor: opensips.org -BuildRoot: /var/tmp/%{name}-%{ver}-root -Conflicts: opensips-mysql < %ver, opensips-jabber < %ver, opensips-radius < %ver, opensips-cpl < %ver, opensips-unixodbc < %ver, opensips-pa < %ver, opensips-postgres < %ver +BuildRoot: %{_tmppath}/%{name}-%{ver}-buildroot +Conflicts: opensips-mysql < %ver, opensips-jabber < %ver, opensips-radius < %ver, opensips-cpl < %ver, opensips-unixodbc < %ver, opensips-pua < %ver, opensips-postgres < %ver BuildPrereq: make flex bison @@ -67,7 +67,7 @@ Summary: UNIXODBC connectivity for OpenSIPS. Group: System Environment/Daemons Requires: opensips = %ver -BuildPrereq: unixodbc-dev +BuildPrereq: unixODBC-devel %description unixodbc The opensips-unixodbc package contains UNIXODBC database connectivity support @@ -86,19 +86,19 @@ Summary: CPL interpreter engine for the OpenSIPS. Group: System Environment/Daemons Requires: opensips = %ver -BuildPrereq: libxml2-dev +BuildPrereq: libxml2-devel %description cpl The opensips-cpl package contains a SIP CPL interpreter engine. -%package pa -Summary: sip presence agent support for the OpenSIPS. +%package pua +Summary: sip presence user agent support for the OpenSIPS. Group: System Environment/Daemons Requires: opensips = %ver -BuildPrereq: libxml2-dev +BuildPrereq: libxml2-devel -%description pa -The opensips-pa package contains a sip Presence Agent. +%description pua +The opensips-pua package contains a sip Presence Agent. %package radius Summary: opensips radius authentication, group and uri check modules. @@ -111,7 +111,7 @@ membership and uri checking. %prep -%setup +%setup -n %{name}-%{ver}-tls %build make all skip_modules="%EXCLUDED_MODULES" cfg-target=/%{_sysconfdir}/opensips/ @@ -120,7 +120,7 @@ make modules modules="modules/%UNIXODBC_MODULES" cfg-target=/%{_sysconfdir}/opensips/ make modules modules="modules/%JABBER_MODULES" cfg-target=/%{_sysconfdir}/opensips/ make modules modules="modules/%CPL_MODULES" cfg-target=/%{_sysconfdir}/opensips/ -make modules modules="modules/%PA_MODULES" cfg-target=/%{_sysconfdir}/opensips/ +make modules modules="modules/%PUA_MODULES" cfg-target=/%{_sysconfdir}/opensips/ make modules modules="%RADIUS_MOD_PATH" cfg-target=/%{_sysconfdir}/opensips/ @@ -182,12 +182,12 @@ prefix=/usr \ cfg-prefix=$RPM_BUILD_ROOT \ cfg-target=/%{_sysconfdir}/opensips/ -make install-modules modules="modules/%PA_MODULES" \ +make install-modules modules="modules/%PUA_MODULES" \ basedir=$RPM_BUILD_ROOT \ prefix=/usr \ cfg-prefix=$RPM_BUILD_ROOT \ cfg-target=/%{_sysconfdir}/opensips/ -make install-doc modules="modules/%PA_MODULES" \ +make install-doc modules="modules/%PUA_MODULES" \ basedir=$RPM_BUILD_ROOT \ prefix=/usr \ cfg-prefix=$RPM_BUILD_ROOT \ @@ -237,14 +237,14 @@ %doc %{_docdir}/opensips/README.auth_db %doc %{_docdir}/opensips/README.auth_diameter %doc %{_docdir}/opensips/README.avpops -%doc %{_docdir}/opensips/README.dbtext +%doc %{_docdir}/opensips/README.db_text %doc %{_docdir}/opensips/README.dialog %doc %{_docdir}/opensips/README.dispatcher %doc %{_docdir}/opensips/README.diversion %doc %{_docdir}/opensips/README.domain %doc %{_docdir}/opensips/README.enum %doc %{_docdir}/opensips/README.exec -%doc %{_docdir}/opensips/README.flatstore +%doc %{_docdir}/opensips/README.db_flatstore %doc %{_docdir}/opensips/README.gflags %doc %{_docdir}/opensips/README.group %doc %{_docdir}/opensips/README.lcr @@ -286,13 +286,13 @@ %{_libdir}/opensips/modules/auth_db.so %{_libdir}/opensips/modules/auth_diameter.so %{_libdir}/opensips/modules/avpops.so -%{_libdir}/opensips/modules/dbtext.so +%{_libdir}/opensips/modules/db_text.so %{_libdir}/opensips/modules/dispatcher.so %{_libdir}/opensips/modules/diversion.so %{_libdir}/opensips/modules/domain.so %{_libdir}/opensips/modules/enum.so %{_libdir}/opensips/modules/exec.so -%{_libdir}/opensips/modules/flatstore.so +%{_libdir}/opensips/modules/db_flatstore.so %{_libdir}/opensips/modules/gflags.so %{_libdir}/opensips/modules/group.so %{_libdir}/opensips/modules/lcr.so @@ -324,11 +324,11 @@ %{_sbindir}/opensips %{_sbindir}/opensipsctl -%{_libdir}/opensipsctl/opensipsctl.base -%{_libdir}/opensipsctl/opensipsctl.sqlbase -%{_libdir}/opensipsctl/opensipsctl.ctlbase -%{_libdir}/opensipsctl/opensipsctl.fifo -%{_libdir}/opensipsctl/opensipsctl.unixsock +%{_libdir}/opensips/opensipsctl/opensipsctl.base +%{_libdir}/opensips/opensipsctl/opensipsctl.sqlbase +%{_libdir}/opensips/opensipsctl/opensipsctl.ctlbase +%{_libdir}/opensips/opensipsctl/opensipsctl.fifo +%{_libdir}/opensips/opensipsctl/opensipsctl.unixsock %{_mandir}/man5/* %{_mandir}/man8/* @@ -336,25 +336,25 @@ %files mysql %defattr(-,root,root) -%doc %{_docdir}/opensips/README.mysql +%doc %{_docdir}/opensips/README.db_mysql -%{_libdir}/opensips/modules/mysql.so -%{_sbindir}/opensips_mysql.sh -%{_libdir}/opensipsctl/opensipsctl.mysql +%{_libdir}/opensips/modules/db_mysql.so +%{_sbindir}/opensipsdbctl +%{_libdir}/opensips/opensipsctl/opensipsdbctl.mysql %files postgres %defattr(-,root,root) -%doc %{_docdir}/opensips/README.postgres +%doc %{_docdir}/opensips/README.db_postgres -%{_libdir}/opensips/modules/postgres.so -%{_sbindir}/opensips_postgres.sh -%{_libdir}/opensipsctl/opensipsctl.pgsql +%{_libdir}/opensips/modules/db_postgres.so +%{_sbindir}/opensipsdbctl +%{_libdir}/opensips/opensipsctl/opensipsdbctl.pgsql %files unixodbc %defattr(-,root,root) -%doc %{_docdir}/opensips/README.unixodbc +%doc %{_docdir}/opensips/README.db_unixodbc -%{_libdir}/opensips/modules/unixodbc.so +%{_libdir}/opensips/modules/db_unixodbc.so %files jabber %defattr(-,root,root) @@ -368,11 +368,11 @@ %{_libdir}/opensips/modules/cpl-c.so -%files pa +%files pua %defattr(-,root,root) -%doc %{_docdir}/opensips/README.pa +%doc %{_docdir}/opensips/README.pua -%{_libdir}/opensips/modules/pa.so +%{_libdir}/opensips/modules/pua.so %files radius %defattr(-,root,root)