commit 0fcd6b62f0a0cbf4852085905c9db19c8d28ef27
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Apr 4 13:50:29 2014 +0200
Drop unneeded trilead-ssh2 patch
jenkins.spec | 13 ++-----
use-original-trilead-ssh2.patch | 63 ---------------------------------------
2 files changed, 4 insertions(+), 72 deletions(-)
---
diff --git a/jenkins.spec b/jenkins.spec
index 7c0bb10..61096b4 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -5,7 +5,7 @@
Name: jenkins
Version: 1.557
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -30,8 +30,6 @@ Source5: context.xml
# animal sniffer is not really useful in Fedora
Patch1: remove-animal-sniffer-annotations.patch
-# build agaist pristine trilead-ssh2 library
-Patch2: use-original-trilead-ssh2.patch
# remove support for Solaris for now (missing deps and unclear licensing)
Patch3: remove-support-for-solaris.patch
# fix asm4 namespace
@@ -362,7 +360,6 @@ This package contains API documentation for %{name}.
%setup -q -n %{name}-%{name}-%{version}
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -463,11 +460,6 @@ cp %{SOURCE3} LICENSE-BSD.txt
%endif
# fix gId:aId
-# trilead-ssh
-%pom_remove_dep :trilead-ssh2 cli
-%pom_add_dep org.tmatesoft.svnkit:trilead-ssh2:215 cli
-%pom_remove_dep :trilead-ssh2 core
-%pom_add_dep org.tmatesoft.svnkit:trilead-ssh2:215 core
# findbugs annotations
%pom_remove_dep findbugs:annotations core
%pom_add_dep com.google.code.findbugs:jsr305 core
@@ -574,6 +566,9 @@ cp -p %{SOURCE5} %{buildroot}/%{homedir}/webapp/META-INF/context.xml
%doc LICENSE.txt
%changelog
+* Fri Apr 04 2014 Michal Srb <msrb(a)redhat.com> - 1.557-8
+- Drop unneeded trilead-ssh2 patch
+
* Fri Apr 04 2014 Michal Srb <msrb(a)redhat.com> - 1.557-7
- Spec file cleanup
Show replies by date