Skip to content

Commit

Permalink
rpm: do not install kde4 files on openSUSE
Browse files Browse the repository at this point in the history
It isn't packaged there, and the build complains about missing directory
owner.

QubesOS/qubes-issues#6567
  • Loading branch information
marmarek committed Nov 5, 2023
1 parent c4eba78 commit fc9075d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,20 @@ PYTHON ?= python3
build:
make manpages -C doc

install-vm:
install-vm: install-service install-gnome install-kde4

install-service:
make install -C doc
$(PYTHON) setup.py install -O1 $(PYTHON_PREFIX_ARG) --root $(DESTDIR)
install -d $(DESTDIR)/etc/qubes-rpc
ln -s ../../usr/lib/qubes/qpdf-convert-server $(DESTDIR)/etc/qubes-rpc/qubes.PdfConvert
install -D qvm-convert-pdf.gnome $(DESTDIR)/usr/lib/qubes/qvm-convert-pdf.gnome

install-gnome:
install -d $(DESTDIR)/usr/share/nautilus-python/extensions
install -m 0644 qvm_convert_pdf_nautilus.py $(DESTDIR)/usr/share/nautilus-python/extensions

install-kde4:
install -d $(DESTDIR)/usr/share/kde4/services
install -m 0644 qvm-convert-pdf.desktop $(DESTDIR)/usr/share/kde4/services

Expand Down
8 changes: 7 additions & 1 deletion rpm_spec/qpdf-converter.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@ The Qubes service for converting untrusted PDF files into trusted ones.

%install
rm -rf $RPM_BUILD_ROOT
make install-vm DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3}
make install-service DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3}
make install-gnome DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3}
%if !0%{?is_opensuse}
make install-kde4 DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3}
%endif

%clean
rm -rf $RPM_BUILD_ROOT
Expand All @@ -67,7 +71,9 @@ rm -rf $RPM_BUILD_ROOT
/usr/lib/qubes/qvm-convert-pdf.gnome
/usr/bin/qvm-convert-pdf
/usr/share/nautilus-python/extensions/qvm_convert_pdf_nautilus.py*
%if !0%{?is_opensuse}
/usr/share/kde4/services/qvm-convert-pdf.desktop
%endif
%{_mandir}/man1/qvm-convert-pdf.1*
%dir %{python3_sitelib}/qubespdfconverter-*.egg-info
%{python3_sitelib}/qubespdfconverter-*.egg-info/*
Expand Down

0 comments on commit fc9075d

Please sign in to comment.