SPECS: freeradius.spec - update finished

[zbyniu]

Author: zbyniu                       Date: Fri May 18 00:33:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update finished

---- Files affected:
SPECS:
   freeradius.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: SPECS/freeradius.spec
diff -u SPECS/freeradius.spec:1.73 SPECS/freeradius.spec:1.74
--- SPECS/freeradius.spec:1.73	Wed May 16 23:20:49 2007
+++ SPECS/freeradius.spec	Fri May 18 02:33:27 2007
@@ -5,13 +5,11 @@
 # - won't be good to include these contrib examples?
 #   Source1:	http://www.ping.de/~fdc/radius/radacct-replay
 #   Source3:	ftp://ftp.freeradius.org/pub/radius/contrib/radwho.cgi
-# TODO
-# - finish update to 1.1.6
 Summary:	High-performance and highly configurable RADIUS server
 Summary(pl.UTF-8):	Szybki i wysoce konfigurowalny serwer RADIUS
 Name:		freeradius
 Version:	1.1.6
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		Networking/Daemons
 Source0:	ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.gz
@@ -20,18 +18,17 @@
 Source2:	%{name}.init
 Source3:	%{name}.pam
 Patch0:		%{name}-makefile.patch
-Patch1:		%{name}-smbencrypt.patch
-Patch2:		%{name}-linking.patch
-Patch3:		%{name}-moduledir.patch
-Patch4:		%{name}-rundir.patch
-Patch5:		%{name}-config.patch
-Patch6:		%{name}-eap_install_order.patch
+Patch1:		%{name}-linking.patch
+Patch2:		%{name}-moduledir.patch
+Patch3:		%{name}-rundir.patch
+Patch4:		%{name}-config.patch
 URL:		http://www.freeradius.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	gdbm-devel
 BuildRequires:	krb5-devel
+BuildRequires:	libcom_err-devel
 BuildRequires:	libltdl-devel
 BuildRequires:	libtool
 BuildRequires:	mysql-devel
@@ -77,12 +74,10 @@
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-%patch5 -p1
-#%patch6 -p1
+%patch3 -p1
+%patch4 -p1
 
 sed -e '/m4_include..libtool/d' < aclocal.m4 > acinclude.m4
 
@@ -93,12 +88,13 @@
 	rlm_eap rlm_example rlm_ippool rlm_krb5 rlm_ldap rlm_otp \
 	rlm_pam rlm_perl rlm_python rlm_radutmp rlm_smb \
 	rlm_sql/drivers/rlm_sql_{db2,iodbc,mysql,oracle,postgresql,unixodbc} \
-	rlm_sql rlm_sqlcounter rlm_unix ; do
-# rlm_sql_log - no configure.{in,ac}
+	rlm_sql rlm_sqlcounter rlm_sql_log rlm_unix ; do
 
 	cd src/modules/${d}
-	%{__aclocal} -I ${maindir}
-	%{__autoconf}
+	if [ -f configure.in ]; then
+		%{__aclocal} -I ${maindir}
+		%{__autoconf}
+	fi
 	if [ -f config.h.in ]; then
 		%{__autoheader}
 	fi
@@ -120,8 +116,7 @@
 	--with-ltdl-include=%{_includedir}/none \
 	--with-ltdl-lib=%{_libdir} \
 	--disable-ltdl-install \
-	--with-rlm_krb5 \
-	--without-rlm_dbm
+	--with-rlm_krb5
 %{__make} -j1 \
 	LIBTOOL="`pwd`/libtool --tag=CC"
 
@@ -181,13 +176,12 @@
 %files
 %defattr(644,root,root,755)
 %doc doc/*
-#%doc src/modules/rlm_sql/drivers/*/*.sql
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/*.so
 %dir %{_libdir}/%{name}
-#%attr(755,root,root) %{_libdir}/%{name}/*.so
-#%{_libdir}/%{name}/*.la
+%attr(755,root,root) %{_libdir}/%{name}/*.so
+%{_libdir}/%{name}/*.la
 %{_datadir}/freeradius
 
 %dir %{_sysconfdir}/raddb
@@ -197,7 +191,7 @@
 %attr(771,root,radius) %dir %{_var}/log/%{name}/radacct
 %attr(771,root,radius) %dir %{_var}/log/archive/%{name}
 %attr(771,root,radius) %dir %{_var}/log/archive/%{name}/radacct
-#%attr(775,root,radius) %dir /var/run/%{name}
+%attr(775,root,radius) %dir /var/run/%{name}
 
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*
@@ -211,6 +205,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2007/05/18 00:33:27  zbyniu
+- update finished
+
 Revision 1.73  2007/05/16 21:20:49  sparky
 - updated linking patch
 - make -j1, failt otherwise
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/freeradius.spec?r1=1.73&r2=1.74&f=u