Author: mmazur Date: Fri Apr 1 14:40:35 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- add without_ruby bcond
- kick out ruby into a separate -module-ruby subpackage
---- Files affected:
packages/freeradius-server:
freeradius-server.spec (1.44 -> 1.45)
---- Diffs:
================================================================
Index: packages/freeradius-server/freeradius-server.spec
diff -u packages/freeradius-server/freeradius-server.spec:1.44
packages/freeradius-server/freeradius-server.spec:1.45
--- packages/freeradius-server/freeradius-server.spec:1.44 Fri Apr 1
16:11:32 2011
+++ packages/freeradius-server/freeradius-server.spec Fri Apr 1 16:40:29 2011
@@ -4,6 +4,7 @@
%bcond_without firebird # without rlm_sql_firebird extension module
%bcond_without eap_ikev2 # without rlm_eap_ikev2 extension module
%bcond_without kerberos5 # without rlm_krb5 extension module
+%bcond_without ruby # without rlm_ruby extension module
%bcond_with failed_calls_acc # with failed calls accounting support
#
%include /usr/lib/rpm/macros.perl
@@ -47,7 +48,7 @@
BuildRequires: python-devel
BuildRequires: rpm-perlprov
BuildRequires: rpmbuild(macros) >= 1.268
-BuildRequires: ruby-devel >= 1.8
+%{?with_ruby:BuildRequires: ruby-devel >= 1.8}
BuildRequires: sqlite3-devel
BuildRequires: unixODBC-devel
Requires(post,preun): /sbin/chkconfig
@@ -148,6 +149,14 @@
%description module-python
Python module for %{name}.
+%package module-ruby
+Summary: Ruby module for %{name}
+Group: Networking/Daemons/Radius
+Requires: %{name} = %{version}-%{release}
+
+%description module-ruby
+Ruby module for %{name}.
+
%package module-sqlite
Summary: Sqlite module for %{name}
Group: Networking/Daemons/Radius
@@ -246,7 +255,8 @@
%{!?with_ldap:--without-rlm_ldap} \
%{!?with_eap_ikev2:--without-rlm_eap_ikev2} \
%{?with_kerberos5:--enable-heimdal-krb5} \
- %{!?with_kerberos5:--without-rlm_krb5}
+ %{!?with_kerberos5:--without-rlm_krb5} \
+ %{!?with_ruby:--without-rlm_ruby}
%{make} -j1
@@ -323,6 +333,7 @@
%module_scripts module-perl
%module_scripts module-postgresql
%module_scripts module-python
+%module_scripts module-ruby
%module_scripts module-sqlite
%module_scripts module-sql_firebird
%module_scripts module-unix
@@ -474,8 +485,6 @@
%attr(755,root,root) %{_libdir}/freeradius/rlm_radutmp*.la
%attr(755,root,root) %{_libdir}/freeradius/rlm_realm*.so
%attr(755,root,root) %{_libdir}/freeradius/rlm_realm*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_ruby*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_ruby*.so
%attr(755,root,root) %{_libdir}/freeradius/rlm_sim_files*.so
%attr(755,root,root) %{_libdir}/freeradius/rlm_sim_files*.la
%attr(755,root,root) %{_libdir}/freeradius/rlm_smsotp*.so
@@ -558,6 +567,13 @@
%attr(755,root,root) %{_libdir}/freeradius/rlm_python*.so
%attr(755,root,root) %{_libdir}/freeradius/rlm_python*.la
+%if %{with ruby}
+%files module-ruby
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/freeradius/rlm_ruby*.so
+%attr(755,root,root) %{_libdir}/freeradius/rlm_ruby*.la
+%endif
+
%files module-sqlite
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_sqlite*.so
@@ -604,6 +620,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.45 2011/04/01 14:40:29 mmazur
+- add without_ruby bcond
+- kick out ruby into a separate -module-ruby subpackage
+
Revision 1.44 2011/04/01 14:11:32 mmazur
- add failed_calls_acc bcond (default off) which applies a patch for
logging failed calls as required by CDRTool to work properly
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/freeradius-server/freeradius-server.spec?r1=1.44&r2=1.45&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
