Author: blues Date: Wed Oct 29 16:13:34 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - separate libs and devel, package mibs into mibs subpackage. Noted things for more separation
---- Files affected: SPECS: freeradius-server.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/freeradius-server.spec diff -u SPECS/freeradius-server.spec:1.5 SPECS/freeradius-server.spec:1.6 --- SPECS/freeradius-server.spec:1.5 Wed Oct 29 16:19:09 2008 +++ SPECS/freeradius-server.spec Wed Oct 29 17:13:28 2008 @@ -5,6 +5,20 @@ # (log files are created by server) # - prepare to use with --as-needed # - ac/am regeneration doesn't work +# - move plugins into separate packages: +# /usr/sbin/radsniff: libpcap +# /usr/lib/freeradius/rlm_eap_ikev2-2.1.1.so: libeap-ikev2 +# /usr/lib/freeradius/rlm_krb5-2.1.1.so: libkrb5, libcom_err, libkrb5support, libkeyutils +# /usr/lib/freeradius/rlm_ldap-2.1.1.so: libldap_r, liblber, libsasl2, libcrypt, libssl +# /usr/lib/freeradius/rlm_otp-2.1.1.so +# /usr/lib/freeradius/rlm_pam-2.1.1.so +# /usr/lib/freeradius/rlm_perl-2.1.1.so +# /usr/lib/freeradius/rlm_python-2.1.1.so +# /usr/lib/freeradius/rlm_sql_mysql-2.1.1.so +# /usr/lib/freeradius/rlm_sql_postgresql-2.1.1.so +# /usr/lib/freeradius/rlm_sql_sqlite-2.1.1.so +# /usr/lib/freeradius/rlm_sql_unixodbc-2.1.1.so +# /usr/lib/freeradius/rlm_unix-2.1.1.so # %include /usr/lib/rpm/macros.perl # @@ -12,7 +26,7 @@ Summary(pl.UTF-8): Szybki i wysoce konfigurowalny serwer RADIUS Name: freeradius-server Version: 2.1.1 -Release: 0.9 +Release: 0.10 License: GPL Group: Networking/Daemons/Radius Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.bz2 @@ -53,6 +67,7 @@ Requires(pre): /usr/sbin/usermod Requires: perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION') Requires: rc-scripts +Requires: %{name}-libs = %{version}-%{release} Provides: group(radius) Provides: user(radius) Provides: freeradius = %{version}-%{release} @@ -61,6 +76,7 @@ Conflicts: logrotate < 3.7-4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define mibdir %{_datadir}/snmp/mibs %define filterout_ld -Wl,--as-needed %description @@ -75,6 +91,34 @@ Livingston 2.0 RADIUS server ale ma o wiele więcej funkcji i posiada większe możliwości konfigurowania. +%package mibs +Summary: MIB database for %{name} +Summary(pl.UTF-8): Baza danych MIB dla %{name} +Group: Applications/System +Suggests: libsmi + +%description mibs +MIB database for %{name}. + +%description mibs -l pl.UTF-8 +Baza danych MIB dla %{name}. + + +%package libs +Summary: Freeradius libraries +Group: Libraries + +%description libs +Freeradius libraries. + +%package devel +Summary: Header files and devel library +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} + +%description devel +Header files and libraries. + %prep %setup -q %patch0 -p1 @@ -110,7 +154,8 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,pam.d} \ - $RPM_BUILD_ROOT%{_var}/log/{,archive}/freeradius/radacct + $RPM_BUILD_ROOT%{_var}/log/{,archive}/freeradius/radacct \ + $RPM_BUILD_ROOT%{mibdir} %{__make} -j1 install \ R=$RPM_BUILD_ROOT @@ -119,6 +164,9 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/radius +# Install mibs: +install mibs/FREERADIUS-*.txt $RPM_BUILD_ROOT%{mibdir} + # Cleanups: rm -rf $RPM_BUILD_ROOT%{_docdir}/freeradius \ $RPM_BUILD_ROOT%{_libdir}/*.{a,la} \ @@ -157,10 +205,12 @@ %groupremove radius fi +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + %files %defattr(644,root,root,755) -%doc doc/* -%dir %{_libdir}/freeradius +%doc doc/* scripts %dir %{_sysconfdir}/raddb %attr(771,root,radius) %dir %{_var}/log/freeradius %attr(771,root,radius) %dir %{_var}/log/freeradius/radacct @@ -173,19 +223,38 @@ %attr(754,root,root) /etc/rc.d/init.d/%{name} %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_sbindir}/* -%attr(755,root,root) %{_libdir}/*.so %attr(755,root,root) %{_libdir}/freeradius/*.la %attr(755,root,root) %{_libdir}/freeradius/*.so %{_datadir}/freeradius -%{_includedir}/freeradius %{_mandir}/man?/* +%files libs +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libfreeradius-eap-?.?.?.so +%attr(755,root,root) %{_libdir}/libfreeradius-radius-?.?.?.so +%dir %{_libdir}/freeradius + +%files devel +%defattr(644,root,root,755) +%{_includedir}/freeradius +%{_libdir}/libfreeradius-eap.so +%{_libdir}/libfreeradius-radius.so + +%files mibs +%defattr(644,root,root,755) +%doc mibs/*.chart +%{mibdir}/*.* + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2008/10/29 16:13:28 blues +- separate libs and devel, package mibs into mibs subpackage. Noted things + for more separation + Revision 1.5 2008/10/29 15:19:09 blues - disabled ac/am regeneration and as-needed - needs fixing; cleanups. Builds now. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/freeradius-server.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
