[takari-archiver] Remove patch for unbundling jgit
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Thu Mar 12 19:11:18 UTC 2015
commit 43fdfc4ab6261ae2ba31d2945406381d2882df8e
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu Mar 12 19:26:19 2015 +0100
Remove patch for unbundling jgit
takari-archiver-unbundle-jgit.patch | 530 ------------------------------------
takari-archiver.spec | 13 +-
2 files changed, 7 insertions(+), 536 deletions(-)
---
diff --git a/takari-archiver.spec b/takari-archiver.spec
index cfb8f93..99c09d1 100644
--- a/takari-archiver.spec
+++ b/takari-archiver.spec
@@ -2,11 +2,13 @@
Name: takari-archiver
Version: 0.1.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Takari Archiver
# License information can be found in effective POM.
# For more info, see https://bugzilla.redhat.com/show_bug.cgi?id=1200768#c4
-License: EPL
+# Bundled FileMode.java is under BSD license, bundling was approved by
+# FPC, see https://fedorahosted.org/fpc/ticket/510
+License: EPL and BSD
URL: http://takari.io
BuildArch: noarch
@@ -14,9 +16,6 @@ BuildArch: noarch
Source0: %{name}-%{version}-clean.tar.xz
Source1: create-tarball.sh
-# Replace use of bundled jgit class with jnr-posix.
-Patch0: takari-archiver-unbundle-jgit.patch
-
BuildRequires: maven-local
BuildRequires: mvn(com.github.jnr:jnr-posix)
BuildRequires: mvn(com.google.guava:guava)
@@ -43,7 +42,6 @@ This package provides %{summary}.
%prep
%setup -q
-%patch0 -p1
%if %{with bootstrap}
%pom_remove_parent
@@ -71,6 +69,9 @@ This package provides %{summary}.
%changelog
+* Thu Mar 12 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.1.8-3
+- Remove patch for unbundling jgit
+
* Thu Mar 12 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.1.8-2
- Remove bundled JARs
- Unbundle part of jgit
More information about the scm-commits
mailing list