Skip to content

Commit 5dc5ed7

Browse files
authored
Use only a source for spec files. (#321)
Drop stale spec file. Closes #284
1 parent 2526551 commit 5dc5ed7

File tree

2 files changed

+32
-136
lines changed

2 files changed

+32
-136
lines changed

coova-chilli.spec

Lines changed: 0 additions & 122 deletions
This file was deleted.

distro/redhat/coova-chilli.spec.in

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
Summary: Coova-Chilli is a Wireless LAN Access Point Controller
2-
Name: @PACKAGE@
3-
Version: @VERSION@
4-
Release: 1
2+
Name: coova-chilli
3+
Version: 1.3.1.3
4+
Release: 1%{?dist}
55
URL: http://coova.github.io/
66
Source0: %{name}-%{version}.tar.gz
77
License: GPL
88
Group: System Environment/Daemons
9-
BuildRoot: %{_tmppath}/%{name}-root
109

1110
%if %{!?_without_ssl:1}0
12-
BuildRequires: openssl-devel
11+
BuildRequires: openssl-devel libtool gengetopt
1312
%endif
1413

15-
%description
14+
%description
1615

17-
Coova-Chilli is an open source captive portal or wireless LAN access point
18-
controller. It supports web based login
16+
Coova-Chilli is a fork of the ChilliSpot project - an open source captive
17+
portal or wireless LAN access point controller. It supports web based login
1918
(Universal Access Method, or UAM), standard for public HotSpots, and it
2019
supports Wireless Protected Access (WPA), the standard for secure roamable
2120
networks. Authentication, Authorization and Accounting (AAA) is handled by
2221
your favorite radius server. Read more at http://coova.github.io/.
2322

2423
%prep
25-
%setup
24+
%setup
2625

2726
%build
28-
27+
sh bootstrap
2928
%configure \
3029
--disable-static \
3130
--enable-shared \
@@ -35,6 +34,7 @@ your favorite radius server. Read more at http://coova.github.io/.
3534
--enable-chilliproxy \
3635
--enable-chilliscript \
3736
--with-poll \
37+
--enable-libjson \
3838
%if %{!?_without_ssl:1}0
3939
--with-openssl \
4040
--enable-chilliradsec \
@@ -46,9 +46,14 @@ make
4646
%install
4747
make install DESTDIR=$RPM_BUILD_ROOT
4848

49-
rm -rf $RPM_BUILD_ROOT/usr/include/*
50-
rm -rf $RPM_BUILD_ROOT/usr/lib/*.la
51-
rm -rf $RPM_BUILD_ROOT/usr/lib/*.a
49+
rm -rf $RPM_BUILD_ROOT%{_prefix}/include/*
50+
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
51+
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
52+
#cp -f chilli $RPM_BUILD_ROOT%{_sysconfdir}/init.d/chilli
53+
54+
%check
55+
rm -f $RPM_BUILD_ROOT%{_libdir}/python/*.pyc
56+
rm -f $RPM_BUILD_ROOT%{_libdir}/python/*.pyo
5257

5358
%clean
5459
rm -rf $RPM_BUILD_ROOT
@@ -76,16 +81,29 @@ fi
7681
%dir %{_sysconfdir}/chilli
7782
%dir %{_sysconfdir}/chilli/www
7883
%attr(755,root,root)%{_sysconfdir}/chilli/www/config.sh
79-
%attr(4750,root,chilli)%{_sbindir}/chilli_script
84+
%attr(4750,root,root)%{_sbindir}/chilli_script
8085
%{_sysconfdir}/chilli/www/*
8186
%{_sysconfdir}/chilli/wwwsh
8287
%{_sysconfdir}/chilli/functions
8388
%{_sysconfdir}/chilli/*.sh
89+
%{_sysconfdir}/chilli/wpad.dat
8490
%{_mandir}/man1/*.1*
8591
%{_mandir}/man5/*.5*
8692
%{_mandir}/man8/*.8*
8793

8894
%changelog
95+
* Fri Jun 26 2015 Giovanni Bezicheri <giovanni.bezicheri@nethesis.it>
96+
* Fix json encoding for radius reply.
97+
98+
* Tue May 13 2015 Giovanni Bezicheri <giovanni.bezicheri@nethesis.it>
99+
* Add support for json uri.
100+
101+
* Fri Nov 14 2014 Giovanni Bezicheri <giovanni.bezicheri@nethesis.it>
102+
- Add HS_LANIF_KEEPADDR option in chilli sysconfig.
103+
104+
* Thu Jul 10 2014 Giovanni Bezicheri <giovanni.bezicheri@nethesis.it>
105+
- 1.3.1 release for NethServer. See ChangeLog.
106+
89107
* Sat Jan 2 2010 <david@coova.com>
90108
- 1.2.0 release
91109
* Thu Sep 30 2007 <david@coova.com>

0 commit comments

Comments
 (0)