[android-json-org-java] update to 5.0.2_r1
gil
gil at fedoraproject.org
Mon Feb 23 02:58:59 UTC 2015
commit 7630b43bb97f46869e6600b77b06fadd099c16bf
Author: gil <puntogil at libero.it>
Date: Mon Feb 23 03:58:49 2015 +0100
update to 5.0.2_r1
.gitignore | 1 +
android-json-org-java-template.pom | 8 ++++----
android-json-org-java.spec | 19 +++++++++++++------
sources | 2 +-
4 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fe5dca..a9c1ab4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/android-json-org-java-4.3_r3.1-src-git.tar.xz
+/android-json-org-java-5.0.2_r1.tar.xz
diff --git a/android-json-org-java-template.pom b/android-json-org-java-template.pom
index 6008430..bcf5670 100644
--- a/android-json-org-java-template.pom
+++ b/android-json-org-java-template.pom
@@ -28,8 +28,8 @@
</organization>
<properties>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
+ <maven.compile.source>1.6</maven.compile.source>
+ <maven.compile.target>1.6</maven.compile.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@ -54,9 +54,9 @@
<includes>
<include>**/*Test.java</include>
</includes>
- <systemPropertyVariables>
+ <!--systemPropertyVariables>
<file.encoding>${project.build.sourceEncoding}</file.encoding>
- </systemPropertyVariables>
+ </systemPropertyVariables-->
</configuration>
</plugin>
<plugin>
diff --git a/android-json-org-java.spec b/android-json-org-java.spec
index f6a121c..3178e2a 100644
--- a/android-json-org-java.spec
+++ b/android-json-org-java.spec
@@ -1,15 +1,15 @@
-%global namedreltag _r3.1
+%global namedreltag _r1
%global namedversion %{version}%{?namedreltag}
%global oname json
Name: android-json-org-java
-Version: 4.3
-Release: 0.3.r3.1%{?dist}
+Version: 5.0.2
+Release: 0.1.r1%{?dist}
Summary: Androids rewrite of the evil licensed Json.org
License: ASL 2.0
URL: https://android.googlesource.com/platform/libcore/+/master/json
# git clone https://android.googlesource.com/platform/libcore/ android-json-org-java
-# (cd android-json-org-java/json/ && git archive --format=tar --prefix=android-json-org-java-4.3_r3.1/ android-4.3_r3.1 | xz > ../../android-json-org-java-4.3_r3.1-src-git.tar.xz)
-Source0: %{name}-%{namedversion}-src-git.tar.xz
+# (cd android-json-org-java/json/ && git archive --format=tar --prefix=android-json-org-java-5.0.2_r1/ android-5.0.2_r1 | xz > ../../android-json-org-java-5.0.2_r1.tar.xz)
+Source0: %{name}-%{namedversion}.tar.xz
Source1: %{name}-template.pom
# android-json-org-java package don't include the license file
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -36,6 +36,10 @@ This package contains javadoc for %{name}.
%prep
%setup -q -n %{name}-%{namedversion}
%patch0 -p0
+
+sed -i '/java.nio.channels.Selector.open/d' \
+ src/test/java/org/json/JSONObjectTest.java
+
cp -p %{SOURCE1} pom.xml
sed -i "s|<version>@version@|<version>%{namedversion}|" pom.xml
cp -p %{SOURCE2} .
@@ -60,6 +64,9 @@ rm -rf MODULE_LICENSE_BSD_LIKE
%license LICENSE-2.0.txt
%changelog
+* Sun Feb 22 2015 gil cattaneo <puntogil at libero.it> 5.0.2-0.1.r1
+- update to 5.0.2_r1
+
* Thu Jan 29 2015 gil cattaneo <puntogil at libero.it> 4.3-0.3.r3.1
- introduce license macro
@@ -73,4 +80,4 @@ rm -rf MODULE_LICENSE_BSD_LIKE
- fix license tag
* Mon Jan 14 2013 gil cattaneo <puntogil at libero.it> 4.2.2-0.1.r1.2
-- initial rpm
\ No newline at end of file
+- initial rpm
diff --git a/sources b/sources
index def9381..af5dde1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8fb28a4757291098c6956f3083d306c6 android-json-org-java-4.3_r3.1-src-git.tar.xz
+8411bd130671a0dc098487e4f1cb00b4 android-json-org-java-5.0.2_r1.tar.xz
More information about the scm-commits
mailing list