commit 4e0b07316a0de5435e7c31640f6e2492eae5222e
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Apr 4 09:19:52 2014 +0200
Spec file cleanup
fix-in-AuthenticationProcessingFilter2.patch | 61 -
fix-in-HttpSessionContextIntegrationFilter2.patch | 60 -
jenkins.spec | 20 +-
spring-security-in-SecurityListener.patch | 27 -
use-spring-security.patch | 2301 ---------------------
5 files changed, 5 insertions(+), 2464 deletions(-)
---
diff --git a/jenkins.spec b/jenkins.spec
index af8a307..7c0bb10 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -5,7 +5,7 @@
Name: jenkins
Version: 1.557
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -28,8 +28,6 @@ Source3: BSD-LICENSE
Source4: jenkins-sysconfig
Source5: context.xml
-# we don't have legacy acegi security framework in Fedora
-#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
@@ -43,11 +41,9 @@ Patch5: remove-solaris-support-in-su.patch
# jna-posix library is not in Fedora, we use jnr-posix
Patch6: drop-jna-posix-compatibility.patch
# build against newer commons fileupload
-Patch8: use-commons-fileupload-1.3.patch
+Patch8: use-commons-fileupload-1.3.patch
# newer args4j
Patch10: use-args4j-2.0.25.patch
-# switch to spring security in groovy scripts
-#Patch11: groovy-scripts-to-spring-security.patch
# build against newer guava
Patch12: use-guava-13.0.patch
# remove windows support (for now)
@@ -57,10 +53,6 @@ Patch15: remove-dotnet-support.patch
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
BuildArch: noarch
@@ -369,7 +361,6 @@ This package contains API documentation for %{name}.
%prep
%setup -q -n %{name}-%{name}-%{version}
-#%%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -378,16 +369,12 @@ This package contains API documentation for %{name}.
%patch6 -p1
%patch8 -p1
%patch10 -p1
-#%%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1 -F3
-#%%patch18 -p1
-#%%patch19 -p1
-#%%patch20 -p1
# Remove bundled JARs and classes
find . -name "*.jar" -delete
@@ -587,6 +574,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-7
+- Spec file cleanup
+
* Fri Apr 04 2014 Michal Srb <msrb(a)redhat.com> - 1.557-6
- Remove superfluous JARs from cli jpackage script
Show replies by date