Merge remote-tracking branch 'origin/pr/567'

* origin/pr/567:
  Do not include rpath in release builds
  rpm: fix directories ownership
  rpm: use /usr/etc/security instead of /etc/security on openSUSE

Author: marmarek

misc/Makefile

@@ -2,6 +2,7 @@ BINDIR ?= /usr/bin
 DATADIR ?= /usr/share
 SYSLIBDIR ?= /lib
 LIBDIR ?= /usr/lib
+ETCSECURITYDIR ?= /etc/security
 QUBESLIBDIR := $(LIBDIR)/qubes
 UDEVRULESDIR := $(SYSLIBDIR)/udev/rules.d
 QUBESDATADIR := $(DATADIR)/qubes
@@ -52,7 +53,7 @@ install:
 	install -m 0755 -d $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml
 	install -m 0644 -t $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml xfce4-notifyd.xml
 	install -m 0644 -t $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml displays.xml
-	install -m 0644 -D -t $(DESTDIR)/etc/security/limits.d 90-qubes-core.conf
+	install -m 0644 -D -t $(DESTDIR)$(ETCSECURITYDIR)/limits.d 90-qubes-core.conf
 	install -m 0644 -D -t $(DESTDIR)/usr/lib/sysctl.d 20-qubes-core.conf
 
 marker-vm: marker-vm.in

qubes-rpc/Makefile

@@ -19,12 +19,15 @@ LDLIBS := -lqubes-rpc-filecopy -lqubes-pure
 
 all:	vm-file-editor qopen-in-vm qfile-agent qfile-unpacker tar2qfile qubes-fs-tree-check bin-qfile-unpacker
 
+ifdef DEVEL_BUILD
 # Ensure that these programs can find their shared libraries,
 # even when installed in e.g. a TemplateBasedVM to somewhere other
 # than /usr.
 vm-file-editor qopen-in-vm qfile-agent qfile-unpacker tar2qfile qubes-fs-tree-check: LDFLAGS += '-Wl,-rpath,$$ORIGIN/../../$$LIB'
 # This is installed in /usr/bin, not /usr/lib/qubes, so it needs a different rpath.
 bin-qfile-unpacker: LDFLAGS += '-Wl,-rpath,$$ORIGIN/../$$LIB'
+endif
+
 bin-qfile-unpacker: qfile-unpacker.o gui-fatal.o
 	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 qubes-fs-tree-check: LDLIBS := -lqubes-pure

rpm_spec/core-agent.spec.in

@@ -220,6 +220,7 @@ BuildRequires: sudo
 BuildRequires: dracut
 BuildRequires: ca-certificates
 BuildRequires: qubes-core-qrexec
+BuildRequires: xdg-desktop-portal
 %endif
 # for update-mime-database
 BuildRequires: shared-mime-info
@@ -490,6 +491,10 @@ usermod -L root
 
 %install
 
+%if 0%{?is_opensuse}
+export ETCSECURITYDIR=/usr/etc/security
+%endif
+
 make install-vm PYTHON=%{__python3} "DESTDIR=$RPM_BUILD_ROOT" SYSTEM_DROPIN_DIR=%{_unitdir} SYSLIBDIR=/usr/lib ENABLE_SELINUX=%with_selinux
 make -C app-menu DESTDIR=$RPM_BUILD_ROOT install
 make -C boot DESTDIR=$RPM_BUILD_ROOT install
@@ -985,7 +990,11 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/dconf/db/local.d/dpi
 %config(noreplace) /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
 %config(noreplace) /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/displays.xml
+%if 0%{?is_opensuse}
+%config(noreplace) /usr/etc/security/limits.d/90-qubes-core.conf
+%else
 %config(noreplace) /etc/security/limits.d/90-qubes-core.conf
+%endif
 /usr/lib/sysctl.d/20-qubes-core.conf
 %_udevrulesdir/50-qubes-mem-hotplug.rules
 %_unitdir/[email protected]/90-session-stop-timeout.conf
@@ -1317,6 +1326,7 @@ The Qubes core startup configuration for SystemD init.
 %dir %_unitdir/sysinit.target.d
 %_unitdir/sysinit.target.d/30_qubes.conf
 %_unitdir/systemd-nsresourced.service.d/30_qubes.conf
+%dir %_unitdir/systemd-nsresourced.socket.d
 %_unitdir/systemd-nsresourced.socket.d/30_qubes.conf
 %dir %_userunitdir/*.service.d
 %_userunitdir/tracker-extract-3.service.d/30_qubes.conf