X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=coova-chilli.spec;h=927b96842879836e1eb648017fab087219071ea2;hb=6296ad0f2fd484a74ad174cd88ebfd24537c6ee7;hp=8d80778bbbaf12deb6be262f81ac7f717e50c602;hpb=1b9882ce21997ff2fe10fca1550b0ae43c31e69d;p=packages%2Fcoova-chilli.git

diff --git a/coova-chilli.spec b/coova-chilli.spec
index 8d80778..927b968 100644
--- a/coova-chilli.spec
+++ b/coova-chilli.spec
@@ -1,18 +1,24 @@
-Summary:	CoovaChilli - Software access controller
-Name:		coovachilli
-Version:	1.2.4
+Summary:	CoovaChilli - Software access controller for hotspots
+Name:		coova-chilli
+Version:	1.2.5
 Release:	0.1
 License:	GPL
 Group:		Applications
 Source0:	http://ap.coova.org/chilli/coova-chilli-%{version}.tar.gz
-# Source0-md5:	6d942a731da07b029a1be0b58d7917d6
-Patch0:		%{name}-strncpy.patch
-URL:		http://coova.org/wiki/index.php/CoovaChilli
+# Source0-md5:	1b890cb043b4340e1f15c2b2cff742d3
+Patch0:		link.patch
+URL:		http://coova.org/
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
 BuildRequires:	perl-base
 BuildRequires:	rpmbuild(macros) >= 1.228
+Suggests:	haserl
 Requires(post,preun):	/sbin/chkconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define	skip_post_check_so	libchilli.so.0.0.0
+
 %description
 Coova-Chilli is a fork of the ChilliSpot project - an open source
 captive portal or wireless LAN access point controller. It supports
@@ -22,12 +28,53 @@ standard for secure roamable networks. Authentication, Authorization
 and Accounting (AAA) is handled by your favorite radius server. Read
 more at http://coova.org/ and http://www.chillispot.org/.
 
+%package -n python-coova-chilli
+Summary:	Python library for CoovaChilli
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	python-libs
+Requires:	python-modules
+Requires:	python-pycairo
+Requires:	python-pygobject
+Requires:	python-pygtk-gtk
+
+%description -n python-coova-chilli
+Python library for CoovaChilli.
+
+%package devel
+Summary:	Header files for coovachili library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki coovachilli
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+Header files for coovachilli library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki coovachilli.
+
+%package static
+Summary:	Static coovachilli library
+Summary(pl.UTF-8):	Statyczna biblioteka coovachilli
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static coovachilli library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka coovachilli.
+
 %prep
 %setup -q -n coova-chilli-%{version}
-
 %patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 %{__make}
 
@@ -39,6 +86,12 @@ install -d $RPM_BUILD_ROOT/etc/rc.d
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
+
+%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
+%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
+%py_postclean
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -54,16 +107,39 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/*.so*
-%attr(754,root,root) /etc/init.d/chilli
+%attr(755,root,root) %{_sbindir}/chilli
+%attr(755,root,root) %ghost %{_libdir}/libbstring.so.0
+%attr(755,root,root) %{_libdir}/libbstring.so.0.0.0
+%attr(755,root,root) %ghost %{_libdir}/libchilli.so.0
+%attr(755,root,root) %{_libdir}/libchilli.so.0.0.0
+%attr(754,root,root) /etc/rc.d/init.d/chilli
 %doc AUTHORS COPYING ChangeLog INSTALL README doc/dictionary.chillispot doc/hotspotlogin.cgi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/chilli.conf
 %dir %{_sysconfdir}/chilli
+%attr(755,root,root) %{_sbindir}/chilli_opt
+%attr(755,root,root) %{_sbindir}/chilli_query
+%attr(755,root,root) %{_sbindir}/chilli_radconfig
+%attr(755,root,root) %{_sbindir}/chilli_response
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/chilli/*
 %attr(755,root,root)%{_sysconfdir}/chilli/www/config.sh
+%if 0
 %dir %{_sysconfdir}/chilli/www
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/chilli/www/*
+%endif
 %{_mandir}/man1/*.1*
 %{_mandir}/man5/*.5*
 %{_mandir}/man8/*.8*
+
+%files -n python-%{name}
+/usr/lib/python/CoovaChilliLib.py
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/*.la
+%{_libdir}/libbstring.so
+%{_libdir}/libchilli.so
+%{_includedir}/chilli
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/*.a