forked from inverse-inc/packetfence
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathpatch.diff
More file actions
29 lines (26 loc) · 2.96 KB
/
patch.diff
File metadata and controls
29 lines (26 loc) · 2.96 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
diff --git a/debian/control b/debian/control
index a557078390..15c2a652e1 100644
--- a/debian/control
+++ b/debian/control
@@ -24,8 +24,8 @@ Pre-Depends: ca-certificates,
packetfence-perl (>= 1.2.4),
# Removed for now
# libmariadbd-dev (>= 10.1), libmariadbd-dev (<< 10.5.18)
-Breaks: libdata-alias-perl
-Conflicts: packetfence-captive-portal-javascript, packetfence-doc, packetfence-pfappserver-javascript
+Breaks: libdata-alias-perl, packetfence-export
+Conflicts: packetfence-captive-portal-javascript, packetfence-doc, packetfence-pfappserver-javascript, packetfence-export
Replaces: packetfence-captive-portal-javascript, packetfence-doc, packetfence-pfappserver-javascript
Depends: ${misc:Depends}, vlan,
packetfence-ntlm-wrapper (>= ${source:Version}), packetfence-golang-daemon (>= ${source:Version}),
diff --git a/rpm/packetfence.spec b/rpm/packetfence.spec
index 30bbcf09c4..6905a19f97 100644
--- a/rpm/packetfence.spec
+++ b/rpm/packetfence.spec
@@ -43,6 +43,8 @@ Obsoletes: %{name}-config <= 9.1.0
AutoReqProv: 0
+Conflicts: packetfence-export
+
Requires: firewalld
Requires: chkconfig, coreutils, grep, openssl, sed, tar, wget, gettext, conntrack-tools, patch, git
# for process management