commit 42fd0f4ed3e10427bdc5b2497c89baae135bce75
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Mar 31 16:16:13 2014 +0200
First acegisecurity experiment
jenkins.spec | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/jenkins.spec b/jenkins.spec
index 1c26477..dfee998 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -5,7 +5,7 @@
Name: jenkins
Version: 1.549
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -28,7 +28,7 @@ Source3: BSD-LICENSE
Source4: jenkins-sysconfig
# we don't have legacy acegi security framework in Fedora
-Patch0: use-spring-security.patch
+#Patch0: use-spring-security.patch
# animal sniffer is not really useful in Fedora
Patch1: remove-animal-sniffer-annotations.patch
# build agaist pristine trilead-ssh2 library
@@ -50,7 +50,7 @@ Patch9: upgrade-to-commons-io-2.4.patch
# newer args4j
Patch10: use-args4j-2.0.25.patch
# switch to spring security in groovy scripts
-Patch11: groovy-scripts-to-spring-security.patch
+#Patch11: groovy-scripts-to-spring-security.patch
# build against newer guava
Patch12: use-guava-13.0.patch
# remove windows support (for now)
@@ -61,9 +61,9 @@ Patch16: remove-windows-installer-support.patch
# exclude pristine xstream from build (Fedora specific, we use different lib than upstream)
Patch17: exclude-xstream.patch
# spring security related patches
-Patch18: spring-security-in-SecurityListener.patch
-Patch19: fix-in-HttpSessionContextIntegrationFilter2.patch
-Patch20: fix-in-AuthenticationProcessingFilter2.patch
+#Patch18: spring-security-in-SecurityListener.patch
+#Patch19: fix-in-HttpSessionContextIntegrationFilter2.patch
+#Patch20: fix-in-AuthenticationProcessingFilter2.patch
BuildArch: noarch
@@ -152,6 +152,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-war-plugin)
BuildRequires: mvn(org.apache.sshd:sshd-core)
BuildRequires: mvn(org.bouncycastle:bcprov-jdk16)
BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on)
+BuildRequires: mvn(org.acegisecurity:acegi-security)
%if !%{bootstrap}
#BuildRequires: mvn(org.jenkins-ci.lib:lib-jenkins-maven-embedder)
BuildRequires: mvn(org.jenkins-ci.main:cli)
@@ -354,6 +355,7 @@ Requires: jenkins-crypto-util
Requires: glassfish-jaxb
Requires: geronimo-validation
Requires: js-yui2
+Requires: acegisecurity
%description webapp
@@ -370,7 +372,7 @@ This package contains API documentation for %{name}.
%prep
%setup -q -n %{name}-%{name}-%{version}
-%patch0 -p1
+#%%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -381,16 +383,16 @@ This package contains API documentation for %{name}.
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
+#%%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
+%patch17 -p1 -F3
+#%%patch18 -p1
+#%%patch19 -p1
+#%%patch20 -p1
# Remove bundled JARs and classes
find . -name "*.jar" -delete
@@ -580,6 +582,9 @@ cp -p %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/tomcat@%{name}
%doc LICENSE.txt
%changelog
+* Mon Mar 31 2014 Michal Srb <msrb(a)redhat.com> - 1.549-8
+- First acegisecurity experiment
+
* Mon Mar 31 2014 Michal Srb <msrb(a)redhat.com> - 1.549-7
- Symlink tomcat's work dir