From 69cde27b563bf6af7ef2b80557745037a0a84c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20V=C3=A4limaa?= Date: Sat, 7 Jan 2023 10:29:57 +0200 Subject: Rename rpm-helper.macros as macros.rpm-helper and install it into /usr/lib/rpm/macros.d --- Makefile | 10 +++---- NEWS | 3 ++ macros.rpm-helper.in | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++ rpm-helper.macros.in | 77 ---------------------------------------------------- 4 files changed, 85 insertions(+), 82 deletions(-) create mode 100644 macros.rpm-helper.in delete mode 100644 rpm-helper.macros.in diff --git a/Makefile b/Makefile index 7259b0d..9383b9e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ SCRIPT_FILES = add-user del-user create-file \ add-group del-group add-shell del-shell verify-shell \ add-syslog del-syslog add-webapp del-webapp \ get-password create-ssl-certificate -MACROS_FILES = rpm-helper.macros +MACROS_FILES = macros.rpm-helper CONF_FILES = ssl TEST_FILES = t/*.t SYSTEMDMIGRATION_FILES = README.systemd @@ -15,7 +15,7 @@ FILES = AUTHORS README COPYING NEWS Makefile \ $(TEST_FILES) $(SYSTEMDMIGRATION_FILES) pkgdatadir = /usr/share/$(PACKAGE) -rpmmacrosdir = /etc/rpm/macros.d +rpmmacrodir = /usr/lib/rpm/macros.d sysconfigdir = /etc/sysconfig systemdmigrationdir = /var/lib/rpm-helper/systemd-migration @@ -25,14 +25,14 @@ all: install: $(MACROS_FILES) install -d -m 755 $(DESTDIR)$(pkgdatadir) cp -p $(SCRIPT_FILES) $(DESTDIR)$(pkgdatadir) - install -d -m 755 $(DESTDIR)$(rpmmacrosdir) - install -m 644 $(MACROS_FILES) $(DESTDIR)/$(rpmmacrosdir) + install -d -m 755 $(DESTDIR)$(rpmmacrodir) + install -m 644 $(MACROS_FILES) $(DESTDIR)/$(rpmmacrodir) install -d -m 755 $(DESTDIR)$(sysconfigdir) install -m 644 $(CONF_FILES) $(DESTDIR)/$(sysconfigdir) install -d -m 755 $(DESTDIR)$(systemdmigrationdir) install -m 644 $(SYSTEMDMIGRATION_FILES) $(DESTDIR)/$(systemdmigrationdir) -rpm-helper.macros: rpm-helper.macros.in +macros.rpm-helper: macros.rpm-helper.in sed -e 's:@pkgdatadir@:$(pkgdatadir):' < $< > $@ clean: diff --git a/NEWS b/NEWS index e06e7fe..cde118e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ + * rename rpm-helper.macros as macros.rpm-helper and install it into + /usr/lib/rpm/macros.d + 2020-12-20 Guillaume Rousse 0.24.21 * revert default key length for SSL certificates to 2048 bits, as it is enough until 2030 according to NIST and other experts: diff --git a/macros.rpm-helper.in b/macros.rpm-helper.in new file mode 100644 index 0000000..1703bc4 --- /dev/null +++ b/macros.rpm-helper.in @@ -0,0 +1,77 @@ +# $Id$ + +%_rpm_helper_dir @pkgdatadir@ + +%_get_password_helper %_rpm_helper_dir/get-password +%_get_password() $(%_get_password_helper %{1}) + +%_create_ghostfile_helper %_rpm_helper_dir/create-file +%create_ghostfile() %_create_ghostfile_helper %{name} $1 %{1} %{2} %{3} %{4} \ +%{nil} + +%_create_ssl_certificate_helper %_rpm_helper_dir/create-ssl-certificate +%_create_ssl_certificate(bg:) %_create_ssl_certificate_helper %{name} $1 %{1} %{?-g:-g %{-g*}} %{?-b:-b} \ +%{nil} + +# initscripts macros +%_add_service_helper %_rpm_helper_dir/add-service +%_post_service() %_add_service_helper %{name} $1 %{*} \ +%{nil} + +%_del_service_helper %_rpm_helper_dir/del-service +%_preun_service() %_del_service_helper %{name} $1 %{*} \ +%{nil} + +%_reread_services_helper %_rpm_helper_dir/reread-services +%_postun_service() %_reread_services_helper %{name} \ +%{nil} + +%_add_user_helper %_rpm_helper_dir/add-user +%_pre_useradd() %_add_user_helper %{name} $1 %{1} %{2} %{3} \ +%{nil} + +%_del_user_helper %_rpm_helper_dir/del-user +%_postun_userdel() %_del_user_helper %{name} $1 %{1} \ +%{nil} + +%_add_group_helper %_rpm_helper_dir/add-group +%_pre_groupadd() %_add_group_helper %{name} $1 %{1} %{?2:%2} \ +%{nil} + +%_del_group_helper %_rpm_helper_dir/del-group +%_postun_groupdel() %_del_group_helper %{name} $1 %{1} \ +%{nil} + +%_add_shell_helper %_rpm_helper_dir/add-shell +%_post_shelladd() %_add_shell_helper %{name} $1 %{1} \ +%{nil} + +%_del_shell_helper %_rpm_helper_dir/del-shell +%_preun_shelldel() %_del_shell_helper %{name} $1 %{1} \ +%{nil} + +%_add_syslog_helper %_rpm_helper_dir/add-syslog +%_post_syslogadd(s:m:M:) \ +%_add_syslog_helper %{name} $1 %{1} %{2} %{?-s:-s %{-s*}} %{?-m:-m %{-m*}} %{?-M:-M %{-M*}} \ +%{nil} + +%_del_syslog_helper %_rpm_helper_dir/del-syslog +%_preun_syslogdel() %_del_syslog_helper %{name} $1 \ +%{nil} + +# Web App dir + +%_add_webapp_helper %_rpm_helper_dir/add-webapp +%_post_webapp() %_add_webapp_helper %{name} $1 \ +%{nil} + +%_del_webapp_helper %_rpm_helper_dir/del-webapp +%_postun_webapp() %_del_webapp_helper %{name} $1 \ +%{nil} + +# systemd support +%_post_unit() %_add_service_helper --no-sysv %{name} $1 %{*} \ +%{nil} + +%_preun_unit() %_del_service_helper --no-sysv %{name} $1 %{*} \ +%{nil} diff --git a/rpm-helper.macros.in b/rpm-helper.macros.in deleted file mode 100644 index 1703bc4..0000000 --- a/rpm-helper.macros.in +++ /dev/null @@ -1,77 +0,0 @@ -# $Id$ - -%_rpm_helper_dir @pkgdatadir@ - -%_get_password_helper %_rpm_helper_dir/get-password -%_get_password() $(%_get_password_helper %{1}) - -%_create_ghostfile_helper %_rpm_helper_dir/create-file -%create_ghostfile() %_create_ghostfile_helper %{name} $1 %{1} %{2} %{3} %{4} \ -%{nil} - -%_create_ssl_certificate_helper %_rpm_helper_dir/create-ssl-certificate -%_create_ssl_certificate(bg:) %_create_ssl_certificate_helper %{name} $1 %{1} %{?-g:-g %{-g*}} %{?-b:-b} \ -%{nil} - -# initscripts macros -%_add_service_helper %_rpm_helper_dir/add-service -%_post_service() %_add_service_helper %{name} $1 %{*} \ -%{nil} - -%_del_service_helper %_rpm_helper_dir/del-service -%_preun_service() %_del_service_helper %{name} $1 %{*} \ -%{nil} - -%_reread_services_helper %_rpm_helper_dir/reread-services -%_postun_service() %_reread_services_helper %{name} \ -%{nil} - -%_add_user_helper %_rpm_helper_dir/add-user -%_pre_useradd() %_add_user_helper %{name} $1 %{1} %{2} %{3} \ -%{nil} - -%_del_user_helper %_rpm_helper_dir/del-user -%_postun_userdel() %_del_user_helper %{name} $1 %{1} \ -%{nil} - -%_add_group_helper %_rpm_helper_dir/add-group -%_pre_groupadd() %_add_group_helper %{name} $1 %{1} %{?2:%2} \ -%{nil} - -%_del_group_helper %_rpm_helper_dir/del-group -%_postun_groupdel() %_del_group_helper %{name} $1 %{1} \ -%{nil} - -%_add_shell_helper %_rpm_helper_dir/add-shell -%_post_shelladd() %_add_shell_helper %{name} $1 %{1} \ -%{nil} - -%_del_shell_helper %_rpm_helper_dir/del-shell -%_preun_shelldel() %_del_shell_helper %{name} $1 %{1} \ -%{nil} - -%_add_syslog_helper %_rpm_helper_dir/add-syslog -%_post_syslogadd(s:m:M:) \ -%_add_syslog_helper %{name} $1 %{1} %{2} %{?-s:-s %{-s*}} %{?-m:-m %{-m*}} %{?-M:-M %{-M*}} \ -%{nil} - -%_del_syslog_helper %_rpm_helper_dir/del-syslog -%_preun_syslogdel() %_del_syslog_helper %{name} $1 \ -%{nil} - -# Web App dir - -%_add_webapp_helper %_rpm_helper_dir/add-webapp -%_post_webapp() %_add_webapp_helper %{name} $1 \ -%{nil} - -%_del_webapp_helper %_rpm_helper_dir/del-webapp -%_postun_webapp() %_del_webapp_helper %{name} $1 \ -%{nil} - -# systemd support -%_post_unit() %_add_service_helper --no-sysv %{name} $1 %{*} \ -%{nil} - -%_preun_unit() %_del_service_helper --no-sysv %{name} $1 %{*} \ -%{nil} -- cgit v1.2.1