- merged 2011 from PLD

[packages/rpm-tld-macros.git] / macros.systemd

diff --git a/macros.systemd b/macros.systemd
index 312078ccdf5830181e524946235c8320912b7467..1fbb2473130411c28fee3d59da1bd839d7a7ed45 100644 (file)
--- a/macros.systemd
+++ b/macros.systemd
@@ -1,16 +1,16 @@
 # Disable all systemd related macros
 
 %systemd_reload %{nil}
-%systemd_service_enable %{nil}
-%systemd_service_disable %{nil}
-%systemd_service %{nil}
-%systemd_service_start %{nil}
-%systemd_service_stop %{nil}
-%systemd_service_restart %{nil}
-%systemd_service_reload %{nil}
-%systemd_trigger %{nil}
-%systemd_post %{nil}
-%systemd_preun %{nil}
+%systemd_service_enable() %{nil}
+%systemd_service_disable() %{nil}
+%systemd_service() %{nil}
+%systemd_service_start() %{nil}
+%systemd_service_stop() %{nil}
+%systemd_service_restart() %{nil}
+%systemd_service_reload() %{nil}
+%systemd_trigger() %{nil}
+%systemd_post() %{nil}
+%systemd_preun() %{nil}
 
 # Keep paths for systemd related files
 %systemdunitdir /lib/systemd/system
@@ -20,7 +20,7 @@
 
 # Macro for excluding above paths from package contents
 %exclude_systemd_files\
-%exclude %{systemdunitdir}\
-%exclude %{systemduserunitdir}\
+%exclude /lib/systemd\
+%exclude /usr/lib/systemd\
 %exclude %{systemdtmpfilesdir}\
 %{nil}