[packages/tinyproxy] use make install; daemon moved to sbin
glen
glen at pld-linux.org
Wed Jan 6 21:20:36 CET 2016
commit 262c5307537ccf04fda065d1a32765673c7cff66
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Jan 6 22:20:20 2016 +0200
use make install; daemon moved to sbin
tinyproxy.init | 7 +------
tinyproxy.spec | 13 ++++++-------
2 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/tinyproxy.spec b/tinyproxy.spec
index 49d2e43..14acacc 100644
--- a/tinyproxy.spec
+++ b/tinyproxy.spec
@@ -28,18 +28,17 @@ przydatny w małych sieciach lokalnych.
%build
%configure \
--disable-silent-rules \
+ --sysconfdir=%{_sysconfdir}/%{name} \
--enable-transparent
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man5,%{_mandir}/man8,%{_sysconfdir}/%{name},/etc/rc.d/init.d,%{_datadir}/%{name}}
-cp -p src/tinyproxy $RPM_BUILD_ROOT%{_bindir}
-cp -p data/templates/*.html $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -p docs/man8/tinyproxy.8 $RPM_BUILD_ROOT%{_mandir}/man8
-cp -p docs/man5/tinyproxy.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
-cp -p etc/tinyproxy.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tinyproxy
%clean
@@ -58,7 +57,7 @@ fi
%files
%defattr(644,root,root,755)
%doc AUTHORS README TODO
-%attr(755,root,root) %{_bindir}/tinyproxy
+%attr(755,root,root) %{_sbindir}/tinyproxy
%{_datadir}/%{name}
%dir %{_sysconfdir}/%{name}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/tinyproxy.conf
diff --git a/tinyproxy.init b/tinyproxy.init
index 23eeb26..45bf5ba 100755
--- a/tinyproxy.init
+++ b/tinyproxy.init
@@ -6,8 +6,6 @@
#
# description: tinyproxy is a small HTTP/HTTPS proxy server
#
-# $Id$
-
# Source function library
. /etc/rc.d/init.d/functions
@@ -35,7 +33,7 @@ case "$1" in
# Check if the service is already running?
if [ ! -f /var/lock/subsys/tinyproxy ]; then
msg_starting tinyproxy
- daemon /usr/bin/tinyproxy
+ daemon /usr/sbin/tinyproxy
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyproxy
else
@@ -78,6 +76,3 @@ case "$1" in
esac
exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh:tw=78:ts=8:sw=4
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tinyproxy.git/commitdiff/262c5307537ccf04fda065d1a32765673c7cff66
More information about the pld-cvs-commit
mailing list