SPECS: gnu-radius.spec - added pl.po-update, fhs, link patches - mod...

[qboosh]

Author: qboosh                       Date: Tue Jul  3 19:19:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added pl.po-update,fhs,link patches
- modules moved to pkglibdir
- separated mysql,postgres modules to subpackages

---- Files affected:
SPECS:
   gnu-radius.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/gnu-radius.spec
diff -u SPECS/gnu-radius.spec:1.26 SPECS/gnu-radius.spec:1.27
--- SPECS/gnu-radius.spec:1.26	Mon Jul  2 19:17:04 2007
+++ SPECS/gnu-radius.spec	Tue Jul  3 21:19:17 2007
@@ -1,9 +1,4 @@
 # $Revision$, $Date$
-#
-# TODO:
-# - bcond mysql and postgresql
-# - separate packages for mysql.so and postgresql.so
-
 Summary:	GNU RADIUS Server
 Summary(pl.UTF-8):	Serwer GNU RADIUS
 Name:		gnu-radius
@@ -20,10 +15,16 @@
 Source5:	%{name}-pgsql.sql
 Source6:	%{name}.sysconfig
 Patch0:		%{name}-inc.patch
+Patch1:		%{name}-pl.po-update.patch
+Patch2:		%{name}-fhs.patch
+Patch3:		%{name}-link.patch
 URL:		http://www.gnu.org/software/radius/
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.8
 BuildRequires:	gettext-devel
 BuildRequires:	groff
 BuildRequires:	guile-devel >= 1.4
+BuildRequires:	libltdl-devel
 BuildRequires:	libtool
 BuildRequires:	m4
 BuildRequires:	mysql-devel
@@ -37,8 +38,8 @@
 Requires:	pam >= 0.77.3
 Requires:	rc-scripts
 Provides:	radius
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	radius
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 RADIUS server with a lot of functions. Short overview:
@@ -71,6 +72,30 @@
 - obsługa parametru Simultaneous-Use = X; tak, to oznacza, że można
   zablokować podwójne logowania.
 
+%package mysql
+Summary:	MySQL support module for GNU Radius
+Summary(pl.UTF-8):	Moduł obsługi baz danych MySQL dla serwera GNU Radius
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description mysql
+MySQL support module for GNU Radius.
+
+%description mysql -l pl.UTF-8
+Moduł obsługi baz danych MySQL dla serwera GNU Radius.
+
+%package postgres
+Summary:	PostgreSQL support module for GNU Radius
+Summary(pl.UTF-8):	Moduł obsługi baz danych PostgreSQL dla serwera GNU Radius
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description postgres
+PostgreSQL support module for GNU Radius.
+
+%description postgres -l pl.UTF-8
+Moduł obsługi baz danych PostgreSQL dla serwera GNU Radius.
+
 %package devel
 Summary:	Headers for GNU Radius
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek GNU Radius
@@ -98,8 +123,18 @@
 %prep
 %setup -q -n radius-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+rm -f po/stamp-po
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4 -I db
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--with-dbm \
 	--with-mysql \
@@ -128,6 +163,8 @@
 touch $RPM_BUILD_ROOT/etc/pam.d/radius
 touch $RPM_BUILD_ROOT/var/log/rad{utmp,wtmp,ius.log}
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/radius/%{version}/modules/*.{la,a}
+
 %find_lang radius
 
 %clean
@@ -156,8 +193,17 @@
 
 %files -f radius.lang
 %defattr(644,root,root,755)
-%doc {ChangeLog,README*,*.sql}
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/gnu-radius
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_libdir}/libgnuradius.so.*.*.*
+%attr(755,root,root) %{_libdir}/libradscm.so.*.*.*
+%attr(755,root,root) %{_libdir}/libguile-gnuradius-v-1.5.so
+%dir %{_libdir}/radius
+%dir %{_libdir}/radius/%{version}
+%dir %{_libdir}/radius/%{version}/modules
+%{_datadir}/radius
+%dir %{_sysconfdir}/raddb
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/naslist
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/nas.rc
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/nastypes
@@ -173,29 +219,39 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/dict
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/dictionary
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/radius
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_sbindir}/*
 %attr(754,root,root) /etc/rc.d/init.d/radius
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/gnu-radius
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/radius
 %attr(750,root,root) %dir /var/log/radacct
-%dir %{_sysconfdir}/raddb
 %attr(640,root,root) %ghost /var/log/radutmp
 %attr(640,root,root) %ghost /var/log/radwtmp
 %attr(640,root,root) %ghost /var/log/radius.log
-%{_datadir}/radius
-%{_mandir}/*/*
+%{_mandir}/man[18]/*
 %{_infodir}/*.info*
 
+%files mysql
+%defattr(644,root,root,755)
+%doc mysql.sql
+%attr(755,root,root) %{_libdir}/radius/%{version}/modules/mysql.so
+
+%files postgres
+%defattr(644,root,root,755)
+%doc pgsql.sql
+%attr(755,root,root) %{_libdir}/radius/%{version}/modules/postgres.so
+
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libgnuradius.so
+%attr(755,root,root) %{_libdir}/libradscm.so
+%{_libdir}/libgnuradius.la
+%{_libdir}/libradscm.la
+%{_libdir}/libservscm.a
 %{_includedir}/radius
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgnuradius.a
+%{_libdir}/libradscm.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -203,6 +259,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2007/07/03 19:19:17  qboosh
+- added pl.po-update,fhs,link patches
+- modules moved to pkglibdir
+- separated mysql,postgres modules to subpackages
+
 Revision 1.26  2007/07/02 17:17:04  aredridel
 - 1.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnu-radius.spec?r1=1.26&r2=1.27&f=u