[tesla-concurrent-localrepo: 2/5] Flesh out spec file
by Gerard Ryan
commit f346987d80fcbb60b09b3861ff27d0fe2b35253b
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Sat Nov 23 15:55:38 2013 +0000
Flesh out spec file
sources | 1 +
tesla-concurrent-localrepo.spec | 36 ++++++++++++++++++++++++------------
2 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/sources b/sources
new file mode 100644
index 0000000..9a8d706
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+aabcf33f2f52dafdb385dd78028eac8b tesla-concurrent-localrepo-0.0.3-2fc6d1f.tar.gz
diff --git a/tesla-concurrent-localrepo.spec b/tesla-concurrent-localrepo.spec
index a31d4fe..c7ee933 100644
--- a/tesla-concurrent-localrepo.spec
+++ b/tesla-concurrent-localrepo.spec
@@ -1,15 +1,17 @@
+%global commit 2fc6d1faf8075000f9b82676b683a18c664a359d
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
Name: tesla-concurrent-localrepo
Version: 0.0.3
Release: 1%{?dist}
Summary: Tesla : Concurrent Local Repository
-Group: Development/Libraries
-License:
-URL:
-Source0: #FIXME
-BuildArch: noarch
+License: EPL
+URL: https://github.com/tesla/%{name}
+Source0: https://github.com/tesla/%{name}/archive/%{commit}/%{name}-%{version}-%{s...
+BuildArch: noarch
-BuildRequires: mvn(com.googlecode.multithreadedtc:multithreadedtc)
+BuildRequires: mvn(edu.umd.cs:multithreadedtc)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.eclipse.aether:aether-test-util)
BuildRequires: mvn(io.tesla:tesla-filelock)
@@ -17,13 +19,12 @@ BuildRequires: mvn(junit:junit)
BuildRequires: maven-local
%description
-
- This extension for Aether contains a synchronization context that employs OS-level file locks to enable safe
- concurrent access to the local repository across processes.
+This extension for Aether contains a synchronization context that
+employs OS-level file locks to enable safe concurrent access to the
+local repository across processes.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
@@ -31,7 +32,17 @@ API documentation for %{name}.
%prep
-%setup -q #You may need to update this according to your Source0
+%setup -q -n %{name}-%{commit}
+
+# Doesn't really need the parent and it's not packaged
+%pom_remove_parent
+
+# Fedora has multithreadedtc with a differend gid
+%pom_remove_dep com.googlecode.multithreadedtc:multithreadedtc
+%pom_add_dep edu.umd.cs:multithreadedtc
+
+# Plugin prevents build
+%pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin
%build
%mvn_build
@@ -45,4 +56,5 @@ API documentation for %{name}.
%files javadoc -f .mfiles-javadoc
%changelog
-#FIXME
+* Sat Nov 23 2013 Gerard Ryan <galileo(a)fedoraproject.org> - 0.0.3-1
+- Initial rpm
10 years, 3 months
[tesla-concurrent-localrepo: 1/5] Initial Commit
by Gerard Ryan
commit 55f403afb50ba03a2e5c1076f4a4583a6f34c672
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Fri Nov 22 20:57:22 2013 +0000
Initial Commit
tesla-concurrent-localrepo.spec | 48 +++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
---
diff --git a/tesla-concurrent-localrepo.spec b/tesla-concurrent-localrepo.spec
new file mode 100644
index 0000000..a31d4fe
--- /dev/null
+++ b/tesla-concurrent-localrepo.spec
@@ -0,0 +1,48 @@
+Name: tesla-concurrent-localrepo
+Version: 0.0.3
+Release: 1%{?dist}
+Summary: Tesla : Concurrent Local Repository
+
+Group: Development/Libraries
+License:
+URL:
+Source0: #FIXME
+BuildArch: noarch
+
+BuildRequires: mvn(com.googlecode.multithreadedtc:multithreadedtc)
+BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires: mvn(org.eclipse.aether:aether-test-util)
+BuildRequires: mvn(io.tesla:tesla-filelock)
+BuildRequires: mvn(junit:junit)
+BuildRequires: maven-local
+
+%description
+
+ This extension for Aether contains a synchronization context that employs OS-level file locks to enable safe
+ concurrent access to the local repository across processes.
+
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
+
+%prep
+%setup -q #You may need to update this according to your Source0
+
+%build
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+
+%files javadoc -f .mfiles-javadoc
+
+%changelog
+#FIXME
10 years, 3 months
[glassfish-jsp] Update to upstream version 2.3.2
by Michal Srb
commit dc53d5de17411699431f0e3983bf8b972f34de57
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Jan 2 16:43:45 2014 +0100
Update to upstream version 2.3.2
- Port to servlet 3.1
- Drop group tag
glassfish-jsp-build-eclipse-compilers.patch | 26 +++++++++++++++-----------
glassfish-jsp-port-to-servlet-3.1.patch | 26 ++++++++++++++++++++++++++
glassfish-jsp.spec | 19 ++++++++++++-------
sources | 2 +-
4 files changed, 54 insertions(+), 19 deletions(-)
---
diff --git a/generate_tarball.sh b/generate_tarball.sh
old mode 100644
new mode 100755
diff --git a/glassfish-jsp-build-eclipse-compilers.patch b/glassfish-jsp-build-eclipse-compilers.patch
index 62114dd..c4ddf16 100644
--- a/glassfish-jsp-build-eclipse-compilers.patch
+++ b/glassfish-jsp-build-eclipse-compilers.patch
@@ -1,9 +1,11 @@
---- pom.xml.bak 2012-08-29 08:25:47.000000000 +0200
-+++ pom.xml 2012-08-30 10:08:53.758735211 +0200
-@@ -134,12 +134,9 @@
+diff --git a/pom.xml b/pom.xml
+index 53db856..cec146f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -135,12 +135,9 @@
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
- <compilerArgument>-Xlint:unchecked</compilerArgument>
+ <!-- compilerArgument>-Xlint:unchecked</compilerArgument -->
<excludes>
@@ -15,7 +17,7 @@
</exclude>
<exclude>
@@ -299,14 +296,13 @@
- <version>2.2.1</version>
+ <version>2.3.1</version>
</dependency>
-<!--
@@ -27,21 +29,23 @@
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
<version>3.1.0</version>
-+ <scope>provided</scope>
- <scope>compile</scope>
++ <scope>provided</scope>
</dependency>
--->
+
</dependencies>
</project>
---- src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java.bak 2010-10-13 00:41:40.000000000 +0200
-+++ src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java 2012-08-30 10:13:25.619637005 +0200
-@@ -248,6 +248,8 @@
+diff --git a/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java b/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java
+index 9008e9b..33b925e 100644
+--- a/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java
++++ b/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java
+@@ -248,6 +248,8 @@ public class JDTJavaCompiler implements JavaCompiler {
return className.toCharArray();
}
+ public boolean ignoreOptionalProblems() {return false;}
-+
++
public char[] getContents() {
char[] result = null;
Reader reader = null;
diff --git a/glassfish-jsp-port-to-servlet-3.1.patch b/glassfish-jsp-port-to-servlet-3.1.patch
new file mode 100644
index 0000000..6736838
--- /dev/null
+++ b/glassfish-jsp-port-to-servlet-3.1.patch
@@ -0,0 +1,26 @@
+From c1b2515c5994ba581827e9543ffa10897ab1f035 Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb(a)redhat.com>
+Date: Thu, 2 Jan 2014 16:20:40 +0100
+Subject: [PATCH] Port to servlet 3.1
+
+---
+ src/main/java/org/apache/jasper/servlet/JspCServletContext.java | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/main/java/org/apache/jasper/servlet/JspCServletContext.java b/src/main/java/org/apache/jasper/servlet/JspCServletContext.java
+index ff89225..01cd21a 100644
+--- a/src/main/java/org/apache/jasper/servlet/JspCServletContext.java
++++ b/src/main/java/org/apache/jasper/servlet/JspCServletContext.java
+@@ -883,4 +883,9 @@ public class JspCServletContext implements ServletContext {
+ return this.jspPropertyGroups;
+ }
+ }
++
++ @Override
++ public String getVirtualServerName() {
++ throw new UnsupportedOperationException("Not implemented yet");
++ }
+ }
+--
+1.8.3.1
+
diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
index 9bc0ec3..367a3e4 100644
--- a/glassfish-jsp.spec
+++ b/glassfish-jsp.spec
@@ -1,13 +1,12 @@
%global artifactId javax.servlet.jsp
-%global jspspec 2.2
+%global jspspec 2.3
Name: glassfish-jsp
-Version: 2.2.6
-Release: 11%{?dist}
+Version: 2.3.2
+Release: 1%{?dist}
Summary: Glassfish J2EE JSP API implementation
-Group: Development/Libraries
License: (CDDL or GPLv2 with exceptions) and ASL 2.0
URL: http://glassfish.org
Source0: %{artifactId}-%{version}.tar.xz
@@ -18,6 +17,7 @@ Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
Source3: https://svn.java.net/svn/glassfish~svn/tags/legal-1.1/src/main/resources/...
Patch0: %{name}-build-eclipse-compilers.patch
+Patch1: %{name}-port-to-servlet-3.1.patch
BuildArch: noarch
@@ -37,7 +37,7 @@ Requires: glassfish-jsp-api
%description
This project provides a container independent implementation of JSP
-2.2. The main goals are:
+2.3. The main goals are:
* Improves current implementation: bug fixes and performance
improvements
* Provides API for use by other tools, such as Netbeans
@@ -47,14 +47,14 @@ This project provides a container independent implementation of JSP
%package javadoc
Summary: API documentation for %{name}
-Group: Documentation
%description javadoc
%{summary}.
%prep
%setup -q -n %{artifactId}-%{version}
-%patch0
+%patch0 -p1
+%patch1 -p1
cp -p %{SOURCE2} LICENSE
cp -p %{SOURCE3} cddllicense.txt
@@ -94,6 +94,11 @@ popd
%changelog
+* Thu Jan 02 2014 Michal Srb <msrb(a)redhat.com> - 2.3.2-1
+- Update to upstream version 2.3.2
+- Port to servlet 3.1
+- Drop group tag
+
* Mon Aug 05 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.6-11
- Add javax.servlet.jsp directory and provides
diff --git a/sources b/sources
index 7bcc4fd..a73c21b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-f5cb9c16d3de1d7c548d52dc2c8a8c78 javax.servlet.jsp-2.2.6.tar.xz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
750f58ec5aa643312ec92473fe229fe5 LICENSE.txt
+265e3e379568abfce46dc731dbad9ef0 javax.servlet.jsp-2.3.2.tar.xz
10 years, 3 months
[glassfish-jsp-api] Update sources
by Michal Srb
commit c0393566359041be7a08d0c32af0b0a9331a7e5d
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Jan 2 16:55:48 2014 +0100
Update sources
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 74d44e2..363de19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/javax.servlet.jsp-api-2.2.1.tar.xz
+/javax.servlet.jsp-api-2.3.1.tar.xz
diff --git a/sources b/sources
index 4680182..58d7ecf 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-146980bfb81e6fbd5a58d4cf30497f16 javax.servlet.jsp-api-2.2.1.tar.xz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
edd10f4fe16aeb62cf8aee5a0c7e54e1 cddllicense.txt
+2832aa34ede54b3c1f46141eaa70cbaf javax.servlet.jsp-api-2.3.1.tar.xz
10 years, 3 months
[glassfish-jsp-api] Update to upstream version 2.3.1
by Michal Srb
commit e7677990649cc890895b4cf19aa26d179f170349
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Jan 2 15:25:03 2014 +0100
Update to upstream version 2.3.1
glassfish-jsp-api.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/generate_tarball.sh b/generate_tarball.sh
old mode 100644
new mode 100755
diff --git a/glassfish-jsp-api.spec b/glassfish-jsp-api.spec
index 55f50f0..9cfd88a 100644
--- a/glassfish-jsp-api.spec
+++ b/glassfish-jsp-api.spec
@@ -3,8 +3,8 @@
Name: glassfish-jsp-api
-Version: 2.2.1
-Release: 8%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
Summary: Glassfish J2EE JSP API specification
License: (CDDL or GPLv2 with exceptions) and ASL 2.0
@@ -64,6 +64,9 @@ sed -i "/<bundle.symbolicName>/s/-api//" pom.xml
%changelog
+* Thu Jan 02 2014 Michal Srb <msrb(a)redhat.com> - 2.3.1-1
+- Update to upstream version 2.3.1
+
* Mon Aug 05 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-8
- Update to latest packaging guidelines
10 years, 3 months