up to 23.0.2

diff --git a/android-sdk.spec b/android-sdk.spec
index 484c2ba925463ac11836b6c2e6fa7d3dcacf3801..aa42c19b522848f109ce0ddca4bf8c5483d1cbab 100644 (file)
--- a/android-sdk.spec
+++ b/android-sdk.spec
@@ -1,16 +1,18 @@
 # TODO
 # - cleanups, system pkgs, system libs, what to package afterall?
+# - what's the license, distributable?
+# - adb can be found from eclipse-adt (adt-bundle-linux-x86_64-20140702/sdk/platform-tools)
 %include       /usr/lib/rpm/macros.java
 Summary:       The Android SDK has all you need to create great apps to Android
 Name:          android-sdk
-Version:       r18
+Version:       23.0.2
 Release:       0.1
-License:       Apache v2.0
-Group:         Development/Languages/Java
-URL:           http://developer.android.com/sdk/
-Source0:       http://dl.google.com/android/%{name}_%{version}-linux.tgz
-# Source0-md5: 6cd716d0e04624b865ffed3c25b3485c
+License:       ?
+Group:         Development/Building
+Source0:       http://dl.google.com/android/%{name}_r%{version}-linux.tgz
+# Source0-md5: 94a8c62086a7398cc0e73e1c8e65f71e
 NoSource:      0
+URL:           http://developer.android.com/sdk/
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
@@ -21,32 +23,34 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _appdir         %{_libdir}/%{name}
 
 %description
-The Android SDK has the tools, sample code, and docs you need to
-create great apps in Android Platform.
+The Android SDK provides you the API libraries and developer tools
+necessary to build, test, and debug apps for Android.
 
 %prep
