X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=lighttpd.spec;h=35eb70bf40741fc71b43ffa992d8a9f574675c85;hb=82b54184faf5e32cf65c54d52bcecea5c2f03d5c;hp=c2c48943e7dbd5ddcd656aa2c317a4268b6d64e8;hpb=569e9ab04d516cfbb5f997b9614e20e31e3f8b56;p=packages%2Flighttpd.git diff --git a/lighttpd.spec b/lighttpd.spec index c2c4894..35eb70b 100644 --- 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 @@ -21,6 +20,7 @@ %bcond_with webdav_locks # webdav locks with extra efsprogs deps %bcond_with valgrind # compile code with valgrind support. %bcond_with deflate # build deflate module (needs patch update with current svn) +%bcond_with h264_streaming # build h264_streaming module %if %{with webdav_locks} %define webdav_progs 1 @@ -29,12 +29,12 @@ Summary: Fast and light HTTP server Summary(pl.UTF-8): Szybki i lekki serwer HTTP Name: lighttpd -Version: 1.4.35 -Release: 6 +Version: 1.4.40 +Release: 1 License: BSD Group: Networking/Daemons/HTTP -Source0: http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2 -# Source0-md5: f7a88130ee9984b421ad8aa80629750a +Source0: http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz +# Source0-md5: 89e0da2b6b8a2c4592d549ff10094068 Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.user @@ -47,15 +47,10 @@ Source8: light_button.png # Source8-md5: 3e1008ee1d3d6d390cf81fe3072b4f50 Source9: light_logo.png # Source9-md5: cbb7f0676e51ee2e26cf004df293fc62 -Source10: pld_button.png -# Source10-md5: 185afa921e81bd726b9f0f9f0909dc6e -Source11: %{name}-pld.html +Source11: %{name}.html Source12: %{name}.monitrc Source13: branch.sh Source14: TODO -Source15: %{name}.upstart -Source16: %{name}.tmpfiles -Source17: %{name}.service Source100: %{name}-mod_access.conf Source101: %{name}-mod_accesslog.conf Source102: %{name}-mod_alias.conf @@ -95,7 +90,9 @@ Source135: %{name}-mod_extforward.conf Source136: %{name}-mod_h264_streaming.conf Source137: %{name}-mod_cgi_php.conf Source138: %{name}-mod_compress.tmpwatch +# use branch.sh script to create branch.diff #Patch100: %{name}-branch.diff +## Patch100-md5: cdcde8cb4632a42c5ae21d73aae9d34b Patch0: %{name}-use_bin_sh.patch Patch1: %{name}-mod_evasive-status_code.patch Patch2: %{name}-mod_h264_streaming.patch @@ -131,8 +128,10 @@ BuildRequires: pkgconfig BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.647 %{?with_webdav_props:BuildRequires: sqlite3-devel} +BuildRequires: tar >= 1:1.22 %{?with_valgrind:BuildRequires: valgrind} BuildRequires: which +BuildRequires: xz BuildRequires: zlib-devel Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel @@ -148,7 +147,6 @@ Requires: %{name}-mod_indexfile = %{version}-%{release} Requires: %{name}-mod_staticfile = %{version}-%{release} Requires: rc-scripts >= 0.4.3.0 Requires: rpm-whiteout >= 1.5 -Requires: systemd-units >= 38 Suggests: %{name}-mod_accesslog Provides: group(http) Provides: group(lighttpd) @@ -833,14 +831,13 @@ Plik monitrc do monitorowania serwera www lighttpd. %prep %setup -q #%patch100 -p0 -#%patch4 -p0 %patch0 -p1 %patch1 -p1 -%patch2 -p1 +%{?with_h264_streaming:%patch2 -p1} %patch3 -p1 %{?with_deflate:%patch5 -p1} %patch6 -p1 -%patch7 -p0 +%patch7 -p1 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead @@ -850,6 +847,7 @@ cp -p %{SOURCE14} PLD-TODO %if "%{pld_release}" == "ac" %{__sed} -i -e 's/ serial_tests//' configure.ac +%{__sed} -i -e 's/dist-xz/dist-bzip2/' configure.ac %endif %build @@ -860,6 +858,7 @@ if [ "$ver" != "%{version}" ]; then fi %{__libtoolize} +%{__autoheader} %{__aclocal} %{__autoconf} %{__automake} @@ -889,13 +888,12 @@ 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 \ $RPM_BUILD_ROOT/var/lib/lighttpd \ - $RPM_BUILD_ROOT/var/cache/lighttpd/mod_compress \ - $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}} + $RPM_BUILD_ROOT/var/cache/lighttpd/mod_compress %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -905,15 +903,11 @@ cp -p %{SOURCE2} %{SOURCE3} mime.types.conf $RPM_BUILD_ROOT%{_sysconfdir} cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/%{name} cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc -cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/init/%{name}.conf -cp -p %{SOURCE16} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf -cp -p %{SOURCE17} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service rm -f $RPM_BUILD_ROOT%{_libdir}/*.la # Install lighttpd images cp -p %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT%{_lighttpddir}/html -cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_lighttpddir}/html/pld_button.png cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_lighttpddir}/html/index.html # NOTE: the order of the modules is somewhat important as the modules are @@ -938,7 +932,9 @@ cp -p %{SOURCE109} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evasive.conf cp -p %{SOURCE110} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evhost.conf cp -p %{SOURCE112} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_fastcgi.conf cp -p %{SOURCE113} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_flv_streaming.conf +%if %{with h264_streaming} cp -p %{SOURCE136} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_h264_streaming.conf +%endif cp -p %{SOURCE114} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_indexfile.conf cp -p %{SOURCE115} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy.conf cp -p %{SOURCE118} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_rrdtool.conf @@ -1001,14 +997,12 @@ for a in access.log error.log breakage.log; do fi done /sbin/chkconfig --add %{name} -%systemd_post %{name}.service %preun if [ "$1" = "0" ]; then %service %{name} stop /sbin/chkconfig --del %{name} fi -%systemd_preun %{name}.service %postun if [ "$1" = "0" ]; then @@ -1016,7 +1010,6 @@ if [ "$1" = "0" ]; then %groupremove lighttpd %groupremove http fi -%systemd_reload %posttrans # minimizing lighttpd restarts logics. we restart webserver: @@ -1115,7 +1108,6 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.types.conf %attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.user -%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} %attr(750,root,root) %dir /var/log/archive/%{name} @@ -1124,8 +1116,6 @@ fi %attr(644,lighttpd,lighttpd) %ghost /var/log/%{name}/error.log %attr(644,lighttpd,lighttpd) %ghost /var/log/%{name}/breakage.log %dir %attr(770,root,lighttpd) /var/run/%{name} -%{systemdtmpfilesdir}/%{name}.conf -%{systemdunitdir}/%{name}.service %attr(754,root,root) /etc/rc.d/init.d/%{name} %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/* %attr(755,root,root) %{_sbindir}/lighttpd @@ -1231,10 +1221,12 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_flv_streaming.conf %attr(755,root,root) %{_libdir}/mod_flv_streaming.so +%if %{with h264_streaming} %files mod_h264_streaming %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_h264_streaming.conf %attr(755,root,root) %{_libdir}/mod_h264_streaming.so +%endif %files mod_indexfile %defattr(644,root,root,755)