From 9956bc985b8a484ed05632e33b6bdec7f98c5586 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Dec 18 2019 16:25:41 +0000
Subject: Merge branch 'master' into tycho


---

diff --git a/felix-gogo-runtime.spec b/felix-gogo-runtime.spec
index 48d7d58..f5f8542 100644
--- a/felix-gogo-runtime.spec
+++ b/felix-gogo-runtime.spec
@@ -2,7 +2,7 @@
 
 Name:           felix-gogo-runtime
 Version:        1.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Apache Felix Gogo command line shell for OSGi
 # One file is also MIT licensed:
 #  src/main/java/org/apache/felix/gogo/runtime/Expression.java
@@ -49,9 +49,12 @@ This package contains the API documentation for %{name}.
 %license LICENSE NOTICE
 
 %changelog
-* Mon Jul 01 2019 Mat Booth <mat.booth@redhat.com> - 1.1.0-3
+* Thu Dec 12 2019 Mat Booth <mat.booth@redhat.com> - 1.1.0-4
 - Fix license tag to include MIT
 
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild