update to 5.0.2_r1
This commit is contained in:
parent
030127105d
commit
7630b43bb9
4 changed files with 19 additions and 11 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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@libero.it> 5.0.2-0.1.r1
|
||||
- update to 5.0.2_r1
|
||||
|
||||
* Thu Jan 29 2015 gil cattaneo <puntogil@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@libero.it> 4.2.2-0.1.r1.2
|
||||
- initial rpm
|
||||
- initial rpm
|
||||
|
|
|
|||
2
sources
2
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
|
||||
|
|
|
|||
Reference in a new issue