[glassfish-jaxws] exclude message
by gil
commit bce685acd1854c7466a61f1d8d5390376acd3bab
Author: gil <puntogil(a)libero.it>
Date: Wed Feb 4 22:44:59 2015 +0100
exclude message
glassfish-jaxws.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/glassfish-jaxws.spec b/glassfish-jaxws.spec
index 945a414..1961cbf 100644
--- a/glassfish-jaxws.spec
+++ b/glassfish-jaxws.spec
@@ -165,7 +165,10 @@ find . -name "*.zip" -print -delete
javax.xml.ws;version=${jaxws-api.osgiVersion},
javax.xml.ws.handler;version=${jaxws-api.osgiVersion}
</Import-Package>' transports/local
-
+
+%pom_xpath_inject "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" "
+<excludePackageNames>*.message.*</excludePackageNames>"
+
%pom_remove_dep javax.jws:jsr181-api
%pom_remove_dep javax.jws:jsr181-api boms/bom
%pom_remove_dep javax.jws:jsr181-api bundles/jaxws-rt
9 years, 3 months
[testng] Update to 6.8.21
by gil
commit 7e935e410f6dc149e25536e5dfd5614db85195af
Author: gil <puntogil(a)libero.it>
Date: Wed Feb 4 22:28:59 2015 +0100
Update to 6.8.21
.gitignore | 1 +
sources | 2 +-
testng.spec | 11 ++++++++---
3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d895298..f46d75b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ testng-5.11.zip
/testng-6.8.8.tar.gz
/testng-6.8.14.tar.gz
/testng-6.8.17.tar.gz
+/testng-6.8.21.tar.gz
diff --git a/sources b/sources
index e8e5da3..62d7cca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a6487c0c6ee066578ca2a4fa4a9837b testng-6.8.17.tar.gz
+6d2331958850922796329a9d9e141e02 testng-6.8.21.tar.gz
diff --git a/testng.spec b/testng.spec
index f53112d..c6034cb 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
%global group_id org.testng
Name: testng
-Version: 6.8.17
+Version: 6.8.21
Release: 1%{?dist}
Summary: Java-based testing framework
# org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL
@@ -77,12 +77,17 @@ mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt
%mvn_install
%files -f .mfiles
-%doc LICENSE.txt ANNOUNCEMENT.txt CHANGES.txt README
+%doc ANNOUNCEMENT.txt CHANGES.txt README
+%license LICENSE.txt
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%license LICENSE.txt
%changelog
+* Tue Jan 20 2015 gil cattaneo <puntogil(a)libero.it> 6.8.21-1
+- Update to 6.8.21
+- introduce license macro
+
* Tue Jan 20 2015 gil cattaneo <puntogil(a)libero.it> 6.8.17-1
- Update to 6.8.17
9 years, 3 months
[glassfish-jaxws] fix BR jaxb-api-javadoc
by gil
commit 332d6fe076ba7df2e9f40b32d631068a36f5fd2f
Author: gil <puntogil(a)libero.it>
Date: Wed Feb 4 21:51:09 2015 +0100
fix BR jaxb-api-javadoc
glassfish-jaxws.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/glassfish-jaxws.spec b/glassfish-jaxws.spec
index bd6e11d..945a414 100644
--- a/glassfish-jaxws.spec
+++ b/glassfish-jaxws.spec
@@ -57,7 +57,7 @@ BuildRequires: mvn(org.jvnet.staxex:stax-ex)
BuildRequires: mvn(xml-resolver:xml-resolver)
BuildRequires: objectweb-asm3
-BuildRequires: glassfish-jaxb-javadoc
+BuildRequires: glassfish-jaxb-api-javadoc
BuildRequires: java-javadoc
BuildRequires: jboss-jaxws-2.2-api-javadoc
9 years, 3 months
[glassfish-jaxws] use system javadoc
by gil
commit 0b79552232e72c8caf43dbdf14d23ca293442aea
Author: gil <puntogil(a)libero.it>
Date: Wed Feb 4 21:46:43 2015 +0100
use system javadoc
glassfish-jaxws-2.2.10-javadoclinksdir.patch | 34 ++++++++++++++++++++++++++
glassfish-jaxws.spec | 7 +++++
2 files changed, 41 insertions(+), 0 deletions(-)
---
diff --git a/glassfish-jaxws-2.2.10-javadoclinksdir.patch b/glassfish-jaxws-2.2.10-javadoclinksdir.patch
new file mode 100644
index 0000000..0599850
--- /dev/null
+++ b/glassfish-jaxws-2.2.10-javadoclinksdir.patch
@@ -0,0 +1,34 @@
+--- pom.xml 2015-02-04 20:08:12.563723047 +0100
++++ pom.xml.javadoclinksdir 2015-02-04 21:36:07.060349442 +0100
+@@ -128,7 +128,7 @@
+ <properties>
+ <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+- <javadoc.links.dir>${project.parent.basedir}/src/main/javadoc-link</javadoc.links.dir>
++ <javadoc.links.dir>/usr/share/javadoc</javadoc.links.dir>
+ <javadoc.links.offline>false</javadoc.links.offline>
+ <findbugs.skip>false</findbugs.skip>
+ <findbugs.threshold>Normal</findbugs.threshold>
+@@ -361,19 +361,15 @@
+ <dependencySourceExcludes>
+ <dependencySourceExclude>com.sun.xml.ws:*</dependencySourceExclude>
+ </dependencySourceExcludes>
+- <additionalJOption>-J-Djava.endorsed.dirs=${endorsed.dir}</additionalJOption>
+ <offlineLinks>
+ <offlineLink>
+- <url>http://docs.oracle.com/javase/6/docs/api/</url>
+- <location>${javadoc.links.dir}/javase6/</location>
++ <location>${javadoc.links.dir}/java</location>
+ </offlineLink>
+ <offlineLink>
+- <url>http://jaxb.java.net/nonav/${jaxb-impl.version}/docs/api/</url>
+- <location>${javadoc.links.dir}/jaxb-api/</location>
++ <location>${javadoc.links.dir}/jaxb-api</location>
+ </offlineLink>
+ <offlineLink>
+- <url>http://jax-ws.java.net/nonav/jaxws-api/2.2/</url>
+- <location>${javadoc.links.dir}/jaxws-api/</location>
++ <location>${javadoc.links.dir}/jboss-jaxws-2.2-api</location>
+ </offlineLink>
+ </offlineLinks>
+ </configuration>
diff --git a/glassfish-jaxws.spec b/glassfish-jaxws.spec
index cfd3932..bd6e11d 100644
--- a/glassfish-jaxws.spec
+++ b/glassfish-jaxws.spec
@@ -22,6 +22,8 @@ Patch3: glassfish-jaxws-2.2.10-jaxb-xjc.patch
Patch4: glassfish-jaxws-2.2.10-deps.patch
+Patch5: glassfish-jaxws-2.2.10-javadoclinksdir.patch
+
BuildRequires: maven-local
BuildRequires: mvn(com.sun.istack:import-properties-plugin)
BuildRequires: mvn(com.sun.istack:istack-commons-maven-plugin)
@@ -55,6 +57,10 @@ BuildRequires: mvn(org.jvnet.staxex:stax-ex)
BuildRequires: mvn(xml-resolver:xml-resolver)
BuildRequires: objectweb-asm3
+BuildRequires: glassfish-jaxb-javadoc
+BuildRequires: java-javadoc
+BuildRequires: jboss-jaxws-2.2-api-javadoc
+
BuildArch: noarch
%description
@@ -95,6 +101,7 @@ rm -rf jaxws-ri
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p0
# clean up
find . -name "*.jar" -print -delete
9 years, 3 months
[gmetric4j] fix BRs
by gil
commit e4ba6dba221567193b8a8e645ca9ec844a384e94
Author: gil <puntogil(a)libero.it>
Date: Wed Feb 4 21:17:48 2015 +0100
fix BRs
gmetric4j.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gmetric4j.spec b/gmetric4j.spec
index 09c3452..da8cb35 100644
--- a/gmetric4j.spec
+++ b/gmetric4j.spec
@@ -8,7 +8,7 @@ Source0: https://github.com/ganglia/gmetric4j/archive/%{version}.tar.gz
#BuildRequires: remotetea
BuildRequires: mvn(org.acplt:oncrpc)
-BuildRequires: mvn(org.sonatype.oss:oss-parent)
+BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
# test deps
BuildRequires: mvn(junit:junit)
9 years, 3 months
[gsbase] introduce license macro
by gil
commit c0cb7f0ff28f4aa98ca032bdfcb0f96363eba443
Author: gil <puntogil(a)libero.it>
Date: Wed Feb 4 21:15:30 2015 +0100
introduce license macro
gsbase.spec | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/gsbase.spec b/gsbase.spec
index 8bfeecb..50552cc 100644
--- a/gsbase.spec
+++ b/gsbase.spec
@@ -1,6 +1,6 @@
Name: gsbase
Version: 2.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A collection of java utility classes
# http://gsbase.sourceforge.net/license.html Apache style license
License: ASL 2.0
@@ -10,7 +10,6 @@ Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-
# build fix for java7
Patch0: %{name}-%{version}-jdk7.patch
-BuildRequires: java-devel
BuildRequires: junit
BuildRequires: junitperf
BuildRequires: maven-local
@@ -37,13 +36,6 @@ rm -r docs/*
cp -pr %{SOURCE1} pom.xml
-%if %{?fedora} <= 18
-%pom_xpath_remove "pom:dependencies/pom:dependency[pom:artifactId='junitperf']/pom:version"
-%pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId='junitperf']" "
-<scope>system</scope>
-<systemPath>$(build-classpath junitperf)</systemPath>"
-%endif
-
%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-surefire-plugin']" "<version>2.14.2</version>"
# list.size expected:<2> but was:<0>
rm -r src/test/com/gargoylesoftware/base/resource/jdbc/WrapperTestCase.java \
@@ -55,22 +47,26 @@ rm -r src/test/com/gargoylesoftware/base/resource/jdbc/WrapperTestCase.java \
src/test/com/gargoylesoftware/base/resource/jdbc/StatementWrapperTest.java
# Require Java awt subsystem
rm -r src/test/com/gargoylesoftware/base/gui/TableLayoutTest.java
-
-%build
%mvn_file :%{name} %{name}
+
+%build
+
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
%mvn_install
%files -f .mfiles
-%doc LICENSE.txt
+%license LICENSE.txt
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%license LICENSE.txt
%changelog
+* Wed Feb 04 2015 gil cattaneo <puntogil(a)libero.it> 2.0.1-6
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -85,4 +81,4 @@ rm -r src/test/com/gargoylesoftware/base/gui/TableLayoutTest.java
- minor changes to adapt to current guideline
* Sat May 05 2012 gil cattaneo <puntogil(a)libero.it> 2.0.1-1
-- initial rpm
\ No newline at end of file
+- initial rpm
9 years, 3 months
[groovy18] introduce license macro
by gil
commit ebca34115e63d4a5c2ca4e793ff78f846f23bb17
Author: gil <puntogil(a)libero.it>
Date: Wed Feb 4 21:08:26 2015 +0100
introduce license macro
groovy18.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/groovy18.spec b/groovy18.spec
index f06544c..bdcead3 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -4,7 +4,7 @@
%global majorversion 1.8
Name: groovy18
Version: 1.8.9
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Dynamic language for the Java Platform
# Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded
@@ -180,16 +180,19 @@ install -p -m644 %{SOURCE2} \
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/%{name}-starter.conf
%doc README.md
-%doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
+%license LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
%files lib -f .mfiles-%{name}-lib
-%doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
+%license LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
%files javadoc
%{_javadocdir}/%{name}
-%doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
+%license LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
%changelog
+* Wed Feb 04 2015 gil cattaneo <puntogil(a)libero.it> 1.8.9-17
+- introduce license macro
+
* Tue Nov 25 2014 Michal Srb <msrb(a)redhat.com> - 1.8.9-16
- Fix JAR filename (Resolves: rhbz#1166707)
- Provide also :groovy:1.8.9 in addition to :groovy18:1.8.9
9 years, 3 months
[gmetric4j] introduce license macro
by gil
commit a5464638eed554a46d46ff91e9a37008b822ce4f
Author: gil <puntogil(a)libero.it>
Date: Wed Feb 4 21:04:32 2015 +0100
introduce license macro
gmetric4j.spec | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/gmetric4j.spec b/gmetric4j.spec
index eeb59af..09c3452 100644
--- a/gmetric4j.spec
+++ b/gmetric4j.spec
@@ -1,17 +1,14 @@
Name: gmetric4j
Version: 1.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: JVM instrumentation to Ganglia
License: BSD
URL: https://github.com/ganglia/gmetric4j
Source0: https://github.com/ganglia/gmetric4j/archive/%{version}.tar.gz
-BuildRequires: java-devel
-
#BuildRequires: remotetea
BuildRequires: mvn(org.acplt:oncrpc)
BuildRequires: mvn(org.sonatype.oss:oss-parent)
-
# test deps
BuildRequires: mvn(junit:junit)
@@ -49,9 +46,10 @@ sed -i '/Class-Path/d' src/main/resources/META-INF/MANIFEST.MF
rm -r src/test/java/info/ganglia/gmetric4j/gmetric/GMetricIT.java
+%mvn_file : %{name}
+
%build
-%mvn_file : %{name}
%mvn_build
%install
@@ -62,12 +60,16 @@ install -m 644 target/%{name}-%{version}-tests.jar \
%files -f .mfiles
%{_javadir}/%{name}-tests.jar
-%doc COPYING README
+%doc README
+%license COPYING
%files javadoc -f .mfiles-javadoc
-%doc COPYING
+%license COPYING
%changelog
+* Wed Feb 04 2015 gil cattaneo <puntogil(a)libero.it> 1.0.3-5
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -78,4 +80,4 @@ install -m 644 target/%{name}-%{version}-tests.jar \
- remove Boot Class-Path
* Sat Aug 03 2013 gil cattaneo <puntogil(a)libero.it> 1.0.3-1
-- initial rpm
\ No newline at end of file
+- initial rpm
9 years, 3 months