[android-tools/el6] first build for EPEL6

Adam Miller maxamillion at fedoraproject.org
Tue Nov 26 23:32:57 UTC 2013


commit ca608f1a2fcb67d310cf08e94172bed239f43672
Author: Adam Miller <admiller at redhat.com>
Date:   Tue Nov 26 17:32:43 2013 -0600

    first build for EPEL6

 adb.service        |   13 -------------
 android-tools.spec |   26 +++++++-------------------
 sources            |    2 +-
 3 files changed, 8 insertions(+), 33 deletions(-)
---
diff --git a/android-tools.spec b/android-tools.spec
index 4ed2b28..ff885c7 100644
--- a/android-tools.spec
+++ b/android-tools.spec
@@ -28,19 +28,17 @@ Source2:       core-Makefile
 Source3:       adb-Makefile
 Source4:       fastboot-Makefile
 Source5:       51-android.rules
-Source6:       adb.service
 
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
 BuildRequires: zlib-devel
 BuildRequires: openssl-devel
 BuildRequires: libselinux-devel
-BuildRequires: systemd
 
 Provides:      adb
 Provides:      fastboot
 
+# Doesn't build on PPC
+ExclusiveArch: %{ix86} x86_64
+
 %description
 
 The Android Debug Bridge (ADB) is used to:
@@ -74,31 +72,21 @@ make %{?_smp_mflags}
 
 %install
 install -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
+install -D -m 0644 %{SOURCE4} ${RPM_BUILD_ROOT}/lib/udev/rules.d/51-android.rules
 make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir}
-install -p -D -m 0644 %{SOURCE6} \
-    %{buildroot}%{_unitdir}/adb.service
-
-%post
-%systemd_post adb.service
-
-%preun
-%systemd_preun adb.service
-
-%postun
-%systemd_postun_with_restart adb.service
 
 %files
 %doc adb/OVERVIEW.TXT adb/SERVICES.TXT adb/NOTICE adb/protocol.txt 51-android.rules
-%{_unitdir}/adb.service
 #ASL2.0
 %{_bindir}/adb
 #ASL2.0 and BSD.
 %{_bindir}/fastboot
+/lib/udev/rules.d/51-android.rules
 
 
 %changelog
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20130123git98d0789-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Thu Nov 21 2013 Adam Miller <maxamillion at fedoraproject.org> - 20130123git98d0789-2
+- Remove systemd deps for EPEL EL6
 
 * Mon Jan 28 2013 Ivan Afonichev <ivan.afonichev at gmail.com> - 20130123git98d0789-1
 - Update to upstream git commit 98d0789
diff --git a/sources b/sources
index 340709c..a39633d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e6c0b8dd70952e97a068c3a61f812968  extras-4ff85ad.tar.xz
 8852699267ef36482ea917cc4381f583  core-98d0789.tar.xz
+e6c0b8dd70952e97a068c3a61f812968  extras-4ff85ad.tar.xz


More information about the scm-commits mailing list