From 2566a70b0ac8f18fbcb2c1c060465714d16982a4 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Thu, 9 Apr 2009 14:48:02 +0200 Subject: [PATCH] Remove file flags that have never been enabled --- build/files.c | 11 +---------- python/rpmmodule.c | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/build/files.c b/build/files.c index 8063aced9..d9c81511e 100644 --- a/build/files.c +++ b/build/files.c @@ -837,15 +837,6 @@ static VFA_t virtualFileAttributes[] = { { "%license", 0, RPMFILE_LICENSE }, { "%pubkey", 0, RPMFILE_PUBKEY }, { "%policy", 0, RPMFILE_POLICY }, - -#if WHY_NOT - { "%icon", 0, RPMFILE_ICON }, - { "%spec", 0, RPMFILE_SPEC }, - { "%config", 0, RPMFILE_CONFIG }, - { "%missingok", 0, RPMFILE_CONFIG|RPMFILE_MISSINGOK }, - { "%noreplace", 0, RPMFILE_CONFIG|RPMFILE_NOREPLACE }, -#endif - { NULL, 0, 0 } }; @@ -913,7 +904,7 @@ static rpmRC parseForSimple(rpmSpec spec, Package pkg, char * buf, if (fl->currentFlags & RPMFILE_DOC) { rstrscat(&specialDocBuf, " ", s, NULL); } else - if (fl->currentFlags & (RPMFILE_POLICY|RPMFILE_PUBKEY|RPMFILE_ICON)) + if (fl->currentFlags & (RPMFILE_POLICY|RPMFILE_PUBKEY)) { *fileName = s; } else { diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 77b1c14d8..994e7e209 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -346,7 +346,6 @@ void init_rpm(void) REGISTER_ENUM(RPMFILE_CONFIG); REGISTER_ENUM(RPMFILE_DOC); - REGISTER_ENUM(RPMFILE_ICON); REGISTER_ENUM(RPMFILE_MISSINGOK); REGISTER_ENUM(RPMFILE_NOREPLACE); REGISTER_ENUM(RPMFILE_GHOST);