commit e1937e9bde9b9617c52d4f53418abb4e9a5b792b
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Apr 2 08:15:24 2014 +0200
Build against acegisecurity
0001-Port-to-Spring-Security.patch | 56 ------------------------------------
jenkins-sshd.spec | 15 +++++----
2 files changed, 8 insertions(+), 63 deletions(-)
---
diff --git a/jenkins-sshd.spec b/jenkins-sshd.spec
index e509f91..31e836f 100644
--- a/jenkins-sshd.spec
+++ b/jenkins-sshd.spec
@@ -3,7 +3,7 @@
Name: jenkins-sshd
Version: 1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Jenkins sshd module
# License is specified in pom.xml
@@ -13,17 +13,14 @@ Source0:
https://github.com/jenkinsci/%{mod_name}/archive/%{short_name}-%
# Text copied from
http://www.opensource.org/licenses/mit-license.php
Source1: LICENSE.txt
-Patch0: 0001-Port-to-Spring-Security.patch
-
BuildRequires: maven-local
+BuildRequires: mvn(org.acegisecurity:acegi-security)
BuildRequires: mvn(org.apache.sshd:sshd-core)
BuildRequires: mvn(org.jenkins-ci.modules:instance-identity)
BuildRequires: mvn(org.jenkins-ci.modules:ssh-cli-auth)
BuildRequires: mvn(org.jenkins-ci.plugins:plugin:pom:)
BuildRequires: mvn(org.jenkins-ci.tools:maven-hpi-plugin)
BuildRequires: mvn(org.slf4j:slf4j-api)
-BuildRequires: mvn(org.springframework.security:spring-security-config)
-BuildRequires: mvn(org.springframework.security:spring-security-web)
BuildArch: noarch
@@ -39,10 +36,11 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{mod_name}-%{short_name}-%{version}
-%patch0 -p1
-
cp %{SOURCE1} .
+# TODO: bug in upstream pom file?
+%pom_add_dep org.acegisecurity:acegi-security
+
%build
# test are disabled because of missing dep
%mvn_build -f
@@ -57,6 +55,9 @@ cp %{SOURCE1} .
%doc LICENSE.txt
%changelog
+* Wed Apr 02 2014 Michal Srb <msrb(a)redhat.com> - 1.6-2
+- Build against acegisecurity
+
* Tue Nov 12 2013 Michal Srb <msrb(a)redhat.com> - 1.6-1
- Initial packaging