[jglobus/el5] Fix source URL
Mattias Ellert
ellert at fedoraproject.org
Mon Nov 25 13:16:24 UTC 2013
commit b6705904417b97e32cb356409ca0a8ebdae5cdba
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Mon Nov 25 09:14:52 2013 +0100
Fix source URL
jglobus-parent.patch | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++
jglobus.spec | 16 ++++--
sources | 2 +-
3 files changed, 154 insertions(+), 6 deletions(-)
---
diff --git a/jglobus-parent.patch b/jglobus-parent.patch
new file mode 100644
index 0000000..dad22e6
--- /dev/null
+++ b/jglobus-parent.patch
@@ -0,0 +1,142 @@
+diff -ur JGlobus-jglobus-2.0.6.orig/axis/pom.xml JGlobus-jglobus-2.0.6/axis/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/axis/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/axis/pom.xml 2013-08-19 13:25:14.103800950 +0200
+@@ -1,6 +1,6 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <groupId>org.jglobus</groupId>
+ <version>2.0.6</version>
+ </parent>
+diff -ur JGlobus-jglobus-2.0.6.orig/container-test-utils/pom.xml JGlobus-jglobus-2.0.6/container-test-utils/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/container-test-utils/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/container-test-utils/pom.xml 2013-08-19 13:25:14.107800902 +0200
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <groupId>org.jglobus</groupId>
+ <version>2.0.6</version>
+ </parent>
+diff -ur JGlobus-jglobus-2.0.6.orig/gram/pom.xml JGlobus-jglobus-2.0.6/gram/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/gram/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/gram/pom.xml 2013-08-19 13:25:14.105800926 +0200
+@@ -1,7 +1,7 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <groupId>org.jglobus</groupId>
+ <version>2.0.6</version>
+ </parent>
+diff -ur JGlobus-jglobus-2.0.6.orig/gridftp/pom.xml JGlobus-jglobus-2.0.6/gridftp/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/gridftp/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/gridftp/pom.xml 2013-08-19 13:25:14.108800890 +0200
+@@ -2,7 +2,7 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <groupId>org.jglobus</groupId>
+ <version>2.0.6</version>
+ </parent>
+diff -ur JGlobus-jglobus-2.0.6.orig/gss/pom.xml JGlobus-jglobus-2.0.6/gss/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/gss/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/gss/pom.xml 2013-08-19 13:25:14.106800914 +0200
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <groupId>org.jglobus</groupId>
+ <version>2.0.6</version>
+ </parent>
+diff -ur JGlobus-jglobus-2.0.6.orig/io/pom.xml JGlobus-jglobus-2.0.6/io/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/io/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/io/pom.xml 2013-08-19 13:25:14.107800902 +0200
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <groupId>org.jglobus</groupId>
+ <version>2.0.6</version>
+ </parent>
+diff -ur JGlobus-jglobus-2.0.6.orig/jsse/pom.xml JGlobus-jglobus-2.0.6/jsse/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/jsse/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/jsse/pom.xml 2013-08-19 13:25:14.108800890 +0200
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <groupId>org.jglobus</groupId>
+ <version>2.0.6</version>
+ </parent>
+diff -ur JGlobus-jglobus-2.0.6.orig/myproxy/pom.xml JGlobus-jglobus-2.0.6/myproxy/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/myproxy/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/myproxy/pom.xml 2013-08-19 13:25:14.105800926 +0200
+@@ -2,7 +2,7 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <groupId>org.jglobus</groupId>
+ <version>2.0.6</version>
+ </parent>
+diff -ur JGlobus-jglobus-2.0.6.orig/pom.xml JGlobus-jglobus-2.0.6/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/pom.xml 2013-08-19 13:25:14.104800938 +0200
+@@ -3,7 +3,7 @@
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jglobus</groupId>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <version>2.0.6</version>
+ <modules>
+ <module>test-utils</module>
+diff -ur JGlobus-jglobus-2.0.6.orig/ssl-proxies/pom.xml JGlobus-jglobus-2.0.6/ssl-proxies/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/ssl-proxies/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/ssl-proxies/pom.xml 2013-08-19 13:25:14.105800926 +0200
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <groupId>org.jglobus</groupId>
+ <version>2.0.6</version>
+ </parent>
+diff -ur JGlobus-jglobus-2.0.6.orig/ssl-proxies-tomcat/pom.xml JGlobus-jglobus-2.0.6/ssl-proxies-tomcat/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/ssl-proxies-tomcat/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/ssl-proxies-tomcat/pom.xml 2013-08-19 13:25:14.108800890 +0200
+@@ -1,6 +1,6 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <groupId>org.jglobus</groupId>
+ <version>2.0.6</version>
+ </parent>
+diff -ur JGlobus-jglobus-2.0.6.orig/test-utils/pom.xml JGlobus-jglobus-2.0.6/test-utils/pom.xml
+--- JGlobus-jglobus-2.0.6.orig/test-utils/pom.xml 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/test-utils/pom.xml 2013-08-19 13:25:14.106800914 +0200
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+- <artifactId>jglobus-all</artifactId>
++ <artifactId>parent</artifactId>
+ <groupId>org.jglobus</groupId>
+ <version>2.0.6</version>
+ </parent>
diff --git a/jglobus.spec b/jglobus.spec
index 349e462..97e424b 100644
--- a/jglobus.spec
+++ b/jglobus.spec
@@ -14,7 +14,7 @@
Name: jglobus
Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Globus Java client libraries
# Everything is Apache 2.0 except for one file that is MIT:
@@ -22,7 +22,7 @@ Summary: Globus Java client libraries
License: ASL 2.0 and MIT
Group: Development/Libraries
URL: http://github.com/%{name}/
-Source0: http://github.com/%{name}/JGlobus/archive/%{name}-%{version}.tar.gz
+Source0: http://github.com/%{name}/JGlobus/archive/JGlobus-%{version}.tar.gz
# Build with ant on old distributions
Source1: %{name}-ant-%{version}.tar.gz
# Fixes from Bartek Palak (see pull request in github)
@@ -34,9 +34,11 @@ Patch4: jglobus-impl-clonable.patch
Patch5: jglobus-dont-hide-super.patch
# Fix javadoc warnings
Patch6: jglobus-doc.patch
+# Name parent parent
+Patch7: jglobus-parent.patch
BuildArch: noarch
-# There is no bouncycastle for ppc in EPEL5 abd ppc64 in EPEL6
+# There is no bouncycastle for ppc in EPEL5 and ppc64 in EPEL6
ExcludeArch: ppc ppc64
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -175,7 +177,7 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q -a 1 -n JGlobus-%{name}-%{version}
+%setup -q -a 1 -n JGlobus-JGlobus-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -183,6 +185,7 @@ This package contains the API documentation for %{name}.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%if "%{rhel}" == "5"
patch -p1 < ssl-proxies-tomcat/src/main/patches/jglobus-tomcat5.patch
@@ -191,7 +194,7 @@ patch -p1 < ssl-proxies-tomcat/src/main/patches/jglobus-tomcat5.patch
dos2unix axis/src/main/java/org/globus/axis/example/README.txt
chmod 644 axis/src/main/java/org/globus/axis/example/README.txt
-# Move test clsses to test directory
+# Move test classes to test directory
mkdir -p gram/src/test/java/org/globus/gram/util
mv gram/src/main/java/org/globus/gram/Gram15Test.java \
gram/src/test/java/org/globus/gram/Gram15Test.java
@@ -312,6 +315,9 @@ rm -rf %{buildroot}
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Nov 25 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.6-2
+- Fix source URL
+
* Wed Aug 14 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.6-1
- 2.0.6 final release
diff --git a/sources b/sources
index 20259ff..b89c9aa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2f31961ba27c978302c544e11588e7c4 jglobus-2.0.6.tar.gz
+2cd9b04e7f2f326e120904ea392aef7e JGlobus-2.0.6.tar.gz
0401e38f26d76da94f09e8574437f421 jglobus-ant-2.0.6.tar.gz
More information about the scm-commits
mailing list