Use _pkgdocdir macro on fedora

This commit is contained in:
Ingvar Hagelund 2014-04-22 17:09:39 +02:00
parent 1abd537616
commit 8c4cc52d0e
5 changed files with 32 additions and 8 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ varnish-2.1.3.tar.gz
/varnish-3.0.3.tar.gz
/varnish-3.0.4.tar.gz
/varnish-3.0.5.tar.gz
/varnish-4.0.0.tar.gz

View File

@ -1 +1 @@
674d44775cc927aee4601edb37f60198 varnish-3.0.5.tar.gz
05af2deae29f37b166392a0237756250 varnish-4.0.0.tar.gz

View File

@ -0,0 +1,10 @@
--- doc/sphinx/Makefile.in.orig 2014-04-22 11:12:19.029824740 +0200
+++ doc/sphinx/Makefile.in 2014-04-22 11:14:09.493153140 +0200
@@ -553,6 +553,7 @@
rm -rf $(BUILDDIR)
include/params.rst: $(top_builddir)/bin/varnishd/varnishd
+ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnish/.libs:$(top_builddir)/lib/libvarnishcompat/.libs:$(top_builddir)/lib/libvcc/.libs:$(top_builddir)/lib/libvgz/.libs \
$(top_builddir)/bin/varnishd/varnishd -x dumprstparam > include/params.rst
# XXX add varnishstat here when it's been _opt2rst'ed

View File

@ -0,0 +1,11 @@
--- configure.orig 2014-03-11 23:25:41.618988565 +0100
+++ configure 2014-03-11 23:26:03.480225451 +0100
@@ -16746,7 +16746,7 @@
# The reason for -Wno-error=unused-result is a glibc/gcc interaction
# idiocy where write is marked as warn_unused_result, causing build
# failures.
-CFLAGS="${CFLAGS} -Wall -Werror"
+#CFLAGS="${CFLAGS} -Wall -Werror"
OCFLAGS="${OCFLAGS} -Wall -Werror"
as_CACHEVAR=`$as_echo "ax_cv_check_cflags__-Werror=unused-result" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unused-result" >&5

View File

@ -6,7 +6,7 @@
Summary: High-performance HTTP accelerator
Name: varnish
Version: 4.0.0
Release: 1%{?v_rc}%{?dist}
Release: 2%{?v_rc}%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://www.varnish-cache.org/
@ -16,8 +16,6 @@ Source0: http://repo.varnish-cache.org/source/%{name}-%{version}.tar.gz
#Source0: http://repo.varnish-cache.org/snapshots/%{name}-%{version}%{?vd_rc}.tar.gz
Patch1: varnish-4.0.0.fix_ld_library_path_in_sphinx_build.patch
Patch2: varnish-4.0.0_fix_Werror_el6.patch
Patch3: varnish-4.0.0.fix_default_thread_pool_stack.patch
Patch4: varnish-4.0.0-beta1.fixes_ppc64_upstream_bug_1469.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# To build from git, start with a make dist, see redhat/README.redhat
# You will need at least automake autoconf libtool python-docutils
@ -102,13 +100,12 @@ Documentation files for %name
%if 0%{?rhel} <= 6
%patch2 -p0
%endif
%patch3 -p1
%patch4 -p1
%build
#export CFLAGS="$CFLAGS -Wp,-D_FORTIFY_SOURCE=0"
# Remove "--disable static" if you want to build static libraries
%configure --disable-static --localstatedir=/var/lib --docdir=%{_docdir}/%{name}-%{version}/examples
%configure --disable-static --localstatedir=/var/lib --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
# We have to remove rpath - not allowed in Fedora
# (This problem only visible on 64 bit arches)
@ -308,12 +305,17 @@ fi
%endif
%changelog
* Tue Apr 22 2014 Ingvar Hagelund <ingvar@redpill-linpro.com> 4.0.0-2
- Use _pkgdocdir macro on fedora
* Fri Apr 11 2014 Ingvar Hagelund <ingvar@redpill-linpro.com> 4.0.0-1
- New upstream release
- Updated patches to match new release
- Dropped patches included upstream
* Tue Apr 01 2014 Ingvar Hagelund <ingvar@redpill-linpro.com> 4.0.0-0.4.beta1
- New upstream beta release
- Added a few patches from upstream for building on ppc
- Added a few patches from upstream git for building on ppc
* Wed Mar 12 2014 Ingvar Hagelund <ingvar@redpill-linpro.com> 4.0.0-0.3.tp2+20140327
- Daily snapshot build