Skip to content

Commit 6106c95

Browse files
committed
Fix up core
1 parent 03592ce commit 6106c95

File tree

4 files changed

+24
-1
lines changed

4 files changed

+24
-1
lines changed

Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ all:clean
77

88
.PHONY: clean
99
clean:
10-
rm -rf resty/*.yml *.spec
10+
find resty ! -name 'core.yml' -type f -exec rm -f {} +
11+
rm -rf *.spec

lua-resty-core.spec

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ Requires: lua(abi) = %{luaver}
2222
Requires: lua >= %{luaver}
2323
%endif
2424

25+
26+
Requires: lua-resty-lrucache
27+
28+
Obsoletes: lua-resty <= 0.1.17
2529
BuildArch: noarch
2630

2731
%description

resty/core.yml

+6
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
repo: openresty/lua-resty-core
22
summary: New FFI-based API for lua-nginx-module
3+
requires:
4+
- lua-resty-lrucache
5+
obsoletes:
6+
- "lua-resty <= 0.1.17"
7+
comment: |
8+
# at resty/core/regex.lua:8: uses module 'resty.lrucache'

spec.j2

+12
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,18 @@ Requires: lua(abi) = %{luaver}
2222
Requires: lua >= %{luaver}
2323
%endif
2424

25+
{% if requires is defined and requires is iterable %}
26+
{% for r in requires -%}
27+
Requires: {{ r }}
28+
{% endfor -%}
29+
{%- endif -%}
30+
31+
{% if obsoletes is defined and obsoletes is iterable %}
32+
{% for o in obsoletes -%}
33+
Obsoletes: {{ o }}
34+
{% endfor -%}
35+
{%- endif -%}
36+
2537
BuildArch: noarch
2638

2739
%description

0 commit comments

Comments
 (0)