- libtool 2.2 fix

[packages/freeradius.git] / freeradius.spec

diff --git a/freeradius.spec b/freeradius.spec
index 345c8f1cb0edb6b9f75c805479afffe8236350d8..78328d54ce5e7de42e848154e78fb01d6d99faba 100644 (file)
--- a/freeradius.spec
+++ b/freeradius.spec
@@ -4,38 +4,35 @@
 # - 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.1
 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
+Version:       1.1.7
+Release:       5
 License:       GPL
 Group:         Networking/Daemons
 Source0:       ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.gz
-# Source0-md5: a053d353ce5f393cb70795fd363a586f
+# Source0-md5: 5c126cb2122b8e2ba9784b511fbefd96
 Source1:       %{name}.logrotate
 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
 BuildRequires: net-snmp-devel
-BuildRequires: openldap-devel >= 2.3.0
+BuildRequires: openldap-devel >= 2.4.6
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pam-devel
 BuildRequires: perl-devel
@@ -59,6 +56,7 @@ Requires:     rc-scripts
 Provides:      group(radius)
 Provides:      user(radius)
 Obsoletes:     cistron-radius
+Conflicts:     logrotate < 3.7-4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -76,12 +74,10 @@ większe możliwości konfigurowania.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-%patch5 -p1
-#%patch6 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 sed -e '/m4_include..libtool/d' < aclocal.m4 > acinclude.m4
 
@@ -92,18 +88,19 @@ for d in rlm_attr_rewrite rlm_checkval rlm_counter rlm_dbm \
        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
        cd ${maindir}
 done
-%{__libtoolize}
+%{__libtoolize} --install
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
@@ -119,9 +116,8 @@ done
        --with-ltdl-include=%{_includedir}/none \
        --with-ltdl-lib=%{_libdir} \
        --disable-ltdl-install \
-       --with-rlm_krb5 \
-       --without-rlm_dbm
-%{__make} \
+       --with-rlm_krb5
+%{__make} -j1 \
        LIBTOOL="`pwd`/libtool --tag=CC"
 
 %install
@@ -130,7 +126,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/raddb,%{_libdir}/%{name}} \
        $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,rc.d/init.d} \
        $RPM_BUILD_ROOT%{_var}/log/{,archive}/freeradius/radacct
 
-%{__make} install \
+%{__make} -j1 install \
        LIBTOOL="`pwd`/libtool --tag=CC" \
        R=$RPM_BUILD_ROOT
 
@@ -145,6 +141,7 @@ install %{SOURCE3}  $RPM_BUILD_ROOT/etc/pam.d/radius
 # rlm*.la are used (lt_dlopen)
 rm -f $RPM_BUILD_ROOT%{_libdir}/{*.a,*.la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
+rm -rf $RPM_BUILD_ROOT%{_docdir}/freeradius
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -180,7 +177,6 @@ fi
 %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