Skip to content

Commit cb78429

Browse files
committed
Merge remote-tracking branch 'origin/pr/23'
* origin/pr/23: rpm: fix usage of %dist macro rpm: adjust for openSUSE
2 parents 2303fff + 48cacb5 commit cb78429

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

rpm_spec/split-gpg2.spec.in

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: split-gpg2
22
Version: @VERSION@
3-
Release: 1%{dist}
3+
Release: 1%{?dist}
44
Summary: split-gpg2 for Qubes
55
BuildArch: noarch
66

@@ -13,10 +13,19 @@ BuildRequires: make
1313
BuildRequires: python3-rpm-macros
1414
BuildRequires: systemd-rpm-macros
1515
BuildRequires: python%{python3_pkgversion}-setuptools
16+
%if 0%{?is_opensuse}
17+
# for directory ownership
18+
BuildRequires: qubes-core-qrexec
19+
BuildRequires: gpg2
20+
%endif
1621
Requires: python3-pyxdg
1722
Requires: socat
1823
Requires: bash
24+
%if 0%{?is_opensuse}
25+
Requires: gpg2 >= 2.1.0
26+
%else
1927
Requires: gnupg2 >= 2.1.0
28+
%endif
2029
Requires: systemd
2130
Requires: zenity
2231
Recommends: libnotify
@@ -68,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
6877
/usr/share/doc/split-gpg2/
6978

7079
%files tests
80+
%dir /usr/share/split-gpg2-tests
7181
/usr/share/split-gpg2-tests/test_evolution.py*
7282
/usr/share/split-gpg2-tests/test_thunderbird.py*
7383
/usr/share/split-gpg2-tests/test_smtpd.py*

0 commit comments

Comments
 (0)