- merged 1.4.81 from PLD

diff --git a/lighttpd.spec b/lighttpd.spec
index 161a7279ddcddf3f4cc3d3784d6c05db3d8aa586..cc9dba7d28052464616fc8ca97468c96b13ff95b 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -43,12 +43,12 @@
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd

-Version:       1.4.76
+Version:       1.4.81

 Release:       1
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       https://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz
 Release:       1
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       https://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz

-# Source0-md5: f9018cda389b1aa6dae4c5f962c20825
+# Source0-md5: f7a6187732169fad75f2189ff5c967b1

 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user


@@ -116,11 +116,7 @@ URL:               https://www.lighttpd.net/
 %{?with_xattr:BuildRequires:   attr-devel}
 BuildRequires: autoconf >= 2.57
 %{?with_maxminddb:BuildRequires:       libmaxminddb-devel}
 %{?with_xattr:BuildRequires:   attr-devel}
 BuildRequires: autoconf >= 2.57
 %{?with_maxminddb:BuildRequires:       libmaxminddb-devel}

-%if "%{pld_release}" != "ac"

 BuildRequires: automake >= 1:1.11.2
 BuildRequires: automake >= 1:1.11.2

-%else
-BuildRequires: automake
-%endif

 %{?with_bzip2:BuildRequires:   bzip2-devel}
 %{?with_gamin:BuildRequires:   gamin-devel}
 %{?with_storage_gdbm:BuildRequires:    gdbm-devel}
 %{?with_bzip2:BuildRequires:   bzip2-devel}
 %{?with_gamin:BuildRequires:   gamin-devel}
 %{?with_storage_gdbm:BuildRequires:    gdbm-devel}


@@ -852,20 +848,15 @@ Plik monitrc do monitorowania serwera www lighttpd.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-#%patch100 -p1
+#%%patch100 -p1

 %{?with_h264_streaming:%patch2 -p1}
 %{?with_h264_streaming:%patch2 -p1}

-%patch3 -p1
+%patch -P3 -p1

 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
 
 # build mime.types.conf
 sh %{SOURCE6} /etc/mime.types
 
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
 
 # build mime.types.conf
 sh %{SOURCE6} /etc/mime.types
 

-%if "%{pld_release}" == "ac"
-%{__sed} -i -e 's/ serial_tests//' configure.ac
-%{__sed} -i -e 's/dist-xz/dist-bzip2/' configure.ac
-%endif
-

 %build
 ver=$(awk -F ',' '/AC_INIT/{a=$2;gsub(/[\[\],]/, "", a); print a}' configure.ac)
 if [ "$ver" != "%{version}" ]; then
 %build
 ver=$(awk -F ',' '/AC_INIT/{a=$2;gsub(/[\[\],]/, "", a); print a}' configure.ac)
 if [ "$ver" != "%{version}" ]; then


@@ -873,7 +864,9 @@ if [ "$ver" != "%{version}" ]; then
        exit 1
 fi
 
        exit 1
 fi
 

-%{__aclocal} -I m4 -I scripts/m4
+# unused but aclocal wants it
+install -d m4
+%{__aclocal} -I scripts/m4

 %{__libtoolize}
 %{__autoconf}
 %{__autoheader}
 %{__libtoolize}
 %{__autoconf}
 %{__autoheader}