diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ef98f2d..0000000 --- a/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -/modulemd-0.1.0.tar.xz -/modulemd-0.2.0.tar.xz -/modulemd-0.2.1.tar.xz -/modulemd-0.2.2.tar.xz -/modulemd-1.0.0.tar.xz -/modulemd-1.0.1.tar.xz -/modulemd-1.0.2.tar.xz -/modulemd-1.0.3.tar.xz -/modulemd-1.0.4.tar.xz -/modulemd-1.1.0.tar.xz -/modulemd-1.1.1.tar.xz -/modulemd-1.1.2.tar.xz -/modulemd-1.1.3.tar.xz -/modulemd-1.2.0.tar.xz -/modulemd-1.3.0.tar.xz -/modulemd-1.4.0.tar.xz -/modulemd-1.4.1.tar.xz -/modulemd-1.5.0.tar.xz -/modulemd-1.5.1.tar.xz -/modulemd-1.5.2.tar.xz -/modulemd-1.6.0.tar.xz -/modulemd-1.6.1.tar.xz -/modulemd-1.6.2.tar.xz -/modulemd-1.6.3.tar.xz -/modulemd-1.6.4.tar.xz -/modulemd-1.7.0.tar.xz diff --git a/0001-Properly-write-out-the-ref-for-module-components.patch b/0001-Properly-write-out-the-ref-for-module-components.patch deleted file mode 100644 index e9723cf..0000000 --- a/0001-Properly-write-out-the-ref-for-module-components.patch +++ /dev/null @@ -1,116 +0,0 @@ -From b873aca640964389935d88a90a657abba89421e3 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Thu, 6 Sep 2018 11:17:41 -0400 -Subject: [PATCH 1/2] Properly write out the ref for module components - -Fixes: https://github.com/fedora-modularity/libmodulemd/issues/85 - -Signed-off-by: Stephen Gallagher ---- - modulemd/v1/modulemd-yaml-emitter-modulemd.c | 2 +- - modulemd/v1/tests/test-modulemd-python.py | 50 +++++++++++++++++++ - modulemd/v1/tests/test-modulemd-translation.c | 2 +- - 3 files changed, 52 insertions(+), 2 deletions(-) - -diff --git a/modulemd/v1/modulemd-yaml-emitter-modulemd.c b/modulemd/v1/modulemd-yaml-emitter-modulemd.c -index 87093813e28f5dd42ab014265874ce2148372c8a..7b0fbfafe1cdb4651f2f9b7147f9c082eb76ee2a 100644 ---- a/modulemd/v1/modulemd-yaml-emitter-modulemd.c -+++ b/modulemd/v1/modulemd-yaml-emitter-modulemd.c -@@ -1353,11 +1353,11 @@ _emit_modulemd_module_components (yaml_emitter_t *emitter, - MMD_YAML_EMIT_STR_STR_DICT ( - &event, name, value, YAML_PLAIN_SCALAR_STYLE); - } - - /* Ref */ -- value = modulemd_component_module_dup_repository (module_component); -+ value = modulemd_component_module_dup_ref (module_component); - if (value) - { - name = g_strdup ("ref"); - MMD_YAML_EMIT_STR_STR_DICT ( - &event, name, value, YAML_PLAIN_SCALAR_STYLE); -diff --git a/modulemd/v1/tests/test-modulemd-python.py b/modulemd/v1/tests/test-modulemd-python.py -index 07823213de9c7f16e16719efe0eccf155117cfa5..596665a6df2e367d0817c08b0bfc651cecd14e6a 100755 ---- a/modulemd/v1/tests/test-modulemd-python.py -+++ b/modulemd/v1/tests/test-modulemd-python.py -@@ -214,10 +214,60 @@ class TestIssues(unittest.TestCase): - yaml_output = mmd_translation.dumps() - except GLib.GError as err: - # A proper exception is expected here - pass - -+ def test_issue85(self): -+ """ -+ Component module refs are lost when dumping to YAML -+ """ -+ mmd = Modulemd.Module().new_from_string(""" -+document: modulemd -+version: 1 -+data: -+ summary: A test module in all its beautiful beauty. -+ description: This module demonstrates how to write simple modulemd files And can be used for testing the build and release pipeline. -+ license: -+ module: [ MIT ] -+ dependencies: -+ buildrequires: -+ platform: el8 -+ requires: -+ platform: el8 -+ references: -+ community: https://fedoraproject.org/wiki/Modularity -+ documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules -+ tracker: https://taiga.fedorainfracloud.org/project/modularity -+ profiles: -+ default: -+ rpms: -+ - acl -+ api: -+ rpms: -+ - acl -+ components: -+ rpms: -+ acl: -+ rationale: needed -+ ref: rhel-8.0 -+ modules: -+ testmodule: -+ ref: private-x -+ rationale: Testing module inclusion. -+ buildorder: 10 -+""") -+ assert mmd.get_module_components( -+ )['testmodule'].peek_ref() == 'private-x' -+ -+ mmd2 = Modulemd.Module.copy(mmd) -+ assert mmd2.get_module_components( -+ )['testmodule'].peek_ref() == 'private-x' -+ -+ mmd3 = Modulemd.Module.new_from_string(mmd.dumps()) -+ assert mmd3.get_module_components( -+ )['testmodule'].peek_ref() == 'private-x' -+ - - class TestIntent(unittest.TestCase): - - def test_basic(self): - intent = Modulemd.Intent.new("intent_name") -diff --git a/modulemd/v1/tests/test-modulemd-translation.c b/modulemd/v1/tests/test-modulemd-translation.c -index a85ba5131db562aa9be3255fae3db13e9ee66508..dfa07f48d5ada811a5c82f14e7bcf52c7b258b94 100644 ---- a/modulemd/v1/tests/test-modulemd-translation.c -+++ b/modulemd/v1/tests/test-modulemd-translation.c -@@ -350,11 +350,11 @@ modulemd_translation_test_index (TranslationFixture *fixture, - "demonstrates arches and multilib.\n arches: [i686, x86_64]\n " - " multilib: [x86_64]\n xyz:\n rationale: xyz is a bundled " - "dependency of xxx.\n buildorder: 10\n modules:\n " - "includedmodule:\n rationale: Included in the stack, just " - "because.\n repository: https://pagure.io/includedmodule.git\n " -- " ref: https://pagure.io/includedmodule.git\n buildorder: 100\n " -+ " ref: somecoolbranchname\n buildorder: 100\n " - "artifacts:\n rpms:\n - bar-0:1.23-1.module_deadbeef.x86_64\n - " - "bar-devel-0:1.23-1.module_deadbeef.x86_64\n - " - "bar-extras-0:1.23-1.module_deadbeef.x86_64\n - " - "baz-0:42-42.module_deadbeef.x86_64\n - " - "xxx-0:1-1.module_deadbeef.i686\n - xxx-0:1-1.module_deadbeef.x86_64\n " --- -2.19.0.rc0 - diff --git a/0002-Use-decimal-version-in-NSVC.patch b/0002-Use-decimal-version-in-NSVC.patch deleted file mode 100644 index 26f1541..0000000 --- a/0002-Use-decimal-version-in-NSVC.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e69860136a11441a9f952ac97da1040a3219b4d6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= -Date: Wed, 5 Sep 2018 12:20:36 +0200 -Subject: [PATCH 2/2] Use decimal version in NSVC - -Fixes: #82 ---- - modulemd/v1/modulemd-modulestream.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modulemd/v1/modulemd-modulestream.c b/modulemd/v1/modulemd-modulestream.c -index 1ee6e1cffc5cecd19439ca47afc4425e9808aaa4..58317c17564301f85984f7608356002afeb29921 100644 ---- a/modulemd/v1/modulemd-modulestream.c -+++ b/modulemd/v1/modulemd-modulestream.c -@@ -1796,15 +1796,15 @@ modulemd_modulestream_get_nsvc (ModulemdModuleStream *self) - } - - if (context) - { - nsvc = g_strdup_printf ( -- "%s:%s:%" PRIx64 ":%s", name, stream, version, context); -+ "%s:%s:%" PRIu64 ":%s", name, stream, version, context); - } - else - { -- nsvc = g_strdup_printf ("%s:%s:%" PRIx64, name, stream, version); -+ nsvc = g_strdup_printf ("%s:%s:%" PRIu64, name, stream, version); - } - - return nsvc; - } - --- -2.19.0.rc0 - diff --git a/README.md b/README.md deleted file mode 100644 index d5926fb..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# libmodulemd - -C Library for manipulating module metadata files -See https://pagure.io/modulemd for more details. - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..8a07057 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Provided by RHEL 7.6+ diff --git a/libmodulemd.spec b/libmodulemd.spec deleted file mode 100644 index 0c2d989..0000000 --- a/libmodulemd.spec +++ /dev/null @@ -1,331 +0,0 @@ -Name: libmodulemd -Version: 1.7.0 -Release: 1%{?dist} -Summary: Module metadata manipulation library - -License: MIT -URL: https://github.com/fedora-modularity/libmodulemd -Source0: %{url}/releases/download/%{name}-%{version}/modulemd-%{version}.tar.xz - -BuildRequires: meson -BuildRequires: pkgconfig -BuildRequires: gcc -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(yaml-0.1) -BuildRequires: pkgconfig(gtk-doc) -BuildRequires: python3-gobject-base -BuildRequires: valgrind - -Obsoletes: python2-modulemd < 1.3.4 - - -# Patches - - -%description -C Library for manipulating module metadata files. -See https://github.com/fedora-modularity/libmodulemd/blob/master/README.md for -more details. - - -%package -n python3-%{name} -Summary: Python 3 bindings for %{name} -BuildArch: noarch -Requires: libmodulemd = %{version}-%{release} -Requires: python3-gobject-base -Obsoletes: python3-modulemd < 1.3.4 - -%description -n python3-%{name} -Python 3 bindings for %{name} - -Also provides utility module ModulemdUtils. - - -%package devel -Summary: Development files for libmodulemd -Requires: %{name}%{?_isa} = %{version}-%{release} - - -%description devel -Development files for libmodulemd. - - -%prep -%autosetup -p1 -n modulemd-%{version} - - -%build -%meson -Ddeveloper_build=false -%meson_build - - -%check - -export LC_CTYPE=C.utf8 - -%ifarch %{power64} -# Valgrind is broken on ppc64[le] with GCC7: -# https://bugs.kde.org/show_bug.cgi?id=386945 -export MMD_SKIP_VALGRIND=1 -%endif - -%meson_test - - -%install -%meson_install - - -%ldconfig_scriptlets - - -%files -%license COPYING -%doc README.md -%{_bindir}/modulemd-validator -%{_libdir}/%{name}.so.1* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/Modulemd-1.0.typelib - - -%files -n python3-%{name} - - -%files devel -%{_libdir}/%{name}.so -%{_libdir}/pkgconfig/modulemd.pc -%{_includedir}/modulemd/ -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/Modulemd-1.0.gir -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/modulemd-1.0/ - -%changelog -* Fri Oct 26 2018 Stephen Gallagher - 1.7.0-1 -- Update to 1.7.0 -- Enhance YAML parser for use with `fedmod lint` -- Support running unit tests against installed packages -- Include all NSVCs for ModuleStreams in ImprovedModule - -* Tue Sep 18 2018 Stephen Gallagher - 1.6.4-1 -- Update to 1.6.4. -- Add Buildopts to the documentation. -- Deduplicate module streams when merging. -- Drop upstreamed patches. - -* Thu Sep 06 2018 Stephen Gallagher - 1.6.3-2 -- Fix generation of module component YAML -- Output NSVC information using decimal version - -* Tue Sep 04 2018 Stephen Gallagher - 1.6.3-1 -- Update to 1.6.3 -- Drop upstreamed patch -- Don't return ModuleStream objects from modulemd_module_new_all_from_*_ext() -- Ensure that Component buildorder property is signed -- Work around optimization bug -- Don't crash dumping translation events without summary or desc - -* Thu Aug 09 2018 Stephen Gallagher - 1.6.2-2 -- Fix backwards-incompatible API change -- Resolves: rhbz#1607083 - -* Tue Aug 07 2018 Stephen Gallagher - 1.6.2-1 -- Update to 1.6.2 -- Make buildorder a signed integer to match modulemd specification - -* Mon Jul 23 2018 Stephen Gallagher - 1.6.1-2 -- Obsolete unsupported pythonX-modulemd packages - -* Fri Jul 20 2018 Stephen Gallagher - 1.6.1-1 -- Update to 1.6.1 -- Fix header include ordering -- Suppress empty sections from .dump() ordering - -* Wed Jul 18 2018 Stephen Gallagher - 1.6.0-1 -- Update to 1.6.0 -- Adds Modulemd.ModuleStream object, deprecating Modulemd.Module -- Adds Modulemd.Translation and Modulemd.TranslationEntry objects -- Adds Modulemd.ImprovedModule object that collects streams, defaults and - translations together -- Adds new Modulemd.index_from_*() funtions to get a hash table of - Modulemd.ImprovedModule objects for easier searching -- Moves function documentation to the public headers -- Corrects the license headers to MIT (they were incorrectly listed as MITNFA - in previous releases) -- Makes the "eol" field optional for Modulemd.ServiceLevel -- Clean up HTML documentation -- Fixes a type error on 32-bit systems - -* Fri Jul 13 2018 Fedora Release Engineering - 1.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Jun 23 2018 Stephen Gallagher - 1.5.2-1 -- Update to libdmodulemd 1.5.2 -- Don't free uninitialized memory - -* Fri Jun 22 2018 Stephen Gallagher - 1.5.1-2 -- Fix buildopts property not being initialized - -* Tue Jun 19 2018 Stephen Gallagher - 1.5.1-1 -- Update to version 1.5.1 -- Re-enable build-time tests - -* Mon Jun 18 2018 Stephen Gallagher - 1.5.0-2 -- Temporarily disable build-time tests - -* Mon Jun 18 2018 Stephen Gallagher - 1.5.0-1 -- Update to version 1.5.0 -- Adds support for "intents" in Modulemd.Defaults -- Adds `Modulemd.get_version()` -- Adds support for RPM whitelists in the buildopts -- Adds a new object: Modulemd.Buildopts -- Deprecates Modulemd.Module.get_rpm_buildopts() -- Deprecates Modulemd.Module.set_rpm_buildopts() -- Fixes some missing license blurbs - -* Tue May 08 2018 Stephen Gallagher - 1.4.1-1 -- Update to version 1.4.1 -- Improve output from modulemd-validator -- Drop upstreamed patches - -* Wed Apr 25 2018 Stephen Gallagher - 1.4.0-2 -- Fix pointer math error -- Fix compilation failure in Fedora build system - -* Wed Apr 25 2018 Stephen Gallagher - 1.4.0-1 -- Update to version 1.4.0 -- Adds new API for returning failed YAML subdocuments -- Stop emitting log messages by default (polluting consumer logs) -- Validate RPM artifacts for proper NEVRA format -- Improve the validator tool -- Drop upstreamed patch - -* Mon Apr 16 2018 Stephen Gallagher - 1.3.0-2 -- Fix serious error in modulemd-defaults emitter - -* Fri Apr 13 2018 Stephen Gallagher - 1.3.0-1 -- Update to version 1.3.0 -- New Public Objects: - * Modulemd.Prioritizer - tool to merge module defaults -- New Public Functions: - * Modulemd.SimpleSet.is_equal() - * Modulemd.Defaults.copy() - * Modulemd.Defaults.merge() - -* Wed Apr 04 2018 Stephen Gallagher - 1.2.0-1 -- Update to version 1.2.0 -- New Functions: - * Modulemd.objects_from_file() - * Modulemd.objects_from_string() - * Modulemd.dump() - * Modulemd.dumps() - * Modulemd.Defaults.new_from_file() - * Modulemd.Defaults.new_from_string() -- Deprecated Functions: - * Modulemd.Module.new_all_from_file() - * Modulemd.Module.new_all_from_file_ext() - * Modulemd.Module.new_all_from_string() - * Modulemd.Module.new_all_from_string_ext() - * Modulemd.Module.dump_all() - * Modulemd.Module.dumps_all() -- Bugfixes - * Properly use G_BEGIN_DECLS and G_END_DECLS in headers - * Assorted fixes for memory ownership in GObject Introspection - -* Fri Mar 23 2018 Stephen Gallagher - 1.1.3-2 -- Fix missing G_END_DECL from public headers - -* Mon Mar 19 2018 Stephen Gallagher - 1.1.3-1 -- Fix numerous memory leaks -- Drop upstreamed patch - -* Thu Mar 15 2018 Stephen Gallagher - 1.1.2-1 -- Update to version 1.1.2 -- Revert backwards-incompatible API change -- Fix version string in pkgconfig file - -* Thu Mar 15 2018 Stephen Gallagher - 1.1.1-1 -- Update to version 1.1.1 -- Make default stream and profiles optional -- Fixes: https://github.com/fedora-modularity/libmodulemd/issues/25 -- Fixes: https://github.com/fedora-modularity/libmodulemd/issues/26 -- Fixes: https://github.com/fedora-modularity/libmodulemd/issues/27 - -* Wed Mar 14 2018 Stephen Gallagher - 1.1.0-1 -- Update to version 1.1.0 -- Adds support for handling modulemd-defaults YAML documents -- Adds peek()/dup() routines to all object properties -- Adds Modulemd.Module.dup_nsvc() to retrieve the canonical form of the unique module identifier. -- Adds support for boolean types in the XMD section -- Revert obsoletion of pythonX-modulemd packages for now - -* Tue Mar 13 2018 Igor Gnatenko - 1.0.4-2 -- Obsolete unsupported pythonX-modulemd packages - -* Tue Feb 27 2018 Stephen Gallagher - 1.0.4-1 -- Update to 1.0.4 -- Rework version autodetection -- Avoid infinite loop on unparseable YAML - -* Sun Feb 25 2018 Stephen Gallagher - 1.0.3-1 -- RPM components are properly emitted when no module components exist -- Parser works around late determination of modulemd version - -* Fri Feb 16 2018 Stephen Gallagher - 1.0.2-1 -- Be more strict with certain parser edge-cases -- Replace popt argument processing with glib -- Drop upstreamed patches - -* Thu Feb 15 2018 Stephen Gallagher - 1.0.1-2 -- Handle certain unlikely format violations - -* Thu Feb 15 2018 Stephen Gallagher - 1.0.1-1 -- Support modulemd v2 -- Add tool to do quick validation of modulemd -- Fix memory management -- Warn and ignore unparseable sub-documents in the YAML -- Fix several memory issues detected by Coverity scan - -* Tue Feb 06 2018 Stephen Gallagher - 0.2.2-1 -- Update to libmodulemd 0.2.2 -- Fix numerous minor memory leaks -- Fix issues with EOL/SL dates - -* Tue Feb 06 2018 Igor Gnatenko - 0.2.1-3 -- Own appropriate directories - -* Fri Feb 02 2018 Igor Gnatenko - 0.2.1-2 -- Switch to %%ldconfig_scriptlets - -* Fri Jan 05 2018 Stephen Gallagher - 0.2.1-1 -- Update to libmodulemd 0.2.1 -- Add 'name' property for Profiles - -* Thu Oct 05 2017 Stephen Gallagher - 0.2.0-2 -- Add missing BuildRequires for gtk-doc - -* Thu Oct 05 2017 Stephen Gallagher - 0.2.0-1 -- Update to libmodulemd 0.2.0 -- Adds gtk-doc generated documentation -- (ABI-break) Makes all optional properties accept NULL as a value to clear - them -- (ABI-break) Modulemd.SimpleSet takes a STRV (char **) instead of a - GLib.PtrArray -- Fixes a bug where the name was not always set for components -- Adds support for dumping YAML from the introspected API -- Includes add/remove routines for profiles - -* Sat Sep 30 2017 Igor Gnatenko - 0.1.0-5 -- Use %%_isa in Requires for main package from devel - -* Mon Sep 18 2017 Stephen Gallagher - 0.1.0-4 -- Correct the license to MIT - -* Mon Sep 18 2017 Stephen Gallagher - 0.1.0-3 -- Modifications requested during package review - -* Fri Sep 15 2017 Stephen Gallagher - 0.1.0-2 -- First public release - diff --git a/sources b/sources deleted file mode 100644 index 239b181..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (modulemd-1.7.0.tar.xz) = 6bdf5c77a25ae0d1bf583e5b5fd1ab6ac609c3c3893f66529cb09fcec08479afc3765048abf03bb6afee531119fa6f2bc9ebb51ac388751ea4f59ce64434104e diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index c3eda17..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-source - -- hosts: localhost - tags: - - classic - tasks: - - name: Make sure fedpkg and selinux bindings are installed - shell: dnf -y install fedpkg python2-libselinux libmodulemd-devel - - name: Copy spec file to remote machine - copy: - src: "{{ playbook_dir }}/../libmodulemd.spec" - dest: /tmp/libmodulemd.spec - - name: Install build deps - shell: dnf -y build-dep /tmp/libmodulemd.spec - -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-basic - tests: - - build: - dir: . - run: meson -Dtest_installed_lib=true -Ddeveloper_build=false source - - unittests: - dir: . - run: ninja test