From 81911e370fd2cebdd8ef2c50581e6b24cb87d96bb4c3b402c005fe06e0d25bbd Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 22 Sep 2012 08:32:00 +0000 Subject: [PATCH] Accepting request 135340 from home:jengelh:branches:graphics - Parallel build with %_smp_mflags - .la files for plugins are useless - remove them OBS-URL: https://build.opensuse.org/request/show/135340 OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=83 --- libgphoto2.changes | 6 ++++++ libgphoto2.spec | 9 ++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libgphoto2.changes b/libgphoto2.changes index e12f3a0..5fa05b6 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 21 18:18:24 UTC 2012 - jengelh@inai.de + +- Parallel build with %_smp_mflags +- .la files for plugins are useless - remove them + ------------------------------------------------------------------- Thu Sep 13 08:45:14 UTC 2012 - meissner@suse.com diff --git a/libgphoto2.spec b/libgphoto2.spec index 4092d10..75a8ab1 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -85,7 +85,7 @@ PATH="/usr/X11R6/bin:$PATH" \ --with-doc-dir=%{_defaultdocdir}/%{name} \ --without-hal \ --with-drivers=all -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %check make check @@ -113,15 +113,10 @@ mv doc/doxygen-output/libgphoto2-api.html apidocs fn=$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libgphoto2_port.pc grep -v driverdir= $fn > $fn.new mv $fn.new $fn -# These two should not be required, but the driver .la can stay -rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2.la -rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2_port.la +find "%buildroot/%_libdir" -type f -name "*.la" -delete %fdupes $RPM_BUILD_ROOT -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %{_libdir}/libgphoto2