Author: pawelz Date: Wed Oct 20 18:37:41 2010 GMT Module: packages Tag: HEAD ---- Log message: - captive-portal subpackage - haserl dep upgraded to R and moved to captive-portal subpackage
---- Files affected: packages/coova-chilli: coova-chilli.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: packages/coova-chilli/coova-chilli.spec diff -u packages/coova-chilli/coova-chilli.spec:1.17 packages/coova-chilli/coova-chilli.spec:1.18 --- packages/coova-chilli/coova-chilli.spec:1.17 Wed Oct 20 19:53:18 2010 +++ packages/coova-chilli/coova-chilli.spec Wed Oct 20 20:37:36 2010 @@ -5,16 +5,16 @@ Release: 0.1 License: GPL Group: Applications -Source0: http://ap.coova.org/chilli/coova-chilli-%{version}.tar.gz +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 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) @@ -29,6 +29,15 @@ 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 @@ -67,8 +76,9 @@ Statyczna biblioteka coovachilli. %prep -%setup -q -n coova-chilli-%{version} +%setup -q %patch0 -p1 +%patch1 -p1 %build %{__libtoolize} @@ -87,12 +97,16 @@ %{__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 @@ -122,17 +136,24 @@ %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 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} -/usr/lib/python/CoovaChilliLib.py +%defattr(644,root,root,755) +%{_libdir}/python/CoovaChilliLib.py %files devel %defattr(644,root,root,755) @@ -151,6 +172,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2010/10/20 18:37:36 pawelz +- captive-portal subpackage +- haserl dep upgraded to R and moved to captive-portal subpackage + Revision 1.17 2010/10/20 17:53:18 pawelz - package CoovaChilliLib.py as python-coova-chilli ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/coova-chilli/coova-chilli.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
