Fix build for x64_86 arch and clean spec file.

Change-Id: I9f90a776dfd7345f833d57b13a5df8c9cc3bfcf1
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/packaging/gcd.spec b/packaging/gcd.spec
index ad5fbd2..9366b68 100644 (file)
--- a/packaging/gcd.spec
+++ b/packaging/gcd.spec
@@ -1,5 +1,3 @@
-%define gcc_version %(LANG=C gcc --version | head -1 | sed 's/.* (.*) \\([0-9]\\.[0-9]\\).*$/\\1/')
-
 Name:       gcd
 Summary:    GCD(Grand Central Dispatch) library
 Version:    1.0
@@ -9,77 +7,58 @@ Group:      System/Libraries
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  clang
 
-
 %description
-GCD(Grand Central Dispatch) library.
+Grand Central Dispatch (GCD) is a technology developed by Apple Inc.
 
 %package devel
 Summary:    GCD(Grand Central Dispatch) library
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-GCD(Grand Central Dispatch) library. (DEV)
-
+Grand Central Dispatch (GCD) is a technology developed by Apple Inc. (DEV)
 
 %prep
-%setup -q -n gcd-1.0
+%setup -q -n %{name}-%{version}
 
 %build
-
-cd kqueue-1.0.4
-./configure --prefix=/usr
-make
-cd ..
-cd pthread_workqueue-0.8.2
-./configure --prefix=/usr
-make
-cd ..
-cd BlocksRuntime-0.1
-./configure --prefix=/usr
-make
-cd ..
-cd dispatch-1.0
+for sub_pkg in kqueue-1.0.4 \
+               pthread_workqueue-0.8.2 \
+               BlocksRuntime-0.1; do
+    pushd ${sub_pkg}
+    %configure
+    make
+    popd
+done
+
+pushd dispatch-1.0
 export KQUEUE_CFLAGS="-I../../kqueue-1.0.4/include"
-export KQUEUE_LIBS="/usr/lib"
+export KQUEUE_LIBS="%{_libdir}"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/BlocksRuntime-0.1"
 export CFLAGS="$CFLAGS -L%{_builddir}/%{name}-%{version}/BlocksRuntime-0.1 -lBlocksRuntime -I%{_builddir}/%{name}-%{version}/BlocksRuntime-0.1 -Xlinker --build-id"
 
 %ifarch %{ix86}
 export CC="clang -target i586-tizen-linux"
-export CFLAGS="$CFLAGS -Xlinker -L/usr/lib/gcc/i586-tizen-linux/%{gcc_version}"
-export COMPILER_PATH=/usr/lib/gcc/i586-tizen-linux/%{gcc_version}
+export CFLAGS="$CFLAGS -Xlinker -L%{_libdir}/gcc/i586-tizen-linux/%{gcc_version}"
+export COMPILER_PATH=%{_libdir}/gcc/i586-tizen-linux/%{gcc_version}
 %else
-export CC="clang -target %{_target_cpu}-tizen-linux-gnueabi"
-export CFLAGS="$CFLAGS -Xlinker -L/usr/lib/gcc/%{_target_cpu}-tizen-linux-gnueabi/%{gcc_version}"
-export COMPILER_PATH=/usr/lib/gcc/%{_target_cpu}-tizen-linux-gnueabi/%{gcc_version}
+export CC="clang -target %{_target_cpu}-tizen-linux"
+export CFLAGS="$CFLAGS -Xlinker -L%{_libdir}/gcc/%{_target_cpu}-tizen-linux/%{gcc_version}"
+export COMPILER_PATH=%{_libdir}/gcc/%{_target_cpu}-tizen-linux/%{gcc_version}
 %endif
 
-./configure --with-blocks-runtime=/usr/lib --prefix=/usr
+%configure --with-blocks-runtime=%{_libdir}
 make
-cd ..
+popd
 
 %install
-cd kqueue-1.0.4
-make DESTDIR=$RPM_BUILD_ROOT install
-gzip $RPM_BUILD_ROOT/usr/share/man/man2/kqueue.2
-gzip $RPM_BUILD_ROOT/usr/share/man/man2/kevent.2
-cd ..
-cd pthread_workqueue-0.8.2
-make DESTDIR=$RPM_BUILD_ROOT install
-cd ..
-cd BlocksRuntime-0.1
-make DESTDIR=$RPM_BUILD_ROOT install
-cd ..
-cd dispatch-1.0
-%ifarch %{ix86}
-export COMPILER_PATH=/usr/lib/gcc/i586-tizen-linux/%{gcc_version}
-%else
-export COMPILER_PATH=/usr/lib/gcc/%{_target_cpu}-tizen-linux-gnueabi/%{gcc_version}
-%endif
-make DESTDIR=$RPM_BUILD_ROOT install
-cd ..
-
-find %{?buildroot:%{buildroot}} -regex ".*\\.la$" | xargs rm -f --
+for sub_pkg in kqueue-1.0.4 \
+               pthread_workqueue-0.8.2 \
+               BlocksRuntime-0.1 \
+               dispatch-1.0; do
+    pushd ${sub_pkg}
+    %make_install
+    popd
+done
 
 %post -p /sbin/ldconfig
 
@@ -89,19 +68,14 @@ find %{?buildroot:%{buildroot}} -regex ".*\\.la$" | xargs rm -f --
 %defattr(-,root,root)
 %manifest gcd.manifest
 %license LICENSE
-%{_libdir}/libkqueue.so.0
-%{_libdir}/libkqueue.so.0.0
-%{_libdir}/libpthread_workqueue.so.0
-%{_libdir}/libpthread_workqueue.so.0.0
-%{_libdir}/libBlocksRuntime.so.0
-%{_libdir}/libBlocksRuntime.so.0.0
-%{_libdir}/libdispatch.so.0
-%{_libdir}/libdispatch.so.0.0.0
+%{_libdir}/libkqueue.so.*
+%{_libdir}/libpthread_workqueue.so.*
+%{_libdir}/libBlocksRuntime.so.*
+%{_libdir}/libdispatch.so.*
 
 %files devel
 %{_includedir}/kqueue/sys/event.h
 %{_libdir}/libkqueue.so
-%{_libdir}/libkqueue.a
 %{_libdir}/pkgconfig/libkqueue.pc
 %{_includedir}/pthread_workqueue.h
 %{_libdir}/libpthread_workqueue.so
@@ -109,9 +83,6 @@ find %{?buildroot:%{buildroot}} -regex ".*\\.la$" | xargs rm -f --
 %{_includedir}/Block_private.h
 %{_libdir}/libBlocksRuntime.so
 %{_includedir}/dispatch/*.h
-%{_libdir}/libdispatch.a
 %{_libdir}/libdispatch.so
-/usr/share/man/man3/pthread_workqueue.3.gz
-/usr/share/man/man2/kqueue.2.gz
-/usr/share/man/man2/kevent.2.gz
-/usr/share/man/man3/dispatch*
+%{_mandir}/man2/*.gz
+%{_mandir}/man3/*.gz
\ No newline at end of file