Use pre-built desktop-file-utils binaries to remove dependency from glib

Change-Id: Iedb090669be3fcf6332d5aad312b15ca6c4b443e

diff --git a/packaging/rpmlint-mini.spec b/packaging/rpmlint-mini.spec
index 1db08d5..0566926 100644 (file)
--- a/packaging/rpmlint-mini.spec
+++ b/packaging/rpmlint-mini.spec
@@ -19,7 +19,7 @@ Version:        1.5
 Release:        0
 Url:            http://rpmlint.zarb.org/
 Source:         %{name}-%{version}.tar.bz2
-Source99:       desktop-file-utils-0.22.tar.xz
+#Source99:       desktop-file-utils-0.22.tar.xz
 Source100:      rpmlint-deps.txt
 Source101:      rpmlint.wrapper
 Source102:      rpmlint-mini.config
@@ -32,19 +32,31 @@ Rpmlint is a tool to check common errors on rpm packages. Binary and
 source packages can be checked.
 
 %prep
-%setup -q  -b 99
+#%setup -q  -b 99
+%setup -q
 cp %{SOURCE1001} .
-cd ../desktop-file-utils-0.22
+#cd ../desktop-file-utils-0.22
 
 %build
-cd ../desktop-file-utils-0.22
-%configure
-pushd src
-make desktop-file-validate V=1 DESKTOP_FILE_UTILS_LIBS="%{_libdir}/libglib-2.0.a -lpthread -lrt"
-popd
+#cd ../desktop-file-utils-0.22
+#pushd src
+#make desktop-file-validate V=1 DESKTOP_FILE_UTILS_LIBS="%{_libdir}/libglib-2.0.a -lpthread -lrt"
+#popd
 
 %install
-cd ../desktop-file-utils-0.22
+%ifarch armv7l
+%define ARCH armv7l
+%endif
+%ifarch %ix86
+%define ARCH i586
+%endif
+%ifarch x86_64
+%define ARCH x86_64
+%endif
+%ifarch aarch64
+%define ARCH aarch64
+%endif
+#cd ../desktop-file-utils-0.22
 pwd
 # test if the rpmlint works at all
 set +e
@@ -53,7 +65,7 @@ test $? -gt 0 -a $? -lt 60 && exit 1
 set -e
 # okay, lets put it together
 mkdir -p $RPM_BUILD_ROOT/opt/testing/share/rpmlint
-install -m 755 -D src/desktop-file-validate $RPM_BUILD_ROOT/opt/testing/bin/desktop-file-validate
+install -m 755 -D src/%{ARCH}/desktop-file-validate $RPM_BUILD_ROOT/opt/testing/bin/desktop-file-validate
 cp -a /usr/share/rpmlint/*.py $RPM_BUILD_ROOT/opt/testing/share/rpmlint
 # install config files
 install -d -m 755 $RPM_BUILD_ROOT/opt/testing/share/rpmlint/mini

diff --git a/src/aarch64/desktop-file-validate b/src/aarch64/desktop-file-validate
new file mode 100755 (executable)
index 0000000..ca23e8c
Binary files /dev/null and b/src/aarch64/desktop-file-validate differ

diff --git a/src/armv7l/desktop-file-validate b/src/armv7l/desktop-file-validate
new file mode 100755 (executable)
index 0000000..199198d
Binary files /dev/null and b/src/armv7l/desktop-file-validate differ

diff --git a/src/i586/desktop-file-validate b/src/i586/desktop-file-validate
new file mode 100755 (executable)
index 0000000..4593450
Binary files /dev/null and b/src/i586/desktop-file-validate differ

diff --git a/src/x86_64/desktop-file-validate b/src/x86_64/desktop-file-validate
new file mode 100755 (executable)
index 0000000..4ea35ae
Binary files /dev/null and b/src/x86_64/desktop-file-validate differ