diff --git a/nginx.spec b/nginx.spec index 18aa601..b196c3e 100644 --- a/nginx.spec +++ b/nginx.spec @@ -16,7 +16,7 @@ Name: nginx Epoch: 1 Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons @@ -27,6 +27,26 @@ URL: http://nginx.org/ Source0: http://nginx.org/download/nginx-%{version}.tar.gz Source1: http://nginx.org/download/nginx-%{version}.tar.gz.asc +# SOURCES: +# fedpkg -a clone nginx +# cd nginx +# git clone https://github.com/arut/nginx-mtask-module.git +# cd nginx-mtask-module +# git tag +# git archive v0.0.2 --format tar.gz --prefix nginx-mtask-module/ --output=../nginx-mtask-module-v0.0.2.tar.gz +# cd .. +# git clone https://github.com/arut/nginx-mysql-module.git +# cd nginx-mysql-module +# git tag +# git archive v0.0.4 --format tar.gz --prefix nginx-mysql-module/ --output=../nginx-mysql-module-v0.0.4.tar.gz +# cd .. +# rpmdev-bumpspec -c "Adding mtask and mysql modules to build" nginx.spec +# vim nginx.spec +# git diff +# fedpkg srpm +# mock nginx-*.src.rpm +Source2: nginx-mtask-module-v0.0.2.tar.gz +Source3: nginx-mysql-module-v0.0.4.tar.gz Source10: nginx.service Source11: nginx.logrotate Source12: nginx.conf @@ -62,6 +82,7 @@ Requires: pcre Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires(pre): shadow-utils Provides: webserver +BuildRequires: mariadb-devel %if 0%{?fedora} >= 16 BuildRequires: systemd @@ -81,7 +102,7 @@ memory usage. %prep -%setup -q +%setup -q -a 2 -a 3 %patch0 -p0 @@ -138,6 +159,8 @@ export DESTDIR=%{buildroot} --with-google_perftools_module \ %endif --with-debug \ + --add-module="nginx-mysql-module" \ + --add-module="nginx-mtask-module" \ --with-cc-opt="%{optflags} $(pcre-config --cflags)" \ --with-ld-opt="$RPM_LD_FLAGS -Wl,-E" # so the perl module finds its symbols @@ -268,6 +291,9 @@ fi %changelog +* Sat Dec 21 2013 "D. Johnson" - 1:1.4.4-2 +- Adding mtask and mysql modules to build + * Wed Nov 20 2013 Peter Borsa - 1:1.4.4-1 - Update to upstream release 1.4.4 - Security fix BZ 1032267