Browse Source

new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9455 ec354946-7b23-47d6-9f5a-488ba84defc7
miyabi 9 years ago
parent
commit
26be908638
1 changed files with 12 additions and 8 deletions
  1. 12 8
      h/hostapd/hostapd-vl.spec

+ 12 - 8
h/hostapd/hostapd-vl.spec

@@ -1,5 +1,5 @@
 %define         base_name       hostapd
-%define         pkg_version     2.3
+%define         pkg_version     2.4
 %define         pkg_release     1%{?_dist_release}
 
 Summary:        IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
@@ -10,7 +10,6 @@ Release:        %{pkg_release}
 Source0:        %{base_name}-%{version}.tar.gz
 Source1:        %{base_name}-init.sh
 Source2:        %{base_name}-%{version}.config
-Patch0:         %{base_name}-%{version}.patch
 License:        GPL2
 Group:          System Environment/Daemons
 URL:            http://hostap.epitest.fi/hostapd/
@@ -37,7 +36,6 @@ IEEE 802.11 アクセスポイント管理、IEEE 802.1X/WPA/WPA2/EAP 認証局
 
 %prep
 %setup -q
-%patch0 -p1
 cp %{SOURCE1} .
 cp %{SOURCE2} ./%{base_name}/.config
 
@@ -49,12 +47,14 @@ cd %{base_name}
 [ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT}
 
 pushd %{base_name}
-%{__make} install DESTDIR="${RPM_BUILD_ROOT}"
+%{__make} install DESTDIR="${RPM_BUILD_ROOT}" BINDIR="%{_sbindir}"
 popd
 
-mkdir -p ${RPM_BUILD_ROOT}%{_initdir}
+%{__install} -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_initdir}/%{base_name}
 
-install %{SOURCE1} ${RPM_BUILD_ROOT}%{_initdir}/%{base_name}
+%{__install} -D %{base_name}/hostapd.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{base_name}/%{base_name}.conf.sample
+%{__install} -D %{base_name}/hostapd.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/hostapd.8
+%{__install} -D %{base_name}/hostapd_cli.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/hostapd_cli.1
 
 %post
 if ! /sbin/chkconfig %{base_name}; then
@@ -81,8 +81,8 @@ fi
 %dir %{_sysconfdir}/%{base_name}/
 
 # Program Files
-%attr(0755, root, root) %{_sbindir}/%{base_name}
-%attr(0755, root, root) %{_bindir}/hostapd_cli
+%attr(0755, root, root) %{_sbindir}/hostapd
+%attr(0755, root, root) %{_sbindir}/hostapd_cli
 
 %attr(0755, root, root) %{_initdir}/%{base_name}
 
@@ -95,6 +95,10 @@ fi
 %{_mandir}/man1/hostapd_cli.1.gz
 
 %changelog
+* Sat Mar 21 2015 Masahiro INOUE <miyabi.-.inoue@nifty.com> 2.4-1
+- new upstream release
+- change hostapd_cli install path /usr/bin -> /usr/sbin
+
 * Sat Dec 06 2014 Masahiro INOUE <miyabi.-.inoue@nifty.com> 2.3-1
 - new upstream release