Update to version 1.1.2

- Revert backwards-incompatible API change
- Fix version string in pkgconfig file

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher 2018-03-15 11:03:40 -04:00
parent 679d3b66dd
commit d6c944b503
No known key found for this signature in database
GPG Key ID: 7A25556236BAA3A3
4 changed files with 42 additions and 4 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/modulemd-1.0.4.tar.xz
/modulemd-1.1.0.tar.xz
/modulemd-1.1.1.tar.xz
/modulemd-1.1.2.tar.xz

View File

@ -0,0 +1,30 @@
From ce05ec9663ff335ff6e1e2097921a04f0ac756e9 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 15 Mar 2018 11:01:30 -0400
Subject: [PATCH] Print correct version in pkgconfig file
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
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

View File

@ -1,7 +1,8 @@
%global majorversion 1
%global minorversion 1
%global patchversion 1
%global patchversion 2
%global majorminorversion %{majorversion}.%{minorversion}
%global nsversion %{majorversion}.0
Name: libmodulemd
Version: %{majorminorversion}%{?patchversion:.%{patchversion}}
@ -21,6 +22,7 @@ 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.
@ -56,19 +58,24 @@ export LC_CTYPE=C.utf8
%{_bindir}/modulemd-validator
%{_libdir}/%{name}.so.%{majorversion}*
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/Modulemd-%{majorminorversion}.typelib
%{_libdir}/girepository-1.0/Modulemd-%{nsversion}.typelib
%files devel
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/modulemd.pc
%{_includedir}/modulemd/
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/Modulemd-%{majorminorversion}.gir
%{_datadir}/gir-1.0/Modulemd-%{nsversion}.gir
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/modulemd/
%changelog
* Thu Mar 15 2018 Stephen Gallagher <sgallagh@redhat.com> - 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 <sgallagh@redhat.com> - 1.1.1-1
- Update to version 1.1.1
- Make default stream and profiles optional

View File

@ -1 +1 @@
SHA512 (modulemd-1.1.1.tar.xz) = e7233c459e3ea18282291f095bc2e4978893125267312742db285c731936f658c00bd7c45f1d63a929e34b6090b57465a6434b84f496cf662b912187056ff51d
SHA512 (modulemd-1.1.2.tar.xz) = a8ac9782b05060f816428d824ddaf332b80ad5dfac0b48eaca64c8227a1fa86d891e9feb8756fff07c917bd34bdb1fbb66178ba20cb8d3bcfc280fe1e979f391