-%setup -q -n %{name}-linux
+%setup -qc
+mv %{name}-linux/* .
 
 %ifnarch %{ix86}
 rm -rf tools/lib/x86
+rm -rf tools/lib/monitor-x86
 %endif
 %ifnarch %{x8664}
-rm -rf tools/lib/x86_64
+rm -rf tools/lib/
+rm -rf tools/lib/monitor-x86_64
 %endif
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_appdir}}
 
 cp -a add-ons platforms tools $RPM_BUILD_ROOT%{_appdir}
 
-# installer downloads files there
-install -d $RPM_BUILD_ROOT%{_appdir}/temp
-
 ln -s %{_appdir}/tools/ddms $RPM_BUILD_ROOT%{_bindir}/ddms
 ln -s %{_appdir}/tools/android $RPM_BUILD_ROOT%{_bindir}/android
 
+# installer downloads files there
+install -d $RPM_BUILD_ROOT%{_appdir}/temp
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -75,46 +79,71 @@ rm -rf $RPM_BUILD_ROOT
 %{_appdir}/tools/lib/*.jar
 %ifarch %{ix86}
 %dir %{_appdir}/tools/lib/x86
+%{_appdir}/tools/lib/monitor-x86
 %{_appdir}/tools/lib/x86/swt.jar
 %endif
 %ifarch %{x8664}
 %dir %{_appdir}/tools/lib/x86_64
+%{_appdir}/tools/lib/monitor-x86_64
 %{_appdir}/tools/lib/x86_64/swt.jar
+%attr(755,root,root) %{_appdir}/tools/lib/lib64EGL_translator.so
+%attr(755,root,root) %{_appdir}/tools/lib/lib64GLES_CM_translator.so
+%attr(755,root,root) %{_appdir}/tools/lib/lib64GLES_V2_translator.so
+%attr(755,root,root) %{_appdir}/tools/lib/lib64OpenglRender.so
 %endif
 %{_appdir}/tools/lib/android.el
 %{_appdir}/tools/lib/build.template
 %{_appdir}/tools/lib/devices.xml
 %{_appdir}/tools/lib/hardware-properties.ini
 %{_appdir}/tools/lib/plugin.prop
-%{_appdir}/tools/lib/libEGL_translator.so
-%{_appdir}/tools/lib/libGLES_CM_translator.so
-%{_appdir}/tools/lib/libGLES_V2_translator.so
-%{_appdir}/tools/lib/libOpenglRender.so
+
+%attr(755,root,root) %{_appdir}/tools/lib/libEGL_translator.so
+%attr(755,root,root) %{_appdir}/tools/lib/libGLES_CM_translator.so
+%attr(755,root,root) %{_appdir}/tools/lib/libGLES_V2_translator.so
+%attr(755,root,root) %{_appdir}/tools/lib/libOpenglRender.so
+
+%{_appdir}/tools/lib/build_gradle.template
+%{_appdir}/tools/lib/emulator/skins
+%{_appdir}/tools/lib/emulator/snapshots.img
 %{_appdir}/tools/lib/pc-bios/bios.bin
 %{_appdir}/tools/lib/pc-bios/vgabios-cirrus.bin
-#%{_appdir}/tools/lib/proguard.cfg
-%{_appdir}/tools/lib/emulator/snapshots.img
+%{_appdir}/tools/support
+%{_appdir}/tools/templates
 
 %{_appdir}/tools/NOTICE.txt
 %{_appdir}/tools/source.properties
 
+%{_appdir}/tools/lib/proguard-project.txt
+%{_appdir}/tools/lib/uibuild.template
+%{_appdir}/tools/proguard/README
+%{_appdir}/tools/proguard/docs
+%{_appdir}/tools/proguard/examples
+%{_appdir}/tools/proguard/license.html
+%{_appdir}/tools/proguard/proguard-android-optimize.txt
+%{_appdir}/tools/proguard/proguard-android.txt
+%{_appdir}/tools/proguard/proguard-project.txt
+
 %attr(755,root,root) %{_appdir}/tools/android
-%attr(755,root,root) %{_appdir}/tools/apkbuilder
 %attr(755,root,root) %{_appdir}/tools/ddms
-%attr(755,root,root) %{_appdir}/tools/dmtracedump
 %attr(755,root,root) %{_appdir}/tools/draw9patch
-%attr(755,root,root) %{_appdir}/tools/emulator
-%attr(755,root,root) %{_appdir}/tools/emulator-arm
-%attr(755,root,root) %{_appdir}/tools/emulator-x86
-%attr(755,root,root) %{_appdir}/tools/etc1tool
 %attr(755,root,root) %{_appdir}/tools/hierarchyviewer
-%attr(755,root,root) %{_appdir}/tools/hprof-conv
+%attr(755,root,root) %{_appdir}/tools/jobb
 %attr(755,root,root) %{_appdir}/tools/lint
 %attr(755,root,root) %{_appdir}/tools/mksdcard
+%attr(755,root,root) %{_appdir}/tools/monitor
 %attr(755,root,root) %{_appdir}/tools/monkeyrunner
-%attr(755,root,root) %{_appdir}/tools/sqlite3
+%attr(755,root,root) %{_appdir}/tools/screenshot2
 %attr(755,root,root) %{_appdir}/tools/traceview
-%attr(755,root,root) %{_appdir}/tools/zipalign
+%attr(755,root,root) %{_appdir}/tools/uiautomatorviewer
+
+%attr(755,root,root) %{_appdir}/tools/emulator
+%attr(755,root,root) %{_appdir}/tools/emulator-arm
+%attr(755,root,root) %{_appdir}/tools/emulator-mips
+%attr(755,root,root) %{_appdir}/tools/emulator-x86
+%attr(755,root,root) %{_appdir}/tools/emulator64-arm
+%attr(755,root,root) %{_appdir}/tools/emulator64-mips
+%attr(755,root,root) %{_appdir}/tools/emulator64-x86
+
 %attr(755,root,root) %{_appdir}/tools/proguard/bin/proguard.sh
 %attr(755,root,root) %{_appdir}/tools/proguard/bin/proguardgui.sh
 %attr(755,root,root) %{_appdir}/tools/proguard/bin/retrace.sh