rpms/android-json-org-java
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to 5.0.2_r1

Browse source
This commit is contained in:
gil 2015-02-23 03:58:49 +01:00
commit 7630b43bb9
4 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
android-json-org-java.spec
View file

@ -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