Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
27ccc764
Commit
27ccc764
authored
Oct 06, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
ssh://git.varnish-cache.org/git/varnish-cache
parents
0887a4f9
5c2edfc9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
Makefile.am
man/Makefile.am
+4
-1
varnish.spec
redhat/varnish.spec
+7
-3
No files found.
man/Makefile.am
View file @
27ccc764
#
if
HAVE_RST2MAN
noinst_PROGRAMS
=
vsc2rst
endif
vsc2rst_SOURCES
=
vsc2rst.c
\
$(top_srcdir)
/include/vsc_fields.h
...
...
@@ -30,10 +32,11 @@ else
@false
endif
varnish-counters.7
:
vsc2rst
if
HAVE_RST2MAN
varnish-counters.7
:
vsc2rst
./vsc2rst |
${
RST2MAN
}
-
$@
else
varnish-counters.7
:
$(top_srcdir)/include/vsc_fields.h
@
echo
"========================================"
@
echo
"You need rst2man installed to make dist"
@
echo
"========================================"
...
...
redhat/varnish.spec
View file @
27ccc764
%define v_rc
%define vd_rc %{?v_rc:-%{?v_rc}}
Summary: High-performance HTTP accelerator
Name: varnish
Version: 3.
0
.0
Release: 0.2011
0715
%{?dist}
Version: 3.
1
.0
Release: 0.2011
1006%{?v_rc}
%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://www.varnish-cache.org/
#Source0: http://repo.varnish-cache.org/source/%{name}-%{version}.tar.gz
#Source0: %{name}-%{version}%{?vd_rc}.tar.gz
Source0: %{name}-trunk.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# To build from git, start with a make dist, see redhat/README.redhat
...
...
@@ -71,7 +75,7 @@ Documentation files for %name
#Varnish Cache is a high-performance HTTP accelerator
%prep
#%setup -q
#%setup -q
-n varnish-%{version}%{?vd_rc}
%setup -q -n varnish-trunk
mkdir examples
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment