From 049af024c55959ab806447fdd2ece68b97cb67bf Mon Sep 17 00:00:00 2001 From: vehre Date: Fri, 21 Jun 2013 17:09:09 +0100 Subject: [PATCH 1/2] Fixed make on fedora 17. --- bgrive/CMakeLists.txt | 3 ++- package/fedora16/grive.spec | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/bgrive/CMakeLists.txt b/bgrive/CMakeLists.txt index 074ab383..5190e91a 100644 --- a/bgrive/CMakeLists.txt +++ b/bgrive/CMakeLists.txt @@ -40,4 +40,5 @@ set_target_properties( bgrive_executable ) install(TARGETS bgrive_executable RUNTIME DESTINATION bin) -install(FILES doc/grive.1 DESTINATION share/man/man1 ) +# The man package is missing. +#install(FILES doc/grive.1 DESTINATION share/man/man1 )diff --git a/package/fedora16/grive.spec b/package/fedora16/grive.spec diff --git a/package/fedora16/grive.spec b/package/fedora16/grive.spec index 03770b9d..556cdc80 100644 --- a/package/fedora16/grive.spec +++ b/package/fedora16/grive.spec @@ -36,6 +36,7 @@ BuildRequires: expat-devel BuildRequires: openssl-devel BuildRequires: boost-devel BuildRequires: binutils-devel +BuildRequires: yajl-devel %description The purpose of this project is to provide an independent implementation @@ -63,19 +64,24 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -%post -p /sbin/ldconfig +# As long as no dynamic libs are build omit ldconfig and the glob for them. +#%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +#%postun -p /sbin/ldconfig %files -%doc COPYING README +%doc COPYING README %{_bindir}/%{name} -%{_libdir}/libgrive.so.* +%{_bindir}/b%{name} +%{_mandir}/man1/%{name}.1.gz -%files devel -%{_includedir}/%{name}* -%{_libdir}/libgrive.so +#%{_libdir}/libgrive.so.* + +# Files are not installed by cmake currently. +#%files devel +#%{_includedir}/%{name}* +#%{_libdir}/libgrive.so From 8d0716cb08b38e1e49b1fe3a14c1dd773f17f369 Mon Sep 17 00:00:00 2001 From: vehre Date: Wed, 10 Jul 2013 15:18:07 +0200 Subject: [PATCH 2/2] Fedora 19 has json-c as library libjson-c and no longer as libjson. Fixed cmake module to respect this change. --- cmake/Modules/FindJSONC.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Modules/FindJSONC.cmake b/cmake/Modules/FindJSONC.cmake index f72e8ea1..ed6f0f09 100644 --- a/cmake/Modules/FindJSONC.cmake +++ b/cmake/Modules/FindJSONC.cmake @@ -7,7 +7,7 @@ # JSONC_LIBRARY - The JSON-C library to link against. FIND_PATH(JSONC_INCLUDE_DIR json/json.h) -FIND_LIBRARY(JSONC_LIBRARY NAMES json) +FIND_LIBRARY(JSONC_LIBRARY NAMES json-c json) IF (JSONC_INCLUDE_DIR AND JSONC_LIBRARY) SET(JSONC_FOUND TRUE)