[jogl2] Remove another debug message
by Clément David
commit 8a95c4c2349e20341954a83b22c1b101fb139b43
Author: Clément DAVID <clement.david(a)scilab-enterprises.com>
Date: Mon May 6 14:43:15 2013 +0200
Remove another debug message
jogl2-0002-deactivate-debug-printf.patch | 15 +++++++++++++++
jogl2.spec | 5 ++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/jogl2-0002-deactivate-debug-printf.patch b/jogl2-0002-deactivate-debug-printf.patch
index 535a35e..1d206e6 100644
--- a/jogl2-0002-deactivate-debug-printf.patch
+++ b/jogl2-0002-deactivate-debug-printf.patch
@@ -57,3 +57,18 @@
fprintf(stderr, "XineramaIsEnabled: has Xinerama Ext: ext %d, query-func %p\n", gotXinExt, xineramaQueryFunc);
#endif
+--- a/src/nativewindow/native/x11/Xmisc.c
++++ b/src/nativewindow/native/x11/Xmisc.c
+@@ -187,10 +187,12 @@ static int x11ErrorHandler(Display *dpy,
+ XGetErrorDatabaseText(dpy, "XRequest", errCodeStr, "Unknown", reqCodeStr, sizeof(reqCodeStr));
+ XGetErrorText(dpy, e->error_code, errCodeStr, sizeof(errCodeStr));
+
++/*
+ fprintf(stderr, "Info: Nativewindow X11 Error: %d - %s, dpy %p, id %x, # %d: %d:%d %s\n",
+ e->error_code, errCodeStr, e->display, (int)e->resourceid, (int)e->serial,
+ (int)e->request_code, (int)e->minor_code, reqCodeStr);
+ fflush(stderr);
++*/
+
+ if( NULL != jvmHandle && ( errorHandlerDebug || errorHandlerThrowException ) ) {
+ jniEnv = NativewindowCommon_GetJNIEnv(jvmHandle, jvmVersion, &shallBeDetached);
diff --git a/jogl2.spec b/jogl2.spec
index 4a51ba0..61b3531 100644
--- a/jogl2.spec
+++ b/jogl2.spec
@@ -1,7 +1,7 @@
# baserelease defines which build revision of this version we're building.
# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
# you should use.
-%global baserelease 8
+%global baserelease 9
%global pkg_name jogl
%global pkg_version 2.0
@@ -170,6 +170,9 @@ find %{buildroot}%{_docdir}/%{name} -name '*.html' \
%{_docdir}/%{name}
%changelog
+* Mon May 06 2013 Clément David <c.david86(a)gmail.com> - 2.0-0.9.rc11
+- Remove another debug message
+
* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 2.0-0.8.rc11
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local
11 years
[jsonp] rebuilt with spec-version-maven-plugin support
by gil
commit c2b4366332ea17a375e8193159571a6baea4b0e2
Author: gil <puntogil(a)libero.it>
Date: Sun May 26 19:51:25 2013 +0200
rebuilt with spec-version-maven-plugin support
jsonp.spec | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/jsonp.spec b/jsonp.spec
index b659b22..32508d6 100644
--- a/jsonp.spec
+++ b/jsonp.spec
@@ -2,7 +2,7 @@
%global namedversion %{version}%{?namedreltag}
Name: jsonp
Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: JSR 353 (JSON Processing) RI
Group: Development/Libraries
License: CDDL or GPLv2 with exceptions
@@ -17,7 +17,7 @@ Source1: glassfish-LICENSE.txt
BuildRequires: java-devel
BuildRequires: jvnet-parent
-BuildRequires: glassfish-jax-rs-api
+BuildRequires: glassfish-jax-rs-api >= 2.0-2
#test deps
BuildRequires: junit
@@ -29,8 +29,9 @@ BuildRequires: maven-plugin-bundle
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
#BuildRequires: maven-surefire-provider-junit4
+BuildRequires: spec-version-maven-plugin
-Requires: glassfish-jax-rs-api
+Requires: glassfish-jax-rs-api >= 2.0-2
Requires: java
BuildArch: noarch
@@ -59,10 +60,8 @@ find . -name '*.class' -delete
%pom_remove_plugin org.glassfish.copyright:glassfish-copyright-maven-plugin
%pom_remove_plugin org.codehaus.mojo:wagon-maven-plugin
-%pom_remove_plugin org.glassfish.build:spec-version-maven-plugin
-%pom_remove_plugin org.glassfish.build:spec-version-maven-plugin api
%pom_remove_plugin org.apache.maven.plugins:maven-dependency-plugin impl
-%pom_remove_plugin org.glassfish.build:spec-version-maven-plugin impl
+
# disabled source and javadoc jars
%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
%pom_remove_plugin :maven-source-plugin api
@@ -72,8 +71,6 @@ find . -name '*.class' -delete
%pom_remove_plugin :maven-source-plugin impl
%pom_remove_plugin :maven-javadoc-plugin jaxrs
-%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Bundle-Version" api
-%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Bundle-Version" impl
# disable apis copy
%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Export-Package" impl
@@ -119,6 +116,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt
%changelog
+* Sun May 26 2013 gil cattaneo <puntogil(a)libero.it> 1.0-2
+- rebuilt with spec-version-maven-plugin support
+
* Tue May 07 2013 gil cattaneo <puntogil(a)libero.it> 1.0-1
- update to 1.0
11 years
[glassfish-jax-rs-api] rebuilt with spec-version-maven-plugin support
by gil
commit dc93a8666f062b365d39084ad362b1a322952d46
Author: gil <puntogil(a)libero.it>
Date: Sun May 26 19:11:43 2013 +0200
rebuilt with spec-version-maven-plugin support
glassfish-jax-rs-api.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/glassfish-jax-rs-api.spec b/glassfish-jax-rs-api.spec
index 4bc1e35..19876b5 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: 1%{?dist}
+Release: 2%{?dist}
Summary: JAX-RS API Specification (JSR 339)
Group: Development/Libraries
License: CDDL or GPLv2 with exceptions
@@ -28,6 +28,7 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
+BuildRequires: spec-version-maven-plugin
BuildRequires: make
BuildRequires: texlive-amsfonts
@@ -79,14 +80,13 @@ find . -name '*.jar' -delete
find . -name '*.class' -delete
%pom_remove_plugin org.glassfish.copyright:glassfish-copyright-maven-plugin src/jax-rs-api
-%pom_remove_plugin org.glassfish.build:spec-version-maven-plugin src/jax-rs-api
+
# Reporting mojo's can only be called from ReportDocumentRender
%pom_remove_plugin org.apache.maven.plugins:maven-jxr-plugin src/jax-rs-api
%pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin src/jax-rs-api
%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin src/jax-rs-api
%pom_xpath_remove "pom:build/pom:finalName" src/jax-rs-api
-%pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId ='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Bundle-Version" src/jax-rs-api
sed -i "s|dvips|pdftex|" spec/spec.tex
@@ -126,6 +126,9 @@ cp -pr src/jax-rs-api/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc copyright.txt spec/spec.pdf src/examples
%changelog
+* Sun May 26 2013 gil cattaneo <puntogil(a)libero.it> 2.0-2
+- rebuilt with spec-version-maven-plugin support
+
* Tue May 07 2013 gil cattaneo <puntogil(a)libero.it> 2.0-1
- update to 2.0
11 years
[glassfish-annotation-api] rebuilt with spec-version-maven-plugin support
by gil
commit 8f87fcb0504de3373ca781f9c5cf9184a80ae6c1
Author: gil <puntogil(a)libero.it>
Date: Sun May 26 19:10:17 2013 +0200
rebuilt with spec-version-maven-plugin support
glassfish-annotation-api.spec | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/glassfish-annotation-api.spec b/glassfish-annotation-api.spec
index 2611f3c..7f236ee 100644
--- a/glassfish-annotation-api.spec
+++ b/glassfish-annotation-api.spec
@@ -3,7 +3,7 @@
%global oname javax.annotation-api
Name: glassfish-annotation-api
Version: 1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Common Annotations API Specification (JSR 250)
Group: Development/Libraries
License: CDDL or GPLv2 with exceptions
@@ -26,6 +26,7 @@ BuildRequires: maven-remote-resources-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-surefire-plugin
+BuildRequires: spec-version-maven-plugin
Requires: java
BuildArch: noarch
@@ -44,14 +45,6 @@ This package contains javadoc for %{name}.
%setup -q -n %{name}-%{namedversion}
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
-%pom_remove_plugin org.glassfish.build:spec-version-maven-plugin
-
-# fix manifest
-%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Bundle-Version"
-sed -i "s|spec.extension.name|extension.name|" pom.xml
-sed -i "s|spec.bundle.symbolic-name|bundle.symbolicName|" pom.xml
-sed -i "s|spec.implementation.version|spec.version|" pom.xml
-sed -i "s|spec.specification.version|spec.version|" pom.xml
%build
@@ -83,6 +76,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt
%changelog
+* Sun May 26 2013 gil cattaneo <puntogil(a)libero.it> 1.2-3
+- rebuilt with spec-version-maven-plugin support
+
* Wed May 22 2013 gil cattaneo <puntogil(a)libero.it> 1.2-2
- fixed manifest
11 years