Skip to content

Please pull for fixes to build on Fedora 17 and 19 #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vehre wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Please pull for fixes to build on Fedora 17 and 19 #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
049af02
Fixed make on fedora 17.
vehre Jun 21, 2013
8d0716c
Fedora 19 has json-c as library libjson-c and no longer as libjson. F…
vehre Jul 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bgrive/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cmake/Modules/FindJSONC.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 13 additions & 7 deletions package/fedora16/grive.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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



Expand Down