remove service files, using user-unit files

diff --git a/enlightenment.spec b/enlightenment.spec
index b23c76423b0f0bd691dfde22010ea77f4ad7a5b5..1b0e82734e0577bc70fbd22e44c5592c8241c6ea 100644 (file)
--- a/enlightenment.spec
+++ b/enlightenment.spec
@@ -46,11 +46,9 @@ rm -f `find $RPM_BUILD_ROOT/usr/lib/enlightenment -name "*.la" -print`
 %clean
 test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-, root, root)

diff --git a/packaging/enlightenment.spec b/packaging/enlightenment.spec
index 2601ffa0fc20fd5b8e3cb07180de74dc17cdd56e..5666fef47958fd6fb7c14632a61db680eedab496 100644 (file)
--- a/packaging/enlightenment.spec
+++ b/packaging/enlightenment.spec
@@ -36,7 +36,7 @@ BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 
-Source1:       e17.service
+# Patches auto-generated by git-buildpackage:
 %description
 Enlightenment is a window manager.
 
@@ -53,7 +53,6 @@ Development files for enlightenment
 
 
 %build
-
 %configure  --enable-device-udev \
            --enable-mount-eeze \
            --disable-comp
@@ -63,17 +62,6 @@ make %{?_smp_mflags}
 %make_install
 
 
-mkdir -p %{buildroot}%{_unitdir_user}/core-efl.target.wants
-
-cat > %{buildroot}%{_unitdir_user}/core-efl.target << EOF
-[Unit]
-Description=EFL Target
-Wants=xorg.target
-EOF
-
-install -m 0644 %SOURCE1 %{buildroot}%{_unitdir_user}/
-ln -s ../e17.service %{buildroot}%{_unitdir_user}/core-efl.target.wants/e17.service
-
 %find_lang enlightenment
 %fdupes  %{buildroot}/%{_libdir}/enlightenment
 %fdupes  %{buildroot}/%{_datadir}/enlightenment
@@ -88,10 +76,7 @@ ln -s ../e17.service %{buildroot}%{_unitdir_user}/core-efl.target.wants/e17.serv
 %{_datadir}/enlightenment/*
 %{_datadir}/xsessions/enlightenment.desktop
 %{_sysconfdir}/xdg/menus/enlightenment.menu
-/usr/share/applications/enlightenment_filemanager.desktop
-%{_unitdir_user}/core-efl.target.wants/*.service
-%{_unitdir_user}/core-efl.target
-%{_unitdir_user}/*.service
+%{_datadir}/applications/enlightenment_filemanager.desktop
 
 %files devel
 %defattr(-,root,root,-)