From c7cb2964529ed85b59fba58812cc07fce9466f80 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Sun, 20 Nov 2011 22:11:22 +0400 Subject: [PATCH] - Versioning changes - Use only needed sources - Udev rules moved to lib - More license info added - adb and fastboot moved to provides from summary --- android-tools.spec | 28 ++++++++++++++++++++-------- sources | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/android-tools.spec b/android-tools.spec index 367d9f5..3603565 100644 --- a/android-tools.spec +++ b/android-tools.spec @@ -1,18 +1,18 @@ -%global date 20111115 +%global date 20111120 %global git_commit 4a25390 %global packdname core-%{git_commit} Name: android-tools -Version: %{date}.%{git_commit} +Version: %{date}git%{git_commit} Release: 1%{?dist} -Summary: Android platform tools (adb, fastboot, etc.) +Summary: Android platform tools Group: Applications/System License: ASL 2.0 and BSD URL: http://www.android.com/ # using git archive since upstream hasn't created tarballs. -# git archive --format=tar --prefix=%{packdname}/ %{git_commit} | xz > %{packdname}.tar.xz +# git archive --format=tar --prefix=%%{packdname}/ %%{git_commit} adb fastboot libzipfile libcutils mkbootimg include/cutils include/zipfile | xz > %%{packdname}.tar.xz # https://android.googlesource.com/platform/system/core.git Source0: %{packdname}.tar.xz @@ -23,6 +23,9 @@ Source4: 51-android.rules BuildRequires: zlib-devel +Provides: adb +Provides: fastboot + %description The Android Debug Bridge (ADB) is used to: @@ -56,18 +59,27 @@ make %{?_smp_mflags} %install install -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} -install -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d -install -D -m 0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d/51-android.rules +install -d -m 0755 ${RPM_BUILD_ROOT}/lib/udev/rules.d +install -D -m 0644 %{SOURCE4} ${RPM_BUILD_ROOT}/lib/udev/rules.d/51-android.rules make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} %files -%doc adb/OVERVIEW.TXT adb/SERVICES.TXT adb/protocol.txt +%doc adb/OVERVIEW.TXT adb/SERVICES.TXT adb/NOTICE adb/protocol.txt +#ASL2.0 %{_bindir}/adb +#BSD %{_bindir}/fastboot -%{_sysconfdir}/udev/rules.d/51-android.rules +/lib/udev/rules.d/51-android.rules %changelog +* Sun Nov 20 2011 Ivan Afonichev - 20111120git4a25390-1 +- Versioning changes +- Use only needed sources +- Udev rules moved to lib +- More license info added +- adb and fastboot moved to provides from summary + * Tue Nov 15 2011 Ivan Afonichev - 20111115.4a25390-1 - Change upstream git repo URL - Update to upstream git commit 4a25390 diff --git a/sources b/sources index 8a24ede..4379de7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d645a77cd8d6d4098cb923b534770d27 core-4a25390.tar.xz +c9f5b88cf44dde7734665af8ea3e5631 core-4a25390.tar.xz