rpms/varnish
5
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream release. Some changes, see rpm changelog

Browse Source
This commit is contained in:
Ingvar Hagelund 2013-11-04 23:50:56 +01:00
parent 5bc2fc68df
commit e89334aea9
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ varnish-2.1.3.tar.gz
/varnish-2.1.5.tar.gz /varnish-2.1.5.tar.gz
/varnish-3.0.2.tar.gz /varnish-3.0.2.tar.gz
/varnish-3.0.3.tar.gz /varnish-3.0.3.tar.gz
/varnish-3.0.4.tar.gz

2
sources
View File

@ -1 +1 @@
714310c83fdbd2061d897dacd3f63d8b varnish-3.0.3.tar.gz a130ce9c3504b9603a46542635e18701 varnish-3.0.4.tar.gz

23
varnish.spec
View File

@ -2,8 +2,8 @@
Summary: High-performance HTTP accelerator Summary: High-performance HTTP accelerator
Name: varnish Name: varnish
Version: 3.0.3 Version: 3.0.4
Release: 6%{?dist} Release: 1%{?dist}
License: BSD License: BSD
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.varnish-cache.org/ URL: http://www.varnish-cache.org/
@ -12,18 +12,18 @@ Source1: varnish.service
Source2: varnish.params Source2: varnish.params
Source3: varnishncsa.service Source3: varnishncsa.service
Source4: varnishlog.service Source4: varnishlog.service
Patch1: varnish.no_pcre_jit.patch
Patch2: varnish.fix_ppc64_upstream_bug_1194.patch Patch2: varnish.fix_ppc64_upstream_bug_1194.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# To build from git, start with a make dist, see redhat/README.redhat # To build from git, start with a make dist, see redhat/README.redhat
# You will need at least automake autoconf libtool python-docutils # You will need at least automake autoconf libtool python-docutils
#BuildRequires: automake autoconf libtool python-docutils #BuildRequires: automake autoconf libtool python-docutils
BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig jemalloc-devel BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig jemalloc-devel libedit-devel
Requires: varnish-libs = %{version}-%{release} Requires: varnish-libs = %{version}-%{release}
Requires: logrotate Requires: logrotate
Requires: ncurses Requires: ncurses
Requires: pcre Requires: pcre
Requires: jemalloc Requires: jemalloc
Requires: redhat-rpm-config
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires(post): /sbin/chkconfig, /usr/bin/uuidgen Requires(post): /sbin/chkconfig, /usr/bin/uuidgen
Requires(preun): /sbin/chkconfig Requires(preun): /sbin/chkconfig
@ -89,10 +89,6 @@ Documentation files for %name
%setup -q %setup -q
#%setup -q -n varnish-cache #%setup -q -n varnish-cache
%ifarch i386 i686 ppc %{arm}
%patch1
%endif
%patch2 %patch2
mkdir examples mkdir examples
@ -121,7 +117,7 @@ EOF
tail -n +11 etc/default.vcl >> redhat/default.vcl tail -n +11 etc/default.vcl >> redhat/default.vcl
%if 0%{?fedora}%{?rhel} == 0 || 0%{?rhel} <= 4 && 0%{?fedora} <= 8 %if 0%{?fedora}%{?rhel} != 0 && 0%{?rhel} <= 4 && 0%{?fedora} <= 8
# Old style daemon function # Old style daemon function
sed -i 's,--pidfile \$pidfile,,g; sed -i 's,--pidfile \$pidfile,,g;
s,status -p \$pidfile,status,g; s,status -p \$pidfile,status,g;
@ -310,6 +306,15 @@ fi
%endif %endif
%changelog %changelog
* Mon Aug 12 2013 Ingvar Hagelund <ingvar@redpill-linpro.com> 3.0.4-1
- New upstream release
- Added libedit-devel to the build reqs
- Changed the old-style initrc sed patching to a blacklist as in upstream
- Some tab vs space cleanup to make rpmlint more happy
- Added requirement of redhat-rpm-config, which provides redhat-hardened-cc1,
needed for _hardened_build, closes #975147
- Removed no-pcre patch, as pcre is now switched off by default upstream
* Sun Jul 28 2013 Dennis Gilmore <dennis@ausil.us> - 3.0.3-6 * Sun Jul 28 2013 Dennis Gilmore <dennis@ausil.us> - 3.0.3-6
- no pcre jit on arm arches - no pcre jit on arm arches