From: Michael Tremer Date: Thu, 3 Nov 2022 20:59:30 +0000 (+0000) Subject: packages: Replace maintainers with packagers X-Git-Tag: 0.9.28~147 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=145d0efec49ad76a9e7e273c5e7ea4194d855e3f;p=pakfire.git packages: Replace maintainers with packagers Signed-off-by: Michael Tremer --- diff --git a/macros/package-default.macro b/macros/package-default.macro index 56df52f3b..485a05649 100644 --- a/macros/package-default.macro +++ b/macros/package-default.macro @@ -2,9 +2,6 @@ # Epoch information should always be set, starting with zero. epoch = 0 -# The default maintainer is the maintainer of the distribution. -maintainer = %{DISTRO_MAINTAINER} - # The default architecture is the architecture of the distribution. arch = %{DISTRO_ARCH} diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c index bd4ae159a..dd3b0cbc5 100644 --- a/src/_pakfire/package.c +++ b/src/_pakfire/package.c @@ -294,18 +294,19 @@ static void Package_set_distribution(PackageObject* self, PyObject* value) { pakfire_package_set_string(self->package, PAKFIRE_PKG_DISTRO, distribution); } -static PyObject* Package_get_maintainer(PackageObject* self) { - const char* maintainer = pakfire_package_get_string(self->package, PAKFIRE_PKG_MAINTAINER); - if (!maintainer) +static PyObject* Package_get_packager(PackageObject* self) { + const char* packager = pakfire_package_get_string(self->package, PAKFIRE_PKG_PACKAGER); + if (!packager) Py_RETURN_NONE; - return PyUnicode_FromString(maintainer); + return PyUnicode_FromString(packager); } -static void Package_set_maintainer(PackageObject* self, PyObject* value) { - const char* maintainer = PyUnicode_FromValue(value); +static void Package_set_packager(PackageObject* self, PyObject* value) { + const char* packager = PyUnicode_FromValue(value); - pakfire_package_set_string(self->package, PAKFIRE_PKG_MAINTAINER, maintainer); + if (packager) + pakfire_package_set_string(self->package, PAKFIRE_PKG_PACKAGER, packager); } static PyObject* Package_get_filename(PackageObject* self) { @@ -803,9 +804,9 @@ static struct PyGetSetDef Package_getsetters[] = { NULL }, { - "maintainer", - (getter)Package_get_maintainer, - (setter)Package_set_maintainer, + "packager", + (getter)Package_get_packager, + (setter)Package_set_packager, NULL, NULL }, diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c index 195debbc2..df51c1e7c 100644 --- a/src/libpakfire/archive.c +++ b/src/libpakfire/archive.c @@ -1124,10 +1124,10 @@ static int pakfire_archive_make_package_from_json(struct pakfire_archive* archiv goto ERROR; } - // Maintainer - const char* maintainer = pakfire_archive_metadata_get(archive, "maintainer", NULL); - if (maintainer) { - r = pakfire_package_set_string(pkg, PAKFIRE_PKG_MAINTAINER, maintainer); + // Packager + const char* packager = pakfire_archive_metadata_get(archive, "packager", NULL); + if (packager) { + r = pakfire_package_set_string(pkg, PAKFIRE_PKG_PACKAGER, packager); if (r) goto ERROR; } @@ -1375,9 +1375,9 @@ static int pakfire_archive_make_legacy_package(struct pakfire_archive* archive, if (r) goto ERROR; - // Set maintainer + // Set packager r = pakfire_archive_package_set_string(archive, pkg, - PAKFIRE_PKG_MAINTAINER, "package", "maintainer"); + PAKFIRE_PKG_PACKAGER, "package", "packager"); if (r) goto ERROR; diff --git a/src/libpakfire/include/pakfire/package.h b/src/libpakfire/include/pakfire/package.h index 9f2f3f8db..8f7a185b6 100644 --- a/src/libpakfire/include/pakfire/package.h +++ b/src/libpakfire/include/pakfire/package.h @@ -47,7 +47,7 @@ enum pakfire_package_key { PAKFIRE_PKG_GROUPS, PAKFIRE_PKG_VENDOR, PAKFIRE_PKG_DISTRO, - PAKFIRE_PKG_MAINTAINER, + PAKFIRE_PKG_PACKAGER, PAKFIRE_PKG_PATH, PAKFIRE_PKG_FILENAME, PAKFIRE_PKG_DOWNLOADSIZE, diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c index a3da16658..ab94158f7 100644 --- a/src/libpakfire/package.c +++ b/src/libpakfire/package.c @@ -426,7 +426,7 @@ PAKFIRE_EXPORT const char* pakfire_package_get_string( ret = solvable_lookup_str(s, SOLVABLE_DISTRIBUTION); break; - case PAKFIRE_PKG_MAINTAINER: + case PAKFIRE_PKG_PACKAGER: ret = solvable_lookup_str(s, SOLVABLE_PACKAGER); break; @@ -574,7 +574,7 @@ PAKFIRE_EXPORT int pakfire_package_set_string( id = SOLVABLE_DISTRIBUTION; break; - case PAKFIRE_PKG_MAINTAINER: + case PAKFIRE_PKG_PACKAGER: id = SOLVABLE_PACKAGER; break; @@ -1238,10 +1238,10 @@ PAKFIRE_EXPORT char* pakfire_package_dump(struct pakfire_package* pkg, int flags if (distro) pakfire_package_dump_add_line(&string, _("Distribution"), distro); - // Maintainer - const char* maintainer = pakfire_package_get_string(pkg, PAKFIRE_PKG_MAINTAINER); - if (maintainer) - pakfire_package_dump_add_line(&string, _("Maintainer"), maintainer); + // Packager + const char* packager = pakfire_package_get_string(pkg, PAKFIRE_PKG_PACKAGER); + if (packager) + pakfire_package_dump_add_line(&string, _("Packager"), packager); // Vendor const char* vendor = pakfire_package_get_string(pkg, PAKFIRE_PKG_VENDOR); @@ -1962,10 +1962,10 @@ struct json_object* pakfire_package_to_json(struct pakfire_package* pkg) { goto ERROR; } - // Maintainer - const char* maintainer = pakfire_package_get_string(pkg, PAKFIRE_PKG_MAINTAINER); - if (maintainer) { - r = pakfire_json_add_string(pkg->pakfire, md, "maintainer", maintainer); + // Packager + const char* packager = pakfire_package_get_string(pkg, PAKFIRE_PKG_PACKAGER); + if (packager) { + r = pakfire_json_add_string(pkg->pakfire, md, "packager", packager); if (r) goto ERROR; } diff --git a/src/libpakfire/parser.c b/src/libpakfire/parser.c index 44f055590..fbed9083f 100644 --- a/src/libpakfire/parser.c +++ b/src/libpakfire/parser.c @@ -948,7 +948,7 @@ int pakfire_parser_create_package(struct pakfire_parser* parser, { "url", PAKFIRE_PKG_URL, }, { "groups", PAKFIRE_PKG_GROUPS, }, { "vendor", PAKFIRE_PKG_VENDOR, }, - { "maintainer", PAKFIRE_PKG_MAINTAINER, }, + { "packager", PAKFIRE_PKG_PACKAGER, }, { NULL }, }; diff --git a/tests/data/kernel.nm b/tests/data/kernel.nm index 4595e62ca..9c36fc9ed 100644 --- a/tests/data/kernel.nm +++ b/tests/data/kernel.nm @@ -8,7 +8,6 @@ version = 4.20 release = 12 thisapp = linux-%{version} -maintainer = Arne Fitzenreiter groups = System/Kernels url = http://www.kernel.org/ license = GPLv2 diff --git a/tests/data/parser/perl.info b/tests/data/parser/perl.info index ecc771fe8..16c5e51c5 100644 --- a/tests/data/parser/perl.info +++ b/tests/data/parser/perl.info @@ -10,7 +10,6 @@ package uuid = 3ccced8a-3be5-426e-baec-7b5fc113f176 groups = Development/Languages - maintainer = Michael Tremer url = http://www.perl.org/ license = GPL+ or Artistic and GPLv2+ or Artistic @@ -42,7 +41,6 @@ distribution name = IPFire release = 3 vendor = IPFire Project - maintainer = end # Dependency information diff --git a/tests/libpakfire/package.c b/tests/libpakfire/package.c index 04bfb28a5..924cfc76d 100644 --- a/tests/libpakfire/package.c +++ b/tests/libpakfire/package.c @@ -79,9 +79,9 @@ static int test_create(const struct test* t) { ASSERT_SUCCESS(pakfire_package_set_string(pkg, PAKFIRE_PKG_DISTRO, "DISTRO")); ASSERT_STRING_EQUALS(pakfire_package_get_string(pkg, PAKFIRE_PKG_DISTRO), "DISTRO"); - // Maintainer - ASSERT_SUCCESS(pakfire_package_set_string(pkg, PAKFIRE_PKG_MAINTAINER, "MAINTAINER")); - ASSERT_STRING_EQUALS(pakfire_package_get_string(pkg, PAKFIRE_PKG_MAINTAINER), "MAINTAINER"); + // Packager + ASSERT_SUCCESS(pakfire_package_set_string(pkg, PAKFIRE_PKG_PACKAGER, "PACKAGER")); + ASSERT_STRING_EQUALS(pakfire_package_get_string(pkg, PAKFIRE_PKG_PACKAGER), "PACKAGER"); // Fetch path without setting it first ASSERT_STRING_EQUALS(pakfire_package_get_string(pkg, PAKFIRE_PKG_PATH),