From 963da6a414cdeb62b6ec6027caeb68043b6d94df Mon Sep 17 00:00:00 2001 From: Till Hofmann Date: Mar 30 2017 09:47:54 +0000 Subject: Update to 1.12.1, switch to cmake --- diff --git a/librealsense.spec b/librealsense.spec index e828cee..b9fca7b 100644 --- a/librealsense.spec +++ b/librealsense.spec @@ -1,17 +1,17 @@ Name: librealsense -Version: 1.9.7 -Release: 2%{?dist} +Version: 1.12.1 +Release: 1%{?dist} Summary: Cross-platform camera capture for Intel RealSense License: ASL 2.0 URL: https://github.com/IntelRealSense/librealsense -Source0: https://github.com/IntelRealSense/librealsense/archive/v1.9.7.tar.gz#/librealsense-%{version}.tar.gz -Patch0: librealsense.destdir.patch -Patch1: librealsense.armflags.patch +Source0: https://github.com/IntelRealSense/librealsense/archive/v%{version}.tar.gz#/librealsense-%{version}.tar.gz +#Patch0: librealsense.destdir.patch +#Patch1: librealsense.armflags.patch +BuildRequires: cmake BuildRequires: doxygen BuildRequires: libusb-devel -BuildRequires: glfw-devel BuildRequires: systemd ExcludeArch: %{arm} @@ -38,8 +38,8 @@ developing applications that use %{name}. Summary: Documentation for %{name} %description doc -The %{name}-doc package contains documentation for developing applications with -%{name}. +The %{name}-doc package contains documentation for developing applications +with %{name}. %prep @@ -47,17 +47,32 @@ The %{name}-doc package contains documentation for developing applications with %build -%make_build library - +mkdir -p build +pushd build +%cmake \ + -DBUILD_UNIT_TESTS=NO \ + -DCMAKE_INSTALL_BINDIR=%{_bindir} \ + -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ + .. +%make_build realsense + +popd sed -i "s:/usr/local/bin:%{_libdir}/realsense:" config/* sed -i "s/plugdev/users/g" config/*rules pushd doc/Doxygen_API +# Do not generate Windows help files +sed -i \ + -e "s/GENERATE_HTMLHELP[[:space:]]*=[[:space:]]*YES/GENERATE_HTMLHELP = NO/" \ + Doxyfile doxygen %install -%make_install LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir} +pushd build +%make_install realsense +popd mkdir -p %{buildroot}/%{_udevrulesdir} install -p -m644 config/99-realsense-libusb.rules %{buildroot}/%{_udevrulesdir} @@ -73,18 +88,23 @@ install -p -m755 config/usb-R200-in{,_udev} %{buildroot}/%{_libdir}/realsense %files %license LICENSE %doc readme.md -%{_libdir}/*.so +%{_libdir}/librealsense.so.* %{_libdir}/realsense %{_udevrulesdir}/* %files devel %{_includedir}/* +%{_libdir}/librealsense.so %files doc %doc doc/Doxygen_API/html/* %changelog +* Mon Jan 16 2017 Till Hofmann - 1.12.1-1 +- Update to 1.12.1 +- Switch to cmake for building the package + * Mon Jan 16 2017 Till Hofmann - 1.9.7-2 - Fix paths in udev rules