packages: Replace maintainers with packagers

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/macros/package-default.macro b/macros/package-default.macro
index 56df52f3b6813e77a88ecb01bd3f00e8027bb590..485a05649a6f0086af1731d49f3bf19c0f0d3805 100644 (file)
--- 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 bd4ae159a8de5f74a3feb445819d26d78dc2cd4e..dd3b0cbc5c25fa6d2c57d66f49c06ae7e44fd652 100644 (file)
--- 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 195debbc205736105e650fcd3656022c3c330989..df51c1e7c18e0a839829adaea157e3f8ee62f902 100644 (file)
--- 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 9f2f3f8db8b7d642668a3e21f1d382174d8ade5c..8f7a185b6c94d32698ce2f92d2b35f4b271a1f5c 100644 (file)
--- 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 a3da16658b13af60350544a1c978c0eff9b05af5..ab94158f7baa2f39a9316abffe56d4e6d8b26e39 100644 (file)
--- 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 44f0555909254fbb93dd12f7ab6699b6c0450d8f..fbed9083fba198b4099968a42f8e0271fb5d1c53 100644 (file)
--- 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 4595e62ca078e9df69cf5943ada40fb62551a940..9c36fc9ed6e776be63e94a94a31c05a0a3d55e26 100644 (file)
--- 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 <arne.fitzenreiter@ipfire.org>
 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 ecc771fe8c69983b4f8313af97f752d42ab7a12d..16c5e51c50d20cd57d21b4539e709b628bf41052 100644 (file)
--- 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 <michael.tremer@ipfire.org>
        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 04bfb28a5899b8b52b6531294f89cd937b37b652..924cfc76dc58be4a1e2e771748a893284f517f9e 100644 (file)
--- 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),