Author: glen Date: Fri Apr 20 17:27:16 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- cleanups, buildroot, tabs, cmake macros, don't package standard license
---- Files affected:
packages/accel-ppp:
accel-ppp.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/accel-ppp/accel-ppp.spec
diff -u packages/accel-ppp/accel-ppp.spec:1.6
packages/accel-ppp/accel-ppp.spec:1.7
--- packages/accel-ppp/accel-ppp.spec:1.6 Tue Apr 17 15:15:05 2012
+++ packages/accel-ppp/accel-ppp.spec Fri Apr 20 19:27:10 2012
@@ -1,8 +1,7 @@
# $Revision$, $Date$
-#
# TODO:
-#
# - check accel-ppp.tmpfiles
+# - logrotate archivedir
# - add bconds
#
Summary: High performance PPTP/L2TP/PPPoE server
@@ -24,6 +23,8 @@
BuildRequires: net-snmp-devel >= 5.0
BuildRequires: openssl-devel
BuildRequires: pcre-devel
+BuildRequires: rpmbuild(macros) >= 1.600
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
The ACCEL-PPP is completly new implementation of PPTP/PPPoE/L2TP which
@@ -42,7 +43,6 @@
- SNMP
- IPv6 (including builtin Neighbor Discovery and DHCPv6)
-
%prep
%setup -q
%patch0 -p1
@@ -53,13 +53,13 @@
%build
install -d build
cd build
-%{cmake} \
- -DSHAPER=TRUE \
- -DRADIUS=TRUE \
- -DNETSNMP=TRUE \
- -DBUILD_INSTALL_PREFIX=$RPM_BUILD_ROOT \
- -DLOG_PGSQL=FALSE \
- ../
+%cmake \
+ -DSHAPER=TRUE \
+ -DRADIUS=TRUE \
+ -DNETSNMP=TRUE \
+ -DBUILD_INSTALL_PREFIX=$RPM_BUILD_ROOT \
+ -DLOG_PGSQL=FALSE \
+ ..
%{__make}
%install
@@ -68,18 +68,17 @@
DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d}
$RPM_BUILD_ROOT%{systemdtmpfilesdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/accel-pppd
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/accel-pppd
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
echo "0" > $RPM_BUILD_ROOT/var/run/accel-ppp/seq
-
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING README
+%doc README
%dir %{_sysconfdir}
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/accel-ppp.conf.dist
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size)
/etc/logrotate.d/%{name}
@@ -87,9 +86,10 @@
%attr(755,root,root) %{_libdir}/accel-ppp
%attr(754,root,root) /etc/rc.d/init.d/accel-pppd
%dir /var/run/%{name}
+# XXX do you really want to overwrite this?
/var/run/%{name}/seq
%{systemdtmpfilesdir}/%{name}.conf
-%{_datadir}/accel-ppp/
+%{_datadir}/%{name}
%{_mandir}/man5/accel-ppp.conf.5*
%dir /var/log/accel-ppp
@@ -99,6 +99,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2012/04/20 17:27:10 glen
+- cleanups, buildroot, tabs, cmake macros, don't package standard license
+
Revision 1.6 2012/04/17 13:15:05 paszczus
- stupid workaround to put libraries in libdir
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/accel-ppp/accel-ppp.spec?r1=1.6&r2=1.7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
