Commit 032364ab authored by Michal Čihař's avatar Michal Čihař

Imported Upstream version 4.8.0

parent de2eb5e7
This diff is collapsed.
......@@ -57,7 +57,6 @@ pkginclude_HEADERS += lib/rpmdb.h
pkginclude_HEADERS += lib/rpmcallback.h
pkginclude_HEADERS += lib/rpmcli.h
pkginclude_HEADERS += lib/rpmlib.h
pkginclude_HEADERS += lib/rpmal.h
pkginclude_HEADERS += lib/rpmds.h
pkginclude_HEADERS += lib/rpmfi.h
pkginclude_HEADERS += lib/rpmgi.h
......@@ -126,11 +125,7 @@ rpmgraph_LDADD = lib/librpm.la rpmio/librpmio.la @WITH_POPT_LIB@
dist_bin_SCRIPTS = scripts/gendiff
check_PROGRAMS = dumpdb
dumpdb_SOURCES = tools/dumpdb.c
dumpdb_LDADD = lib/librpm.la
check_PROGRAMS += rpminject
check_PROGRAMS = rpminject
rpminject_SOURCES = tools/rpminject.c
rpminject_LDADD = build/librpmbuild.la
......@@ -208,6 +203,7 @@ uninstall-local:
@rm -f $(DESTDIR)$(bindir)/rpmsign
@rm -f $(DESTDIR)$(bindir)/rpmverify
@rm -f $(DESTDIR)$(bindir)/rpmdb
@rm -rf $(DESTDIR)$(rpmconfigdir)/platform/
MAINTAINERCLEANFILES = ChangeLog
......
# Makefile.in generated by automake 1.11 from Makefile.am.
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -43,9 +43,9 @@ DIST_COMMON = README $(am__configure_deps) $(dist_bin_SCRIPTS) \
$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure $(top_srcdir)/preinstall.am \
$(top_srcdir)/rpm.am ABOUT-NLS COPYING ChangeLog INSTALL TODO \
config.guess config.rpath config.sub depcomp install-sh \
ltmain.sh missing mkinstalldirs
$(top_srcdir)/rpm.am ABOUT-NLS COPYING INSTALL config.guess \
config.rpath config.sub depcomp install-sh ltmain.sh missing \
mkinstalldirs
@WITH_INTERNAL_DB_TRUE@am__append_1 = db3
@WITH_LUAEXT_TRUE@am__append_2 = luaext
rpmbin_PROGRAMS = rpm$(EXEEXT)
......@@ -54,7 +54,7 @@ rpmlibexec_PROGRAMS = $(am__EXEEXT_1) javadeps$(EXEEXT) \
rpmdeps$(EXEEXT)
@LIBDWARF_TRUE@@LIBELF_TRUE@am__append_3 = scripts/find-debuginfo.sh
@LIBDWARF_TRUE@@LIBELF_TRUE@am__append_4 = debugedit
check_PROGRAMS = dumpdb$(EXEEXT) rpminject$(EXEEXT) rpmsort$(EXEEXT)
check_PROGRAMS = rpminject$(EXEEXT) rpmsort$(EXEEXT)
@DOXYGEN_TRUE@@HACKINGDOCS_TRUE@am__append_5 = doc/hacking/html/index.html
@DOXYGEN_TRUE@am__append_6 = doc/librpm/html/index.html
@WITH_INTERNAL_DB_TRUE@am__append_7 = db.h
......@@ -92,9 +92,6 @@ am__dirstamp = $(am__leading_dot)dirstamp
debugedit_OBJECTS = $(am_debugedit_OBJECTS)
@LIBDWARF_TRUE@@LIBELF_TRUE@debugedit_DEPENDENCIES = \
@LIBDWARF_TRUE@@LIBELF_TRUE@ rpmio/librpmio.la
am_dumpdb_OBJECTS = tools/dumpdb.$(OBJEXT)
dumpdb_OBJECTS = $(am_dumpdb_OBJECTS)
dumpdb_DEPENDENCIES = lib/librpm.la
am_javadeps_OBJECTS = tools/javadeps.$(OBJEXT)
javadeps_OBJECTS = $(am_javadeps_OBJECTS)
javadeps_DEPENDENCIES =
......@@ -158,14 +155,13 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(debugedit_SOURCES) $(dumpdb_SOURCES) $(javadeps_SOURCES) \
SOURCES = $(debugedit_SOURCES) $(javadeps_SOURCES) $(rpm_SOURCES) \
$(rpm2cpio_SOURCES) $(rpmbuild_SOURCES) $(rpmdeps_SOURCES) \
$(rpmgraph_SOURCES) $(rpminject_SOURCES) $(rpmsort_SOURCES)
DIST_SOURCES = $(am__debugedit_SOURCES_DIST) $(javadeps_SOURCES) \
$(rpm_SOURCES) $(rpm2cpio_SOURCES) $(rpmbuild_SOURCES) \
$(rpmdeps_SOURCES) $(rpmgraph_SOURCES) $(rpminject_SOURCES) \
$(rpmsort_SOURCES)
DIST_SOURCES = $(am__debugedit_SOURCES_DIST) $(dumpdb_SOURCES) \
$(javadeps_SOURCES) $(rpm_SOURCES) $(rpm2cpio_SOURCES) \
$(rpmbuild_SOURCES) $(rpmdeps_SOURCES) $(rpmgraph_SOURCES) \
$(rpminject_SOURCES) $(rpmsort_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
......@@ -358,7 +354,6 @@ __ID = @__ID@
__ID_U = @__ID_U@
__INSTALL = @__INSTALL@
__LD = @__LD@
__LZMA = @__LZMA@
__MAKE = @__MAKE@
__MKDIR = @__MKDIR@
__MV = @__MV@
......@@ -453,8 +448,8 @@ CLEANFILES = rpmrc.tmp rpmrc macros platform.tmp platform rpm.pc.tmp \
include/rpm/rpmfileutil.h include/rpm/rpmutil.h \
include/rpm/rpmkeyring.h include/rpm/header.h \
include/rpm/rpmdb.h include/rpm/rpmcallback.h \
include/rpm/rpmcli.h include/rpm/rpmlib.h include/rpm/rpmal.h \
include/rpm/rpmds.h include/rpm/rpmfi.h include/rpm/rpmgi.h \
include/rpm/rpmcli.h include/rpm/rpmlib.h include/rpm/rpmds.h \
include/rpm/rpmfi.h include/rpm/rpmgi.h \
include/rpm/rpmlegacy.h include/rpm/rpmps.h \
include/rpm/rpmtag.h include/rpm/rpmtd.h include/rpm/rpmte.h \
include/rpm/rpmts.h include/rpm/rpmtypes.h include/rpm/rpmvf.h \
......@@ -472,8 +467,8 @@ BUILT_SOURCES = $(am__append_7) include/rpm/argv.h include/rpm/rpmio.h \
include/rpm/rpmfileutil.h include/rpm/rpmutil.h \
include/rpm/rpmkeyring.h include/rpm/header.h \
include/rpm/rpmdb.h include/rpm/rpmcallback.h \
include/rpm/rpmcli.h include/rpm/rpmlib.h include/rpm/rpmal.h \
include/rpm/rpmds.h include/rpm/rpmfi.h include/rpm/rpmgi.h \
include/rpm/rpmcli.h include/rpm/rpmlib.h include/rpm/rpmds.h \
include/rpm/rpmfi.h include/rpm/rpmgi.h \
include/rpm/rpmlegacy.h include/rpm/rpmps.h \
include/rpm/rpmtag.h include/rpm/rpmtd.h include/rpm/rpmte.h \
include/rpm/rpmts.h include/rpm/rpmtypes.h include/rpm/rpmvf.h \
......@@ -493,9 +488,9 @@ pkginclude_HEADERS = rpmio/argv.h rpmio/rpmio.h rpmio/rpmurl.h \
rpmio/rpmmacro.h rpmio/rpmlog.h rpmio/rpmpgp.h rpmio/rpmsq.h \
rpmio/rpmstring.h rpmio/rpmsw.h rpmio/rpmfileutil.h \
rpmio/rpmutil.h rpmio/rpmkeyring.h lib/header.h lib/rpmdb.h \
lib/rpmcallback.h lib/rpmcli.h lib/rpmlib.h lib/rpmal.h \
lib/rpmds.h lib/rpmfi.h lib/rpmgi.h lib/rpmlegacy.h \
lib/rpmps.h lib/rpmtag.h lib/rpmtd.h lib/rpmte.h lib/rpmts.h \
lib/rpmcallback.h lib/rpmcli.h lib/rpmlib.h lib/rpmds.h \
lib/rpmfi.h lib/rpmgi.h lib/rpmlegacy.h lib/rpmps.h \
lib/rpmtag.h lib/rpmtd.h lib/rpmte.h lib/rpmts.h \
lib/rpmtypes.h lib/rpmvf.h build/rpmbuild.h build/rpmfc.h \
build/rpmspec.h
nodist_pkginclude_HEADERS =
......@@ -527,8 +522,6 @@ rpmdeps_LDADD = lib/librpm.la rpmio/librpmio.la build/librpmbuild.la @WITH_POPT_
rpmgraph_SOURCES = tools/rpmgraph.c
rpmgraph_LDADD = lib/librpm.la rpmio/librpmio.la @WITH_POPT_LIB@
dist_bin_SCRIPTS = scripts/gendiff
dumpdb_SOURCES = tools/dumpdb.c
dumpdb_LDADD = lib/librpm.la
rpminject_SOURCES = tools/rpminject.c
rpminject_LDADD = build/librpmbuild.la
rpmsort_SOURCES = tools/rpmsort.c
......@@ -747,11 +740,6 @@ tools/hashtab.$(OBJEXT): tools/$(am__dirstamp) \
debugedit$(EXEEXT): $(debugedit_OBJECTS) $(debugedit_DEPENDENCIES)
@rm -f debugedit$(EXEEXT)
$(LINK) $(debugedit_OBJECTS) $(debugedit_LDADD) $(LIBS)
tools/dumpdb.$(OBJEXT): tools/$(am__dirstamp) \
tools/$(DEPDIR)/$(am__dirstamp)
dumpdb$(EXEEXT): $(dumpdb_OBJECTS) $(dumpdb_DEPENDENCIES)
@rm -f dumpdb$(EXEEXT)
$(LINK) $(dumpdb_OBJECTS) $(dumpdb_LDADD) $(LIBS)
tools/javadeps.$(OBJEXT): tools/$(am__dirstamp) \
tools/$(DEPDIR)/$(am__dirstamp)
javadeps$(EXEEXT): $(javadeps_OBJECTS) $(javadeps_DEPENDENCIES)
......@@ -858,7 +846,6 @@ uninstall-rpmconfigSCRIPTS:
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-rm -f tools/debugedit.$(OBJEXT)
-rm -f tools/dumpdb.$(OBJEXT)
-rm -f tools/hashtab.$(OBJEXT)
-rm -f tools/javadeps.$(OBJEXT)
-rm -f tools/rpmdeps.$(OBJEXT)
......@@ -874,7 +861,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmbuild-build.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmbuild-rpmqv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/debugedit.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/dumpdb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/hashtab.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/javadeps.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/rpmdeps.Po@am__quote@
......@@ -1064,7 +1050,7 @@ uninstall-pkgincludeHEADERS:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@failcom='exit 1'; \
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
......@@ -1089,7 +1075,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
......@@ -1253,7 +1239,8 @@ distdir: $(DISTFILES)
fi; \
done
-test -n "$(am__skip_mode_fix)" \
|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|| find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
......@@ -1297,17 +1284,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......@@ -1574,6 +1561,7 @@ uninstall-local:
@rm -f $(DESTDIR)$(bindir)/rpmsign
@rm -f $(DESTDIR)$(bindir)/rpmverify
@rm -f $(DESTDIR)$(bindir)/rpmdb
@rm -rf $(DESTDIR)$(rpmconfigdir)/platform/
# Build hacking docs only on request
@DOXYGEN_TRUE@@HACKINGDOCS_TRUE@doc/hacking.doxy: doc/hacking.doxy.in doc/hacking/Doxyheader Makefile.am
......@@ -1661,8 +1649,6 @@ include/rpm/rpmcli.h: lib/rpmcli.h include/rpm/$(dirstamp)
$(INSTALL_DATA) $(top_srcdir)/lib/rpmcli.h include/rpm/rpmcli.h
include/rpm/rpmlib.h: lib/rpmlib.h include/rpm/$(dirstamp)
$(INSTALL_DATA) $(top_srcdir)/lib/rpmlib.h include/rpm/rpmlib.h
include/rpm/rpmal.h: lib/rpmal.h include/rpm/$(dirstamp)
$(INSTALL_DATA) $(top_srcdir)/lib/rpmal.h include/rpm/rpmal.h
include/rpm/rpmds.h: lib/rpmds.h include/rpm/$(dirstamp)
$(INSTALL_DATA) $(top_srcdir)/lib/rpmds.h include/rpm/rpmds.h
include/rpm/rpmfi.h: lib/rpmfi.h include/rpm/$(dirstamp)
......
Work-in-progress
----------------
- fix the argv const-impedance all around
- unleash the const monsters from rpmdb/header* and deal with 'em
- audit the rest of the API for const sanity
4.5 and beyond
--------------
Janitorial work:
- clean up old junk like workarounds of -95 era (g)libc bugs etc
- use glib/glibc (string manipulation, memory handling etc) facilities instead
of internal versions from -95 era
- audit and clean up user visible strings
- clean up the build process (auto*-stuff, compiler warnings)
- audit int_32 vs uint_32 etc sanity in the interfaces
- have "make check" do something useful (use James' test-harness?)
- use mkstemp() instead of mktemp() everywhere
- refactor those 800+ line monster functions into something more digestable
- review, update included README, INSTALL etc docs
- macroize hardcoded directories like docDirs
- get rid of static "1024 entries is enough for everybody" buffers
General:
- bdb related improvements like add stale lock detection etc
API:
- proper separation of exported and private headers to clean up the API
- package verification API (instead of just printing out letters)
- proper package build API (python)
- proper separation of rpm-cli and lib functionality
- eliminate need for headerGetEntry() where it makes sense (eg changelogs)
- provide compat headers for renamed APIs and structures
Build:
- grammar for specfiles, rpm macros
- support adding dep handlers per file type/class/extension without patching rpm
Python:
- audit error handling in bindings (eg ts.addInstall() does not report back
failures from rpmtsAddInstallElement())
- see if rpmdb can be made to look like pep-0249
# generated automatically by aclocal 1.11 -*- Autoconf -*-
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
......@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11], [],
m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11])dnl
[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
......@@ -866,6 +866,14 @@ python2.1 python2.0])
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
;;
*)
case $am_py_prefix in
/usr|/System*) ;;
*)
am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
;;
esac
;;
esac
])
AC_SUBST([pythondir], [$am_cv_python_pythondir])
......@@ -896,6 +904,14 @@ python2.1 python2.0])
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
;;
*)
case $am_py_exec_prefix in
/usr|/System*) ;;
*)
am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
;;
esac
;;
esac
])
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
......
......@@ -4,22 +4,7 @@ export CPPFLAGS
export CFLAGS
export LDFLAGS
libtoolize=`which glibtoolize 2>/dev/null`
case $libtoolize in
/*) ;;
*) libtoolize=`which libtoolize 2>/dev/null`
case $libtoolize in
/*) ;;
*) libtoolize=libtoolize
esac
esac
$libtoolize --copy --force
autopoint --force
aclocal
autoheader
automake -a -c
autoconf
autoreconf -i
case "$1" in
"--noconfigure")
......
......@@ -189,7 +189,7 @@ static int buildForTarget(rpmts ts, const char * arg, BTA_t ba)
/* Create build tree if necessary */
const char * buildtree = "%{_topdir}:%{_specdir}:%{_sourcedir}:%{_builddir}:%{_rpmdir}:%{_srcrpmdir}:%{_buildrootdir}";
const char * rootdir = rpmtsRootDir(ts);
if (rpmMkdirs(strcmp(rootdir, "/") ? rootdir : NULL , buildtree)) {
if (rpmMkdirs(!rstreq(rootdir, "/") ? rootdir : NULL , buildtree)) {
goto exit;
}
......
......@@ -14,7 +14,7 @@ librpmbuild_la_SOURCES = \
parseBuildInstallClean.c parseChangelog.c parseDescription.c \
parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c
librpmbuild_la_LDFLAGS = -version-info 0:0:0
librpmbuild_la_LDFLAGS = -version-info 1:0:0
librpmbuild_la_LIBADD = \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmio/librpmio.la \
......
# Makefile.in generated by automake 1.11 from Makefile.am.
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -37,7 +37,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = build
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
......@@ -244,7 +244,6 @@ __ID = @__ID@
__ID_U = @__ID_U@
__INSTALL = @__INSTALL@
__LD = @__LD@
__LZMA = @__LZMA@
__MAKE = @__MAKE@
__MKDIR = @__MKDIR@
__MV = @__MV@
......@@ -334,7 +333,7 @@ librpmbuild_la_SOURCES = \
parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c
librpmbuild_la_LDFLAGS = -version-info 0:0:0
librpmbuild_la_LDFLAGS = -version-info 1:0:0
librpmbuild_la_LIBADD = \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmio/librpmio.la \
......
>I just found an odd little bug in rpm 2.5, when there is something like
>
>%doc readme
>
>in the %files list, then if readme doesn't exit, rpm will just put an empty
>doc directory in the package.
option to %setup to *not* do chown/chgrp/chmod
> Most of my spec files have empty Distribution: and Vendor: tag because I
> really don't care. Now, empty tags are frowned upon. So, I try to comment
> out the lines and get a funny error message:
>
> Distribution field must be present in package: solaris2.6
> Vendor field must be present in package: solaris2.6
>
> This happens to be my value of 'Build Os' which gets into the error message!
posix %attr
some /foo/*/*.foo entries don't get matches
detect multiple summary/description entries
verify langs
remove prefix stuff from files.c (not used anymore)
i18n strings
=====================================================================
triggers
custom find-requires, find-provides
messages (normal, verbose, debug)
deprecate require_distribution, require_icon, require_vendor
deprecate RPMVAR_ROOT, and the RPMVAR_REQUIRE* stuff above
......@@ -333,7 +333,7 @@ static rpmRC parseForVerify(const char * buf, FileList fl)
{ VFA_t *vfa;
for (vfa = verifyAttrs; vfa->attribute != NULL; vfa++) {
if (strcmp(p, vfa->attribute))
if (!rstreq(p, vfa->attribute))
continue;
verifyFlags |= vfa->flag;
break;
......@@ -342,7 +342,7 @@ static rpmRC parseForVerify(const char * buf, FileList fl)
continue;
}
if (!strcmp(p, "not")) {
if (rstreq(p, "not")) {
negated ^= 1;
} else {
rpmlog(RPMLOG_ERR, _("Invalid %s token: %s\n"), name, p);
......@@ -556,8 +556,10 @@ static rpmRC parseForAttr(const char * buf, FileList fl)
goto exit; <