[jenkins] Update to upstream version 1.575

[Michal Srb]

commit f02d72cfd11ddefc95c15dc20ce50ec83c655751
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Aug 15 09:10:53 2014 +0200

    Update to upstream version 1.575

 .gitignore                                    |    2 +-
 jenkins.spec                                  |   35 +++++++++++++-----------
 remove-windows-support-from-processtree.patch |   26 +++++-------------
 sources                                       |    2 +-
 4 files changed, 28 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 65ea242..20fbeef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 /jenkins-1.557.tar.gz
 /jenkins-conf.zip
 /jenkins-1.569.tar.gz
-/jenkins-1.572.tar.gz
+/jenkins-1.575.tar.gz
diff --git a/jenkins.spec b/jenkins.spec
index 9e338a0..71b9bb9 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -7,7 +7,7 @@
 %global juid    175
 
 Name:           jenkins
-Version:        1.572
+Version:        1.575
 Release:        1%{?dist}
 Summary:        An extendable open source continuous integration server
 
@@ -33,22 +33,22 @@ Source7:        jenkins-conf.zip
 # animal sniffer is not really useful in Fedora
 Patch1:         remove-animal-sniffer-annotations.patch
 # remove support for Solaris for now (missing deps and unclear licensing)
-Patch3:         remove-support-for-solaris.patch
+Patch2:         remove-support-for-solaris.patch
 # we don't need support for Solaris in SU
-Patch5:         remove-solaris-support-in-su.patch
+Patch3:         remove-solaris-support-in-su.patch
 # jna-posix library is not in Fedora, we use jnr-posix
-Patch6:         drop-jna-posix-compatibility.patch
+Patch4:         drop-jna-posix-compatibility.patch
 # build against newer commons fileupload
-Patch8:         use-commons-fileupload-1.3.patch
+Patch5:         use-commons-fileupload-1.3.patch
 # newer args4j
-Patch10:        use-args4j-2.0.25.patch
+Patch6:         use-args4j-2.0.25.patch
 # build against newer guava
-Patch12:        use-guava-13.0.patch
+Patch7:         use-guava-13.0.patch
 # remove windows support (for now)
-Patch13:        remove-windows-support.patch
-Patch14:        remove-windows-support-from-processtree.patch
-Patch15:        remove-dotnet-support.patch
-Patch16:        remove-windows-installer-support.patch
+Patch8:         remove-windows-support.patch
+Patch9:         remove-windows-support-from-processtree.patch
+Patch10:        remove-dotnet-support.patch
+Patch11:        remove-windows-installer-support.patch
 
 BuildArch:      noarch
 
@@ -367,16 +367,16 @@ This package contains API documentation for %{name}.
 %setup -q -n %{name}-%{name}-%{version}
 
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %patch8 -p1
+%patch9 -p1
 %patch10 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
+%patch11 -p1
 
 # Remove bundled JARs and classes
 find . -name "*.jar" -delete
@@ -662,6 +662,9 @@ exit 0
 %doc LICENSE.txt
 
 %changelog
+* Fri Aug 15 2014 Michal Srb <msrb at redhat.com> - 1.575-1
+- Update to upstream version 1.575
+
 * Mon Jul 14 2014 Michal Srb <msrb at redhat.com> - 1.572-1
 - Update to upstream version 1.572
 
diff --git a/remove-windows-support-from-processtree.patch b/remove-windows-support-from-processtree.patch
index fe014dd..cfe9ef4 100644
--- a/remove-windows-support-from-processtree.patch
+++ b/remove-windows-support-from-processtree.patch
@@ -1,26 +1,17 @@
-From bcca4c25791fc04eb6a6ed3173416ec9d5af98c7 Mon Sep 17 00:00:00 2001
-From: Michal Srb <msrb at redhat.com>
-Date: Thu, 26 Jun 2014 10:46:36 +0200
-Subject: [PATCH] remove windows support from processtree
-
----
- core/src/main/java/hudson/util/ProcessTree.java | 92 -------------------------
- 1 file changed, 92 deletions(-)
-
 diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
-index 94e034e..7d33344 100644
+index 7e87519..d48dfbc 100644
 --- a/core/src/main/java/hudson/util/ProcessTree.java
 +++ b/core/src/main/java/hudson/util/ProcessTree.java
-@@ -38,8 +38,6 @@ import hudson.util.ProcessTree.OSProcess;
+@@ -37,8 +37,6 @@ import hudson.slaves.SlaveComputer;
+ import hudson.util.ProcessTree.OSProcess;
  import hudson.util.ProcessTreeRemoting.IOSProcess;
  import hudson.util.ProcessTreeRemoting.IProcessTree;
- import org.apache.commons.io.FileUtils;
 -import org.jvnet.winp.WinProcess;
 -import org.jvnet.winp.WinpException;
  
- import java.io.BufferedReader;
- import java.io.ByteArrayOutputStream;
-@@ -333,9 +331,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
+ import java.io.*;
+ import java.lang.reflect.Field;
+@@ -324,9 +322,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
              return DEFAULT;
  
          try {
@@ -30,7 +21,7 @@ index 94e034e..7d33344 100644
              String os = Util.fixNull(System.getProperty("os.name"));
              if(os.equals("Linux"))
                  return new Linux();
-@@ -392,93 +387,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
+@@ -383,93 +378,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
          }
      };
  
@@ -124,6 +115,3 @@ index 94e034e..7d33344 100644
      static abstract class Unix extends Local {
          @Override
          public OSProcess get(Process proc) {
--- 
-1.9.3
-
diff --git a/sources b/sources
index e8dad51..74af2f6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
 6fbb85cc80bf5629f78d1f4e37b6e1a3  jenkins-conf.zip
-0cabab57e26bf4f272d92465615fec49  jenkins-1.572.tar.gz
+45e313a3e1af4a5df363526826e751d9  jenkins-1.575.tar.gz