From 2f7c913723baa8135201fa930678d9e3d4138f2c Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Sat, 1 Dec 2007 10:09:54 +0200 Subject: [PATCH] (no)dirtokens is just a build-time option now --- build/poptBT.c | 5 +++++ rpmdb/poptDB.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/poptBT.c b/build/poptBT.c index 71d37d1..99ff7c8 100644 --- a/build/poptBT.c +++ b/build/poptBT.c @@ -229,6 +229,11 @@ struct poptOption rpmBuildPoptTable[] = { N_("override target platform"), "CPU-VENDOR-OS" }, { "usecatalog", '\0', POPT_ARGFLAG_DOC_HIDDEN, &useCatalog, POPT_USECATALOG, N_("lookup i18N strings in specfile catalog"), NULL}, + { "nodirtokens", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_noDirTokens, 1, + N_("generate headers compatible with (legacy) rpm[23] packaging"), + NULL}, + { "dirtokens", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_noDirTokens, 0, + N_("generate headers compatible with rpm4 packaging"), NULL}, POPT_TABLEEND }; diff --git a/rpmdb/poptDB.c b/rpmdb/poptDB.c index 2d7e51d..ac209e1 100644 --- a/rpmdb/poptDB.c +++ b/rpmdb/poptDB.c @@ -21,11 +21,6 @@ struct poptOption rpmDatabasePoptTable[] = { NULL}, { "verifydb", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &rpmDBArgs.verify, 1, N_("verify database files"), NULL}, - { "nodirtokens", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_noDirTokens, 1, - N_("generate headers compatible with (legacy) rpm[23] packaging"), - NULL}, - { "dirtokens", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_noDirTokens, 0, - N_("generate headers compatible with rpm4 packaging"), NULL}, POPT_TABLEEND }; -- 2.7.4