diff --git a/doc/rpm.8 b/doc/rpm.8 index 96056f3..f06f3d9 100644 --- a/doc/rpm.8 +++ b/doc/rpm.8 @@ -313,7 +313,7 @@ already installed, packages. Install the packages even if some of them are already installed on this system. .TP -\fB--nobuild\fR +\fB--test\fR Do not install the package, simply check for and report potential conflicts. .SS "QUERY OPTIONS" diff --git a/platform.in b/platform.in index 1749fd5..bb21fd1 100644 --- a/platform.in +++ b/platform.in @@ -368,6 +368,9 @@ @alt@# Initscripts. @alt@%_initdir %{_sysconfdir}/rc.d/init.d @alt@ +@alt@# logrotate configs. +@alt@%_logrotatedir %{_sysconfdir}/logrotate.d +@alt@ @alt@# Licenses. @alt@%_licensedir %{_datadir}/license @alt@ @@ -380,6 +383,9 @@ @alt@# Application cache data directory. @alt@%_cachedir %{_var}/cache @alt@ +@alt@# Application runtime directory. +@alt@%_runtimedir %{_var}/run +@alt@ @alt@# Application spool data directory. @alt@%_spooldir %{_var}/spool @alt@ @@ -521,6 +527,7 @@ @alt@%_install_info %install_info @alt@%_remove_install_info %uninstall_info @alt@ +@alt@%_initddir %_initdir @alt@%_initrddir %_initdir @alt@%make_session %update_wms @alt@ diff --git a/rpm-4_0.spec b/rpm-4_0.spec index f5eb69e..671a139 100644 --- a/rpm-4_0.spec +++ b/rpm-4_0.spec @@ -4,7 +4,7 @@ Name: %rpm_name Version: %rpm_version -Release: alt97.M50.4 +Release: alt97.M50.5 %define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}} %define get_dep() %(rpm -q --qf '%%{NAME} >= %%|SERIAL?{%%{SERIAL}:}|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null || echo '%1 >= unknown') @@ -547,6 +547,10 @@ fi %endif #with contrib %changelog +* Sat Apr 18 2009 Dmitry V. Levin 4.0.4-alt97.M50.5 +- rpm.8: Fixed typo (closes: #19356). +- platform.in: Added macros: %%_logrotatedir, %%_runtimedir (closes: #13639). + * Tue Apr 14 2009 Dmitry V. Levin 4.0.4-alt97.M50.4 - Dropped deprecated RPMTAG_RHNPLATFORM support. - Dropped unused RPMTAG_PLATFORM support.