up to 3.0.7

[packages/varnish.git] / varnish.spec

diff --git a/varnish.spec b/varnish.spec
index 768afbd39388d712f31c85142eeba9f29c40e85a..20019d41056797a55b1b2f879765c7acf1a2eab6 100644 (file)
--- a/varnish.spec
+++ b/varnish.spec
@@ -5,16 +5,17 @@
 # Conditional build:
 %bcond_without doc             # build documentation
 %bcond_without tests   # build without tests. binds daemon on 127.0.0.1 9080, 9081, 9001 ports
+%bcond_without source  # build source package
 
 Summary:       Varnish - a high-performance HTTP accelerator
 Summary(pl.UTF-8):     Varnish - wydajny akcelerator HTTP
 Name:          varnish
-Version:       3.0.5
-Release:       2
+Version:       3.0.7
+Release:       1
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://repo.varnish-cache.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 674d44775cc927aee4601edb37f60198
+# Source0-md5: aa63a7808d775c005d020c41f152b7af
 Source1:       %{name}.init
 Source3:       %{name}ncsa.init
 Source4:       %{name}.sysconfig
@@ -23,11 +24,13 @@ Source6:    %{name}.logrotate
 Source8:       %{name}.tmpfiles
 #Patch100:     branch.diff
 Patch0:                no-ccache.patch
+Patch1:                no-sysctl.patch
+Patch2:                ac.patch
 URL:           http://www.varnish-cache.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libstdc++-devel
-BuildRequires: libtool >= 2:1.5
+BuildRequires: libtool >= 2:2.0
 BuildRequires: ncurses-devel
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
@@ -112,8 +115,9 @@ Source code of Varnish for building VMODs.
 %setup -q
 #%patch100 -p0
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
-%{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
 #%{__sed} -i -e 's,$(srcdir)/,,' bin/varnishtest/Makefile.am
 
 %{__sed} -i -e '1s,^#!.*python,#!%{__python},' lib/libvmod_std/vmod.py
@@ -159,17 +163,19 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/secret
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/vmods/*.la
 
+%if %{with source}
 # prepare tree for VMOD build
 install -d $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}/{include,bin/{varnishtest,varnishd},lib/libvmod_std}
-for a in $RPM_BUILD_ROOT%{_includedir}/%{name}/*.h; do
-       f=${a#$RPM_BUILD_ROOT}
-       ln -s $f $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}/include
-done
 
 # add extra headers
 cp -pn include/*.h $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}/include
 cp -p bin/varnishd/*.h $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}/bin/varnishd
 
+for a in $RPM_BUILD_ROOT%{_includedir}/%{name}/*.h; do
+       f=${a#$RPM_BUILD_ROOT}
+       ln -sf $f $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}/include
+done
+
 ln -s %{_bindir}/varnishtest $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}/bin/varnishtest
 ln -s %{_sbindir}/varnishd $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}/bin/varnishd
 cp -p lib/libvmod_std/vmod.py $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}/lib/libvmod_std
@@ -177,6 +183,7 @@ cp -p lib/libvmod_std/vmod.py $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}/lib/l
 # add pkg config variable for eash access
 %{__sed} -i -e '/^vmoddir/a srcdir=%{_usrsrc}/%{name}-%{version}' \
        $RPM_BUILD_ROOT%{_pkgconfigdir}/varnishapi.pc
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -278,6 +285,8 @@ fi
 %{_libdir}/%{name}/libvgz.a
 %{_libdir}/%{name}/vmods/libvmod_std.a
 
+%if %{with source}
 %files source
 %defattr(644,root,root,755)
 %{_usrsrc}/%{name}-%{version}
+%endif