- drop upstart leftovers

diff --git a/lighttpd.init b/lighttpd.init
index aaf4d5fae66946360f8b500221b0320f8a21e928..69d169b3ec553deadc750cac631c47809e7a8511 100755 (executable)
--- a/lighttpd.init
+++ b/lighttpd.init
@@ -10,8 +10,6 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-upstart_controlled
-
 # Get network config
 . /etc/sysconfig/network
 

diff --git a/lighttpd.spec b/lighttpd.spec
index b11931e6b596a97bbc74abaa20a7cbe4235f5324..a4cb532055698cfeba30f6e2acb23cc1d0da282f 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -1,4 +1,3 @@
-
 # TODO:
 # - provide or autogenerate self signed cert in post, so after installing
 #   lighttpd-ssl server will still work
@@ -30,7 +29,7 @@ Summary:      Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
 Version:       1.4.35
-Release:       6
+Release:       7
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2
@@ -883,7 +882,7 @@ export LIGHTTPD_TEST_PORT=$((2048 + RANDOM % 10))
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,init,monit}} \
+install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,monit}} \
        $RPM_BUILD_ROOT%{_sysconfdir}/{conf,vhosts,webapps}.d \
        $RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}} \
        $RPM_BUILD_ROOT%{_datadir}/lighttpd/errordocs \