From 8b4f72dcf32bb564564292fa1c77dcb9afa266ea Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 5 Feb 2011 17:43:49 +0000 Subject: merge manbo.macros from rpm-manbo-setup --- NEWS | 3 ++- macros.in | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 1fc94bf..b548c3f 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,8 @@ Version 1.116 - 5 February 2011, by Thomas Backlund - merge rpmrc from rpm-manbo-setup +- merge manbo.macros from rpm-manbo-setup -Version 1.115 - +Version 1.115 - - initial Mageia import Version 1.114 - 9 December 2010, by Rémy Clouard diff --git a/macros.in b/macros.in index bf82398..a5ec29c 100644 --- a/macros.in +++ b/macros.in @@ -54,3 +54,16 @@ # activate filetriggers (cf http://wiki.mandriva.com/en/Rpm_filetriggers) %_filetriggers_dir /var/lib/rpm/filetriggers + +# directories ####################################### +%_sysconfdir /etc +%_initrddir %{_sysconfdir}/rc.d/init.d +%_infodir %_datadir/info +%_mandir %_datadir/man +%_defaultdocdir %_datadir/doc + +%_localstatedir %{_var} +%_logdir %{_var}/log +%_libexecdir %_libdir + +%_docdir_fmt %%{NAME} -- cgit v1.2.1