From ba6750ea2121e48713baec16b2004c54316e30d4 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 19 Mar 2018 10:12:55 -0400 Subject: [PATCH] Fix numerous memory leaks Drop upstreamed patch Signed-off-by: Stephen Gallagher --- .gitignore | 1 + ...nt-correct-version-in-pkgconfig-file.patch | 30 ------------------- libmodulemd.spec | 7 +++-- sources | 2 +- 4 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 0001-Print-correct-version-in-pkgconfig-file.patch diff --git a/.gitignore b/.gitignore index e32f4d3..3379966 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /modulemd-1.1.0.tar.xz /modulemd-1.1.1.tar.xz /modulemd-1.1.2.tar.xz +/modulemd-1.1.3.tar.xz diff --git a/0001-Print-correct-version-in-pkgconfig-file.patch b/0001-Print-correct-version-in-pkgconfig-file.patch deleted file mode 100644 index 44b31d1..0000000 --- a/0001-Print-correct-version-in-pkgconfig-file.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ce05ec9663ff335ff6e1e2097921a04f0ac756e9 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Thu, 15 Mar 2018 11:01:30 -0400 -Subject: [PATCH] Print correct version in pkgconfig file - -Signed-off-by: Stephen Gallagher ---- - modulemd/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modulemd/meson.build b/modulemd/meson.build -index 79f8f0cf6c80b52f6d0798d2a436d0f160cf2300..785b5e375d2804dc0033f6516797aef606111973 100644 ---- a/modulemd/meson.build -+++ b/modulemd/meson.build -@@ -202,11 +202,11 @@ gnome.gtkdoc( - install : true) - - pkg.generate( - libraries : modulemd_lib, - subdirs : header_path, -- version : '.'.join([libmodulemd_version_array[0], libmodulemd_version_array[1]]), -+ version : libmodulemd_version, - name : 'modulemd', - filebase : 'modulemd', - description : 'Module metadata manipulation library', - requires: [ 'glib-2.0', 'gobject-2.0' ], - ) --- -2.14.3 - diff --git a/libmodulemd.spec b/libmodulemd.spec index c525a03..32f3eec 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -1,6 +1,6 @@ %global majorversion 1 %global minorversion 1 -%global patchversion 2 +%global patchversion 3 %global majorminorversion %{majorversion}.%{minorversion} %global nsversion %{majorversion}.0 @@ -22,7 +22,6 @@ BuildRequires: pkgconfig(gtk-doc) BuildRequires: python3-gobject-base # Patches -Patch0001: 0001-Print-correct-version-in-pkgconfig-file.patch %description C Library for manipulating module metadata files. @@ -71,6 +70,10 @@ export LC_CTYPE=C.utf8 %{_datadir}/gtk-doc/html/modulemd/ %changelog +* 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 diff --git a/sources b/sources index 090601b..0820f45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (modulemd-1.1.2.tar.xz) = a8ac9782b05060f816428d824ddaf332b80ad5dfac0b48eaca64c8227a1fa86d891e9feb8756fff07c917bd34bdb1fbb66178ba20cb8d3bcfc280fe1e979f391 +SHA512 (modulemd-1.1.3.tar.xz) = ac562d015256eead8315546f9e94c9c9781fae0ca5bb1e840b30d8c2d267db4081b62267499432ea610fdbc192c4224b6c2895cc84282b044fb21d6ca00d3130