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
b0056eca
Commit
b0056eca
authored
May 04, 2020
by
Guillaume Quintard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'weekly'
weekly is now dead, we use master for weeklies now
parents
edf0bc26
4a653c3f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
APKBUILD
alpine/APKBUILD
+1
-1
package-deb
package-deb
+8
-0
varnish.spec
redhat/varnish.spec
+5
-0
No files found.
alpine/APKBUILD
View file @
b0056eca
...
@@ -21,7 +21,7 @@ options="!check" # tests pass, but ran before packaging
...
@@ -21,7 +21,7 @@ options="!check" # tests pass, but ran before packaging
depends="gcc libc-dev libgcc"
depends="gcc libc-dev libgcc"
depends_dev=
depends_dev=
makedepends="$depends_dev pcre-dev ncurses-dev libedit-dev py-docutils
makedepends="$depends_dev pcre-dev ncurses-dev libedit-dev py-docutils
linux-headers libunwind-dev python py3-sphinx"
linux-headers libunwind-dev python
3
py3-sphinx"
install="$pkgname.pre-install"
install="$pkgname.pre-install"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs"
pkgusers="varnish"
pkgusers="varnish"
...
...
package-deb
View file @
b0056eca
...
@@ -36,6 +36,8 @@ MINOR=${VERSION##*.} # 1 or 0-rc1
...
@@ -36,6 +36,8 @@ MINOR=${VERSION##*.} # 1 or 0-rc1
MINOR
=
${
MINOR
%%-*
}
# 1 or 0
MINOR
=
${
MINOR
%%-*
}
# 1 or 0
RELEASE
=
${
VERSION
#*-
}
# 5.2.1 or rc1
RELEASE
=
${
VERSION
#*-
}
# 5.2.1 or rc1
RELEASE
=
${
RELEASE
#
$VERSION
}
# '' or rc1
RELEASE
=
${
RELEASE
#
$VERSION
}
# '' or rc1
BUILD_NUMBER
=
${
BUILD_NUMBER
:-
none
}
BUILD_ID
=
${
BUILD_ID
:-
none
}
# Take version override set on Jenkins builds into account.
# Take version override set on Jenkins builds into account.
if
[
-n
"
${
WEEKLY_VERSION
:-}
"
]
if
[
-n
"
${
WEEKLY_VERSION
:-}
"
]
...
@@ -49,6 +51,12 @@ then
...
@@ -49,6 +51,12 @@ then
VERSION
=
"
$MAJOR
.
$MINOR
"
VERSION
=
"
$MAJOR
.
$MINOR
"
DEBVERSION
=
"
${
DEBVERSION
:-}
"
DEBVERSION
=
"
${
DEBVERSION
:-}
"
DCH_TEXT
=
"Release build #
$BUILD_NUMBER
ID:
$BUILD_ID
"
DCH_TEXT
=
"Release build #
$BUILD_NUMBER
ID:
$BUILD_ID
"
elif
[
"
${
VERSION
}
"
=
"trunk"
]
then
VERSION
=
$(
date
+%Y%m%d%H%M%S
)
RELEASE
=
DEBVERSION
=
trunk
DCH_TEXT
=
"Trunk build from git"
else
else
VERSION
=
"
$MAJOR
.
$MINOR
"
VERSION
=
"
$MAJOR
.
$MINOR
"
DEBVERSION
=
"0
${
RELEASE
}
+daily+
$(
date
+%Y%m%d.%H%M%S
)
"
DEBVERSION
=
"0
${
RELEASE
}
+daily+
$(
date
+%Y%m%d.%H%M%S
)
"
...
...
redhat/varnish.spec
View file @
b0056eca
%global __python %{__python3}
%global vd_rc %{?v_rc:0.%{?v_rc}.}
%global vd_rc %{?v_rc:0.%{?v_rc}.}
%global debug_package %{nil}
%global debug_package %{nil}
%global _use_internal_dependency_generator 0
%global _use_internal_dependency_generator 0
...
@@ -13,11 +14,15 @@ Group: System Environment/Daemons
...
@@ -13,11 +14,15 @@ Group: System Environment/Daemons
URL: https://www.varnish-cache.org/
URL: https://www.varnish-cache.org/
Source: %{srcname}.tgz
Source: %{srcname}.tgz
BuildRequires: diffutils
BuildRequires: gcc
BuildRequires: jemalloc-devel
BuildRequires: jemalloc-devel
BuildRequires: libedit-devel
BuildRequires: libedit-devel
BuildRequires: make
BuildRequires: ncurses-devel
BuildRequires: ncurses-devel
BuildRequires: pcre-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: pkgconfig
BuildRequires: python3
BuildRequires: python3-sphinx
BuildRequires: python3-sphinx
Requires: gcc
Requires: gcc
...
...
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