diff --git a/emacs.changes b/emacs.changes index f87ec31..851bab8 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 23 12:28:52 UTC 2019 - Dr. Werner Fink + +- Use %_userunitdir macro to avoid trouble with %_libdir (boo#1132939) + ------------------------------------------------------------------- Mon Apr 15 12:13:04 UTC 2019 - Dr. Werner Fink diff --git a/emacs.spec b/emacs.spec index e8a45b5..95ecb2f 100644 --- a/emacs.spec +++ b/emacs.spec @@ -67,6 +67,7 @@ BuildRequires: ncurses-devel %if 0%{?suse_version} >= 1500 BuildRequires: system-user-games %endif +BuildRequires: systemd-rpm-macros BuildRequires: update-alternatives BuildRequires: update-desktop-files BuildRequires: xz @@ -500,7 +501,7 @@ mkdir -p %{buildroot}/usr/bin install -m 0755 emacs-nox %{buildroot}/usr/bin/ install -m 0755 emacs-gtk %{buildroot}/usr/bin/ install -m 0755 emacs-x11 %{buildroot}/usr/bin/ -make install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} systemdunitdir=%{_userunitdir} rm -vf %{buildroot}/usr/bin/emacs install -p %{S:5} %{buildroot}/usr/bin/emacs chmod 0755 %{buildroot}/usr/bin/emacs @@ -690,7 +691,7 @@ fi %else %{_prefix}/lib/emacs/%{version}/*-suse-linux*/update-game-score %endif -%{_prefix}/lib/systemd/user/emacs.service +%{_userunitdir}/emacs.service %dir %{_datadir}/doc/packages/emacs/ %{_datadir}/doc/packages/emacs/doc %dir %{_datadir}/emacs/