Back out the epoch-in-queryformat changes, too much breaks

diff --git a/lib/query.c b/lib/query.c
index 9e22912..6f10579 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -776,7 +776,7 @@ int rpmcliQuery(rpmts ts, QVA_t qva, const char ** argv)
        qva->qva_queryFormat = rpmExpand("%{?_query_all_fmt}\n", NULL);
        if (!(qva->qva_queryFormat != NULL && *qva->qva_queryFormat != '\0')) {
            qva->qva_queryFormat = _free(qva->qva_queryFormat);
-           qva->qva_queryFormat = xstrdup("%{name}-%|epoch?{%{epoch}:}|%{version}-%{release}.%{arch}\n");
+           qva->qva_queryFormat = xstrdup("%{name}-%{version}-%{release}.%{arch}\n");
        }
     }
 

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 62dd50e..aa78519 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -481,7 +481,7 @@ static void setDefaults(void)
                "/usr/doc",             "%{_usr}/doc");
 
     addMacroDefault("_rpmfilename",
-       "%%{ARCH}/%%{NAME}-%%|EPOCH?{%%{EPOCH}:}|%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm",NULL);
+       "%%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm",NULL);
 
     addMacroDefault("optflags",
                "-O2",                  NULL);

diff --git a/macros.in b/macros.in
index 0de43b3..19de05c 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -688,7 +688,7 @@ print (t)\
 #      binary packages.
 #
 # XXX  Note: escaped %% for use in headerSprintf()
-%_build_name_fmt       %%{ARCH}/%%{NAME}-%%|EPOCH?{%%{EPOCH}:}|%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
+%_build_name_fmt       %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
 
 #      The default transaction color. This value is a set of bits to
 #      determine file and dependency affinity for this arch.
@@ -728,7 +728,7 @@ print (t)\
 #      erased packages.
 #
 # XXX  Note: escaped %% for use in headerSprintf()
-%_repackage_name_fmt   %%{NAME}-%%|EPOCH?{%%{EPOCH}:}|%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
+%_repackage_name_fmt   %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
 
 #      The directory in which erased packages will be saved when using
 #      the --repackage option.
@@ -794,7 +794,7 @@ print (t)\
 # Default headerSprintf() output format string for rpm -qa
 #
 # XXX  Note: escaped %% for use in headerSprintf()
-%_query_all_fmt                %%{name}-%%|epoch?{%%{epoch}:}|%%{version}-%%{release}.%%{arch}
+%_query_all_fmt                %%{name}-%%{version}-%%{release}.%%{arch}
 
 #
 # Default path to the file used for transaction fcmtl lock.