Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pkg-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
pkg-varnish-cache
Commits
0ab5dad8
Commit
0ab5dad8
authored
Mar 02, 2018
by
Dridi Boukelmoune
Committed by
Denis Brækhus
Mar 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass the Varnish version via RPM macros
And use the "v_rc" release for weekly packages.
parent
3a10a737
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
package-rpm
package-rpm
+5
-4
varnish.spec
redhat/varnish.spec
+6
-6
No files found.
package-rpm
View file @
0ab5dad8
...
@@ -32,11 +32,10 @@ TGZ_SOURCE=$(basename "$TGZ_SOURCE" .tgz)
...
@@ -32,11 +32,10 @@ TGZ_SOURCE=$(basename "$TGZ_SOURCE" .tgz)
tar
zcf
"
$TGZ_SOURCE
.tgz"
varnish-
*
/
tar
zcf
"
$TGZ_SOURCE
.tgz"
varnish-
*
/
if
[
-n
"
${
WEEKLY_VERSION
:-}
"
]
;
then
if
[
-n
"
${
WEEKLY_VERSION
:-}
"
]
;
then
sed
-i
-e
"s/^Version:.*/Version:
$WEEKLY_VERSION
/"
./
*
/varnish.spec
RPMVERSION
=
"
${
WEEKLY_VERSION
}
"
sed
-i
-e
"s/.*define v_rc.*/
\%
define v_rc 0/"
./
*
/varnish.spec
RELEASE
=
weekly
else
else
sed
-i
-e
"s/^Version:.*/Version:
$MAJOR
.
$MINOR
/"
./
*
/varnish.spec
RPMVERSION
=
"
${
MAJOR
}
.
${
MINOR
}
"
sed
-i
-e
"s/.*define v_rc.*/
\%
define v_rc
$RELEASE
/"
./
*
/varnish.spec
fi
fi
# while debugging, disable make check since it takes 15-20 minutes to run.
# while debugging, disable make check since it takes 15-20 minutes to run.
...
@@ -49,7 +48,9 @@ mock() {
...
@@ -49,7 +48,9 @@ mock() {
--resultdir
"varnish-
${
MAJOR
}
/
${
ELVER
}
"
\
--resultdir
"varnish-
${
MAJOR
}
/
${
ELVER
}
"
\
--define
"_smp_mflags -j10"
\
--define
"_smp_mflags -j10"
\
--define
"dist .
${
ELVER
}
"
\
--define
"dist .
${
ELVER
}
"
\
--define
"versiontag
${
RPMVERSION
}
"
\
--define
"releasetag
${
RPMRELEASE
:-
1
}
"
\
--define
"releasetag
${
RPMRELEASE
:-
1
}
"
\
--define
"v_rc
${
RELEASE
}
"
\
"
$@
"
"
$@
"
}
}
...
...
redhat/varnish.spec
View file @
0ab5dad8
%define v_rc beta1
%define vd_rc %{?v_rc:-%{?v_rc}}
%define vd_rc %{?v_rc:-%{?v_rc}}
%define srcname %{name}-%{version}%{?vd_rc}
%define _use_internal_dependency_generator 0
%define _use_internal_dependency_generator 0
%define __find_provides %{_builddir}/%{
name}-%{version}%{?vd_rc
}/find-provides
%define __find_provides %{_builddir}/%{
srcname
}/find-provides
%define debug_package %{nil}
%define debug_package %{nil}
%define _enable_debug_package 0
%define _enable_debug_package 0
%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
Summary: High-performance HTTP accelerator
Summary: High-performance HTTP accelerator
Name: varnish
Name: varnish
Version:
3.0.0
Version:
%{versiontag}
Release: %{releasetag}%{?dist}
Release: %{releasetag}%{?dist}
License: BSD
License: BSD
Group: System Environment/Daemons
Group: System Environment/Daemons
URL: https://www.varnish-cache.org/
URL: https://www.varnish-cache.org/
Source: %{
name}-%{version}%{?vd_rc
}.tgz
Source: %{
srcname
}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake
BuildRequires: automake
...
@@ -77,8 +78,7 @@ Development files for %{name}-libs
...
@@ -77,8 +78,7 @@ Development files for %{name}-libs
Varnish Cache is a high-performance HTTP accelerator
Varnish Cache is a high-performance HTTP accelerator
%prep
%prep
%setup -n varnish-%{version}%{?vd_rc}
%setup -q -n %{srcname}
#%setup -q -n varnish-trunk
%build
%build
%if 0%{?rhel} == 6
%if 0%{?rhel} == 6
...
...
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