- updated systemd.macros to match current PLD macros

diff --git a/macros.systemd b/macros.systemd
index 52d598c5e6654601946b4de9d3c50de68b738810..80cca623e1c90f1490b458090c0a2e3326e1ae87 100644 (file)
--- a/macros.systemd
+++ b/macros.systemd
@@ -1,5 +1,27 @@
 # Disable all systemd related macros
 
+%systemd_requires %{nil}
+%systemd_ordering %{nil}
+%__systemd_someargs_0() %{nil}
+%__systemd_twoargs_2() %{nil}
+%systemd_post() %{nil}
+%systemd_user_post() %{nil}
+%systemd_preun() %{nil}
+%systemd_user_preun() %{nil}
+%systemd_postun() %{nil}
+%systemd_user_postun() %{nil}
+%systemd_postun_with_restart() %{nil}
+%systemd_user_postun_with_restart() %{nil}
+%udev_hwdb_update() %{nil}
+%udev_rules_update() %{nil}
+%journal_catalog_update() %{nil}
+%tmpfiles_create() %{nil}
+%sysusers_create() %{nil}
+%sysusers_create_inline() %{nil}
+%sysusers_create_package() %{nil}
+%tmpfiles_create_package() %{nil}
+%sysctl_apply() %{nil}
+%binfmt_apply() %{nil}
 %systemd_reload %{nil}
 %systemd_service_enable() %{nil}
 %systemd_service_disable() %{nil}
@@ -9,22 +31,46 @@
 %systemd_service_restart() %{nil}
 %systemd_service_reload() %{nil}
 %systemd_trigger() %{nil}
-%systemd_post() %{nil}
-%systemd_user_post %{nil}
-%systemd_preun() %{nil}
-%systemd_user_preun %{nil}
-%systemd_postun() %{nil}
-%systemd_user_postun() %{nil}
 
 # Keep paths for systemd related files
-%systemdunitdir /lib/systemd/system
-%systemduserunitdir /usr/lib/systemd/user
-%systemdtmpfilesdir /usr/lib/tmpfiles.d
-%journal_catalog_update %{nil}
+# Notes:
+# %_sysctldir is TLD specific path, default in systemd is /usr/lib/sysctl.d
+# %_modprobedir is used in kmod
+
+%_systemd_util_dir /lib/systemd
+%_unitdir /lib/systemd/system
+%_userunitdir /usr/lib/systemd/user
+%_presetdir /lib/systemd/system-preset
+%_userpresetdir /usr/lib/systemd/user-preset
+%_udevhwdbdir /lib/udev/hwdb.d
+%_udevrulesdir /lib/udev/rules.d
+%_journalcatalogdir /usr/lib/systemd/catalog
+%_binfmtdir /usr/lib/binfmt.d
+%_sysctldir /etc/sysctl.d
+%_sysusersdir /usr/lib/sysusers.d
+%_tmpfilesdir /usr/lib/tmpfiles.d
+%_user_tmpfilesdir /usr/share/user-tmpfiles.d
+%_environmentdir /usr/lib/environment.d
+%_modulesloaddir /usr/lib/modules-load.d
+%_modprobedir /lib/modprobe.d
+%_systemdgeneratordir /lib/systemd/system-generators
+%_systemdusergeneratordir /usr/lib/systemd/user-generators
+%_systemd_system_env_generator_dir /usr/lib/systemd/system-environment-generators
+%_systemd_user_env_generator_dir /usr/lib/systemd/user-environment-generators
+
+%systemdunitdir %_unitdir
+%systemduserunitdir %_userunitdir
+%systemdtmpfilesdir %_tmpfilesdir
+
+# Macro for excluding systemd related paths from package contents
 
-# Macro for excluding above paths from package contents
 %exclude_systemd_files\
 %exclude /lib/systemd\
 %exclude /usr/lib/systemd\
-%exclude %{systemdtmpfilesdir}\
+%exclude %{_binfmtdir}\
+%exclude %{_sysusersdir}\
+%exclude %{_tmpfilesdir}\
+%exclude %{_user_tmpfilesdir}\
+%exclude %{_environmentdir}\
+%exclude %{_modulesloaddir}\
 %{nil}

diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index 394ca299ee995fcd00952c7fbe83753e97942f62..49ade3397b2b020b71d667627ee335b6fb9e56f1 100644 (file)
--- a/rpm-tld-macros.spec
+++ b/rpm-tld-macros.spec
@@ -6,7 +6,7 @@ Summary:        TLD Linux RPM macros
 Summary(pl.UTF-8):     Makra RPM dla Linuksa TLD
 Name:          rpm-tld-macros
 Version:       %{rpm_macros_rev}
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Development/Building
 Source0:       macros.tld