X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=coova-chilli.spec;h=d24472e2c21d2071cb22d85c1df26f4b03efd7d3;hb=906972d14dc6dc804b28342b2a907d3be1d20adc;hp=73e3f18232d9b1fc98e4f6fcf4640c64d66f24ec;hpb=1cdf5957db85c6b6a37cde78aff208ec8da970c4;p=packages%2Fcoova-chilli.git

diff --git a/coova-chilli.spec b/coova-chilli.spec
index 73e3f18..d24472e 100644
--- a/coova-chilli.spec
+++ b/coova-chilli.spec
@@ -1,12 +1,13 @@
-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
+Source0:	http://ap.coova.org/chilli/%{name}-%{version}.tar.gz
+# Source0-md5:	1b890cb043b4340e1f15c2b2cff742d3
+Patch0:		link.patch
+Patch1:		config.patch
 URL:		http://coova.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -16,6 +17,8 @@ BuildRequires:	rpmbuild(macros) >= 1.228
 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
@@ -25,6 +28,28 @@ 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 captive-portal
+Summary:	Default captive portal for Coova
+Group:		Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	haserl
+
+%description captive-portal
+Default captive portal for Coova.
+
+%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
@@ -50,9 +75,9 @@ Static coovachilli library.
 Statyczna biblioteka coovachilli.
 
 %prep
-%setup -q -n coova-chilli-%{version}
-
+%setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -71,7 +96,15 @@ 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
+mv $RPM_BUILD_ROOT%{_sysconfdir}/init.d $RPM_BUILD_ROOT/etc/rc.d
+
+%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
+%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
+%py_postclean
+
+install -d $RPM_BUILD_ROOT%{_datadir}/coova-chilli
+rm $RPM_BUILD_ROOT%{_sysconfdir}/chilli/wwwsh
+mv $RPM_BUILD_ROOT%{_sysconfdir}/chilli/www $RPM_BUILD_ROOT%{_datadir}/coova-chilli/www
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,8 +121,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/*.so*
+%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
@@ -98,14 +130,30 @@ fi
 %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
-%dir %{_sysconfdir}/chilli/www
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/chilli/www/*
 %{_mandir}/man1/*.1*
 %{_mandir}/man5/*.5*
 %{_mandir}/man8/*.8*
 
+%files captive-portal
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_datadir}/coova-chilli/www/*.sh
+%{_datadir}/coova-chilli/www/*.chi
+%{_datadir}/coova-chilli/www/*.gif
+%{_datadir}/coova-chilli/www/*.html
+%{_datadir}/coova-chilli/www/*.jpg
+%{_datadir}/coova-chilli/www/*.js
+%{_datadir}/coova-chilli/www/*.png
+%{_datadir}/coova-chilli/www/*.tmpl
+
+%files -n python-%{name}
+%defattr(644,root,root,755)
+%{_libdir}/python/CoovaChilliLib.py
+
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/*.la