Rebuilt for linker errors in boost (#1331983)

liblas.spec

@@ -1,88 +1,99 @@
-Summary:	LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset
 Name:		liblas
 Version:	1.8.0
-Release:	10%{?dist}
+Release:	13%{?dist}
+Summary:	Library for reading and writing the very common LAS LiDAR format
+
+Group:		System Environment/Libraries
 License:	BSD and Boost
-Source:		http://download.osgeo.org/%{name}/libLAS-%{version}.tar.bz2
-URL:		http://www.liblas.org/
-BuildRequires:	cmake, libgeotiff-devel, boost-devel >= 1.53 laszip-devel
-BuildRequires:	libtiff-devel, gdal-devel
-Requires:	%{name}-libs%{?_isa} = %{version}-%{release}, laszip
+URL:		http://www.liblas.org
+Source0:	http://download.osgeo.org/%{name}/libLAS-%{version}.tar.bz2
+
+BuildRequires:	boost-devel >= 1.53
+BuildRequires:	cmake
+BuildRequires:	gdal-devel
+BuildRequires:	laszip-devel
+BuildRequires:	libgeotiff-devel
 
 %description
 libLAS is a C/C++ library for reading and writing the very common LAS LiDAR
-format. The ASPRS LAS format is a sequential binary format used to store data
-from LiDAR sensors and by LiDAR processing software for data interchange and
-archival.
+format. The ASPRS LAS format is a sequential binary format used to store
+data from LiDAR sensors and by LiDAR processing software for data
+interchange and archival.
 
 %package devel
-Summary:        The development files for liblas
-Group:          Development/Libraries
-Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+Summary:	libLAS development files
+Group:		Development/Libraries
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+
+Requires:	boost-devel >= 1.53
+Requires:	gdal-devel
+Requires:	laszip-devel
+Requires:	libgeotiff-devel
 
 %description devel
-Development headers and libraries for liblas.
+libLAS deveolpment files.
 
-%package libs
-Summary:        The shared libraries required for liblas
-Group:          Applications/Databases
+%package tools
+Summary:	libLAS utility applications
+Group:		Development/Libraries
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
-%description libs
-The liblas-libs package provides the essential shared libraries for any
-liblasL client program or interface. You will need to install this package
-to use liblas
+%description tools
+libLAS utility applications.
 
 %prep
 %setup -q -n libLAS-%{version}
+sed -i -e 's#@libdir@#%{_libdir}#' \
+	-e 's#@Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE@#-lboost_program_options#' \
+	-e 's#@Boost_THREAD_LIBRARY_RELEASE@#-lboost_thread#' \
+	-e 's#@GDAL_LIBRARY@#-lgdal#' \
+	-e 's#@GEOTIFF_LIBRARY@#-lgeotiff#' \
+	-e 's#@TIFF_LIBRARY@#-ltiff#' \
+	-e 's#@LASZIP_LIBRARY@#-llaszip#' \
+	%{_builddir}/libLAS-%{version}/apps/liblas-config.in
 
 %build
-%cmake	-DWITH_GDAL:BOOL=ON \
-	-DWITH_GEOTIFF:BOOL=ON \
-	-DGEOTIFF_INCLUDE_DIR:PATH="$(pkg-config --variable=includedir libgeotiff)" \
-	-DWITH_LASZIP:BOOL=ON \
-	-DWITH_TESTS:BOOL=OFF \
-	-DWITH_UTILITIES:BOOL=ON \
-	-DLIBLAS_LIB_SUBDIR:PATH=%{_lib} \
+%cmake \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
+	-DCMAKE_SKIP_RPATH:BOOL=ON \
+	-DGEOTIFF_INCLUDE_DIR:PATH="%{_includedir}/libgeotiff" \
+	-DLIBLAS_LIB_SUBDIR:PATH="%{_lib}" \
 	-DWITH_PKGCONFIG:BOOL=OFF \
-	-DCMAKE_SKIP_RPATH:BOOL=ON .
-
+	-DWITH_TESTS:BOOL=OFF .
 make %{?_smp_mflags}
 
 %install
-make install/fast DESTDIR=%{buildroot}
+%make_install
 
 %postun -p /sbin/ldconfig
 %post -p /sbin/ldconfig
 
-%files libs
-%license LICENSE.txt
-%{_libdir}/liblas.so
-%{_libdir}/liblas_c.so
-
 %files
-%doc AUTHORS README.txt
-%{_includedir}/liblas
-%{_datadir}/cmake/libLAS-%{version}
-%{_bindir}/las2las
-%{_bindir}/las2ogr
-%{_bindir}/las2txt
-%{_bindir}/lasblock
-%{_bindir}/lasinfo
-%{_bindir}/ts2las
-%{_bindir}/txt2las
-%{_libdir}/liblas.so.2.3.0
-%{_libdir}/liblas.so.3
-%{_libdir}/liblas_c.so.2.3.0
-%{_libdir}/liblas_c.so.3
+%exclude %{_datadir}/%{name}/
+%{_libdir}/*.so.*
 
 %files devel
+%license LICENSE.txt
 %{_bindir}/liblas-config
-%{_includedir}/liblas/
 %{_datadir}/cmake/libLAS-%{version}/
-%{_datadir}/%{name}/doc/
+%{_includedir}/%{name}/
+%{_libdir}/*.so
+
+%files tools
+%doc AUTHORS README.txt
+%exclude %{_bindir}/liblas-config
+%{_bindir}/*
 
 %changelog
+* Fri May 20 2016 Jonathan Wakely <jwakely@redhat.com> - 1.8.0-13
+- Rebuilt for linker errors in boost (#1331983)
+
+* Tue Mar 15 2016 Thomas Kreuzer <thomas.kreuzer@uni-vechta.de> - 1.8.0-12
+- Put licence file into correct place.
+
+* Thu Mar 10 2016 Thomas Kreuzer <thomas.kreuzer@uni-vechta.de> - 1.8.0-11
+- Fix bug #1311953
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -111,8 +122,8 @@ make install/fast DESTDIR=%{buildroot}
  - Own directories in -devel subpackage
  - omit deprecated Group: tags and %%clean section
  - Use better macros for make and cmake
- - use %%{?_isa} macro in subpkg dependencies
- - have %build section envoke 'make'
+ - use %%%{?_isa} macro in subpkg dependencies
+ - have %%build section envoke 'make'
  - Update %%install section
  - Improve cmake build parameters, also fix rpath
  - move liblaszip.so symlink to -devel subpkg