[maven-jarsigner-plugin] Update to upstream version 1.4
by Michael Šimáček
commit 9a93eae436cc858396e4cbdef4791ce38e21c22c
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Tue Feb 3 13:10:44 2015 +0100
Update to upstream version 1.4
.gitignore | 1 +
maven-jarsigner-plugin.spec | 18 ++++++++++--------
sources | 2 +-
3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b6730c..a123e15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/maven-jarsigner-plugin-1.3-source-release.zip
/maven-jarsigner-plugin-1.3.1-source-release.zip
/maven-jarsigner-plugin-1.3.2-source-release.zip
+/maven-jarsigner-plugin-1.4-source-release.zip
diff --git a/maven-jarsigner-plugin.spec b/maven-jarsigner-plugin.spec
index de26b8e..52675ef 100644
--- a/maven-jarsigner-plugin.spec
+++ b/maven-jarsigner-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-jarsigner-plugin
-Version: 1.3.2
-Release: 3%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Signs or verifies a project artifact and attachments using jarsigner
License: ASL 2.0
URL: http://maven.apache.org/plugins/%{name}/
@@ -9,16 +9,15 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}
BuildArch: noarch
BuildRequires: maven-local
-BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
-BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
-BuildRequires: mvn(org.apache.maven.shared:maven-jarsigner) >= 1.3.2
-BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) >= 0.6
BuildRequires: mvn(org.apache.maven:maven-artifact)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
+BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires: mvn(org.apache.maven.shared:maven-jarsigner)
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
BuildRequires: mvn(org.sonatype.plexus:plexus-sec-dispatcher)
-BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
+
%description
This plugin provides the capability to sign or verify
@@ -57,6 +56,9 @@ This package contains the API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
+* Tue Feb 03 2015 Michael Simacek <msimacek(a)redhat.com> - 1.4-1
+- Update to upstream version 1.4
+
* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.3.2-3
- Fix build-requires on parent POM
diff --git a/sources b/sources
index 2ee78a9..8d52dea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec02834ee8a2f8d99787920ed39e6425 maven-jarsigner-plugin-1.3.2-source-release.zip
+e982421d608f4d4a8c7168b5828a824f maven-jarsigner-plugin-1.4-source-release.zip
9 years, 4 months
[glassfish-master-pom] introduce license macro
by gil
commit 3c2526226c83f17f38440ee421209a1832c54794
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 11:48:59 2015 +0100
introduce license macro
glassfish-master-pom.spec | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/glassfish-master-pom.spec b/glassfish-master-pom.spec
index a441a55..83805d7 100644
--- a/glassfish-master-pom.spec
+++ b/glassfish-master-pom.spec
@@ -1,6 +1,6 @@
Name: glassfish-master-pom
Version: 8
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Master POM for Glassfish Maven projects
License: CDDL or GPLv2 with exceptions
URL: http://glassfish.java.net/
@@ -11,7 +11,6 @@ Source0: %{name}-%{version}-src-svn.tar.gz
# glassfish-master-pom package don't include the license file
Source1: glassfish-LICENSE.txt
-BuildRequires: java-devel
BuildRequires: maven-local
BuildArch: noarch
@@ -34,9 +33,12 @@ sed -i 's/\r//' LICENSE.txt
%mvn_install
%files -f .mfiles
-%doc LICENSE.txt
+%license LICENSE.txt
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 8-6
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 4 months
[glassfish-management-api] introduce license macro
by gil
commit 95806db084c5ef240c02afe90bd333295733e8c5
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 11:28:09 2015 +0100
introduce license macro
glassfish-management-api.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/glassfish-management-api.spec b/glassfish-management-api.spec
index 749bac5..03f85db 100644
--- a/glassfish-management-api.spec
+++ b/glassfish-management-api.spec
@@ -2,7 +2,7 @@
%global namedversion %{version}%{?namedreltag}
Name: glassfish-management-api
Version: 3.2.0
-Release: 0.5.b001%{?dist}
+Release: 0.6.b001%{?dist}
Summary: GlassFish Common APIs
License: CDDL or GPLv2 with exceptions
URL: http://java.net/projects/gmbal/pages/Home
@@ -17,7 +17,6 @@ Source2: glassfish-LICENSE.txt
Patch0: %{name}-%{namedversion}-remove-gpg-plugin.patch
-BuildRequires: java-devel
BuildRequires: jvnet-parent
BuildRequires: maven-local
@@ -63,21 +62,25 @@ cp -p %{SOURCE1} pom.xml
cp -p %{SOURCE2} LICENSE.txt
sed -i 's/\r//' LICENSE.txt
+%mvn_file :management-api %{name}
+
%build
-%mvn_file :management-api %{name}
%mvn_build
%install
%mvn_install
%files -f .mfiles
-%doc LICENSE.txt
+%license LICENSE.txt
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%license LICENSE.txt
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 3.2.0-0.6.b001
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2.0-0.5.b001
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 4 months
[glassfish-hk2] add maven-site-plugin as BR
by gil
commit 64ae67835cb2e1b9541cac1900484c3f9c8e1165
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 11:23:19 2015 +0100
add maven-site-plugin as BR
glassfish-hk2.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/glassfish-hk2.spec b/glassfish-hk2.spec
index ca0f2de..c70d28c 100644
--- a/glassfish-hk2.spec
+++ b/glassfish-hk2.spec
@@ -58,6 +58,7 @@ BuildRequires: maven-enforcer-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
+BuildRequires: maven-site-plugin
BuildRequires: maven-source-plugin
BuildArch: noarch
9 years, 4 months
[glassfish-legal] introduce license macro
by gil
commit c3509cf49c4c09acae39b2488a028ae398ad23df
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 10:58:52 2015 +0100
introduce license macro
glassfish-legal.spec | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/glassfish-legal.spec b/glassfish-legal.spec
index 89f33a3..e1752d8 100644
--- a/glassfish-legal.spec
+++ b/glassfish-legal.spec
@@ -1,6 +1,6 @@
Name: glassfish-legal
Version: 1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Legal License for glassfish code
License: CDDL or GPLv2 with exceptions
URL: http://glassfish.java.net/
@@ -8,8 +8,6 @@ URL: http://glassfish.java.net/
# tar czf glassfish-legal-1.1-src-svn.tar.gz glassfish-legal-1.1
Source0: %{name}-%{version}-src-svn.tar.gz
-BuildRequires: java-devel
-
BuildRequires: glassfish-master-pom
BuildRequires: maven-local
BuildRequires: maven-remote-resources-plugin
@@ -26,18 +24,22 @@ An archive which contains license files for glassfish code.
sed -i 's/\r//' src/main/resources/META-INF/LICENSE.txt
cp -p src/main/resources/META-INF/LICENSE.txt .
+%mvn_file :legal %{name}
+
%build
-%mvn_file :legal %{name}
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
%mvn_install
%files -f .mfiles
-%doc LICENSE.txt
+%license LICENSE.txt
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 1.1-6
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 4 months
[glassfish-jaxws] introduce license macro
by gil
commit 3ab89a0d81c0e30012153ed81a491d05d6883b56
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 10:55:46 2015 +0100
introduce license macro
glassfish-jaxws.spec | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/glassfish-jaxws.spec b/glassfish-jaxws.spec
index eacd6f8..76c8c80 100644
--- a/glassfish-jaxws.spec
+++ b/glassfish-jaxws.spec
@@ -1,8 +1,7 @@
Name: glassfish-jaxws
Version: 2.2.7
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: JAX-WS Reference Implementation (RI) Project
-Group: Development/Libraries
# ASL 2.0
# tools/wscompile/src/com/sun/tools/ws/ant/AnnotationProcessingTask.java
# tools/wscompile/src/com/sun/tools/ws/wsdl/parser/NamespaceContextImpl.java
@@ -106,14 +105,12 @@ evolves the code base for the reference implementation of
the Java API for XML Web Services (JAX-WS) specification.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
This package contains javadoc for %{name}.
%package tools
-Group: Development/Libraries
Summary: JAX-WS Reference Implementation Tools
Requires: %{name} = %{version}-%{release}
Requires: codemodel
@@ -130,7 +127,6 @@ Open source Reference Implementation of
JSR-224: Java API for XML Web Services.
%package transports
-Group: Development/Libraries
Summary: JAX-WS RI Transports Implementation
Requires: %{name} = %{version}-%{release}
Requires: istack-commons
@@ -143,7 +139,6 @@ This package provides Implementation of:
for JAX-WS RI.
%package tools-javadoc
-Group: Documentation
Summary: Javadoc for %{name}-tools
%description tools-javadoc
@@ -230,23 +225,27 @@ cp -rp build/javadocs/tools/* %{buildroot}%{_javadocdir}/%{name}-tools
%files -f .mfiles
%dir %{_javadir}/%{name}
-%doc CDDL+GPLv2.html CDDL+GPLv2.txt CDDL-1.0-license.txt LICENSE.txt README
+%doc README
+%license CDDL+GPLv2.html CDDL+GPLv2.txt CDDL-1.0-license.txt LICENSE.txt
%files javadoc
%{_javadocdir}/%{name}
-%doc CDDL+GPLv2.html CDDL+GPLv2.txt CDDL-1.0-license.txt LICENSE.txt README
+%license CDDL+GPLv2.html CDDL+GPLv2.txt CDDL-1.0-license.txt LICENSE.txt
%files tools -f .mfiles-tools
-%doc CDDL+GPLv2.html CDDL+GPLv2.txt CDDL-1.0-license.txt LICENSE.txt README
+%doc CDDL+GPLv2.html CDDL+GPLv2.txt CDDL-1.0-license.txt LICENSE.txt
%files transports -f .mfiles-transports
-%doc CDDL+GPLv2.html CDDL+GPLv2.txt CDDL-1.0-license.txt LICENSE.txt README
+%license CDDL+GPLv2.html CDDL+GPLv2.txt CDDL-1.0-license.txt LICENSE.txt
%files tools-javadoc
%{_javadocdir}/%{name}-tools
-%doc CDDL+GPLv2.html CDDL+GPLv2.txt CDDL-1.0-license.txt LICENSE.txt README
+%license CDDL+GPLv2.html CDDL+GPLv2.txt CDDL-1.0-license.txt LICENSE.txt
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 2.2.7-6
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 4 months
[glassfish-jax-rs-api] introduce license macro
by gil
commit 78bd21f8d270507fcf2cb001bd47905237164273
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 10:45:36 2015 +0100
introduce license macro
glassfish-jax-rs-api.spec | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/glassfish-jax-rs-api.spec b/glassfish-jax-rs-api.spec
index 8f854f0..0b2ab08 100644
--- a/glassfish-jax-rs-api.spec
+++ b/glassfish-jax-rs-api.spec
@@ -3,7 +3,7 @@
%global oname javax.ws.rs-api
Name: glassfish-jax-rs-api
Version: 2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: JAX-RS API Specification (JSR 339)
License: CDDL or GPLv2 with exceptions
URL: http://jax-rs-spec.java.net/
@@ -11,9 +11,7 @@ URL: http://jax-rs-spec.java.net/
# (cd glassfish-jax-rs-api/ && git archive --format=tar --prefix=glassfish-jax-rs-api-2.0/ 2.0 | xz > ../glassfish-jax-rs-api-2.0-src-git.tar.xz)
Source0: %{name}-%{namedversion}-src-git.tar.xz
-BuildRequires: java-devel
BuildRequires: jvnet-parent
-
# test deps
BuildRequires: junit
@@ -22,7 +20,6 @@ BuildRequires: maven-local
BuildRequires: maven-plugin-bundle
BuildRequires: maven-resources-plugin
BuildRequires: maven-source-plugin
-BuildRequires: maven-surefire-provider-junit
BuildRequires: spec-version-maven-plugin
# Disabled on rawhide: texlive is broken
@@ -116,17 +113,21 @@ cd src/jax-rs-api
)
%files -f src/jax-rs-api/.mfiles
-%doc copyright.txt
+%license copyright.txt
%files javadoc -f src/jax-rs-api/.mfiles-javadoc
-%doc copyright.txt
+%license copyright.txt
%if 0
%files manual
-%doc copyright.txt spec/spec.pdf src/examples
+%doc spec/spec.pdf src/examples
+%license copyright.txt
%endif
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 2.0-7
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 4 months
