From f377cd8eeeee647fc6762327309756e3cad3a967bff20287e1cf914e4b087cb3 Mon Sep 17 00:00:00 2001 From: Bruno Friedmann Date: Sun, 15 Aug 2021 06:55:23 +0000 Subject: [PATCH] Accepting request 912189 from home:jengelh:branches:Application:Geo - Split bash-completion to its own package like e.g. NetworkManager. - Remove old rpm specfile constructs like %defattr. Trim author lists from package description. Set groups. Use multi-argument find -exec. - Drop extraneous Provides of the library package; this should all be autodetected. - Ensure that documentation is in fact processed by fdupes. OBS-URL: https://build.opensuse.org/request/show/912189 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/PDAL?expand=0&rev=23 --- PDAL.changes | 11 ++++++++ PDAL.spec | 76 ++++++++++++++++++++-------------------------------- 2 files changed, 40 insertions(+), 47 deletions(-) diff --git a/PDAL.changes b/PDAL.changes index 89e17ee..9d50e8e 100644 --- a/PDAL.changes +++ b/PDAL.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Aug 14 17:16:31 UTC 2021 - Jan Engelhardt + +- Split bash-completion to its own package like e.g. NetworkManager. +- Remove old rpm specfile constructs like %defattr. Trim author + lists from package description. Set groups. Use multi-argument + find -exec. +- Drop extraneous Provides of the library package; this should + all be autodetected. +- Ensure that documentation is in fact processed by fdupes. + ------------------------------------------------------------------- Fri Aug 13 08:29:11 UTC 2021 - Dirk Stoecker diff --git a/PDAL.spec b/PDAL.spec index 9f64f71..a1c0567 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -23,7 +23,7 @@ Name: PDAL Version: 2.2.0 Release: 0 -Summary: Point Data Abstraction Library. GDAL for point cloud data +Summary: Point Data Abstraction Library (GDAL for point cloud data) License: BSD-3-Clause Group: Productivity/Graphics/CAD URL: https://www.pdal.io/ @@ -78,61 +78,46 @@ BuildRequires: pkgconfig(libpq) # BuildRequires: python-sphinxcontrib-breathe # Doesn't exist on obs BuildRequires: python3-breathe Requires: lib%{name}%{soname} = %{version} -Recommends: bash-completion Provides: pdal = %{version} %description PDAL is a C++ BSD library for translating and manipulating point cloud data. It is very much like the GDAL library which handles raster and vector data. -See Readers and Writers for data formats PDAL supports, and see Filters for -filtering operations that you can apply with PDAL. In addition to the library code, PDAL provides a suite of command-line applications that users can conveniently use to process, filter, translate, and query point cloud data. See Applications for more information. -Developers and Sponsorship - -PDAL is developed by Howard Butler, Michael Gerlek, Andrew Bell, Brad Chambers -and others. Find out more about who contributes to PDAL at Contributors. - -Website : -https://www.pdal.io This package provides tools & utilities using PDAL library libpdal %package -n lib%{name}%{soname} -Summary: Point Data Abstraction Library. GDAL for point cloud data -Group: Productivity/Graphics/CAD -Provides: lib%{lname}%{soname} -Provides: libpdal%{soname} +Summary: Point Data Abstraction Library (GDAL for point cloud data) +Group: System/Libraries %description -n lib%{name}%{soname} PDAL is a C++ BSD library for translating and manipulating point cloud data. It is very much like the GDAL library which handles raster and vector data. -See Readers and Writers for data formats PDAL supports, and see Filters for -filtering operations that you can apply with PDAL. In addition to the library code, PDAL provides a suite of command-line applications that users can conveniently use to process, filter, translate, and query point cloud data. See Applications for more information. -Developers and Sponsorship -PDAL is developed by Howard Butler, Michael Gerlek, Andrew Bell, Brad Chambers -and others. Find out more about who contributes to PDAL at Contributors. - -Website : -https://www.pdal.io - -Note PDAL should not be confused with PCL (Point Cloud Library). PCL is a library specifically designed to provide algorithmic analysis and modification of point clouds. PDAL provides a limited interface to the PCL's facilities, but does not in general attempt to duplicate its capabilites. +PDAL is focused more on data access and translation than PCL. -PDAL is focused more on data access and translation than PCL. See -filters.pclblock for more background. +%package bash-completion +Summary: Bash completion for PDAL +Requires: bash-completion +Supplements: packageand(%{name}:bash-completion) +BuildArch: noarch -%package -n %{name}-devel +%description bash-completion +This package contain the bash completion command for PDAL. + +%package devel Summary: Development files and tools for PDAL applications Group: Development/Libraries/C and C++ Requires: cmake @@ -148,27 +133,26 @@ Provides: lib%{name}%{soname}-devel = %{version} Provides: lib%{name}-devel Provides: libpdal-devel -%description -n %{name}-devel +%description devel This package provides the headers files and tools you may need to develop applications using PDAL. -%package -n %{name}-doc +%package doc Summary: Documentation, examples and demos for PDAL -Group: Productivity/Graphics/CAD -Requires: %{name} = %{version} +Group: Documentation/Other BuildArch: noarch -%description -n %{name}-doc +%description doc This package provides the documentation and sources of examples and data demos of PDAL algorithms. %prep -%setup -q -n %{name}-%{version}-src +%autosetup -n %{name}-%{version}-src # Fix all wrong shebang and move to python3 only -find . -type f -iname "*.py" -exec sed -i 's,^#!%{_bindir}/env python,#!%{_bindir}/python3,' {} \; +find . -type f -iname "*.py" -exec sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,' {} + #Cleanup spurious perms in documentation -find ./doc/ -type f -exec chmod -v 0644 {} \; +find ./doc/ -type f -exec chmod -v 0644 {} + find ./doc/ -type f -iname "*.orig" -o -iname ".gitignore" -delete find ./doc/ -type f -iname "*.ai" -delete @@ -211,8 +195,8 @@ find ./doc/ -type f -iname "*.ai" -delete find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print %if 0%{?suse_version} -%fdupes %{buildroot} -%fdupes doc +%fdupes %{buildroot}/%{_prefix} +%fdupes -s doc %endif # Strange the @PDAL_CONFIG_LIBRARY_DIRS@ is wrongly expanded /usr//usr/lib64/ in PDALConfig.cmake @@ -232,15 +216,10 @@ sed -i 's,/usr//usr/lib64,%{_libdir},g' %{buildroot}/%{_libdir}/cmake/PDAL/PDALC %postun -n lib%{name}%{soname} -p /sbin/ldconfig %files -%defattr(-,root,root,-) %license LICENSE.txt %{_bindir}/pdal -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/pdal %files -n lib%{name}%{soname} -%defattr(-,root,root,-) %license LICENSE.txt %doc AUTHORS.txt README.md RELEASENOTES.txt %{_libdir}/libpdal_base.so.%{sovers} @@ -250,8 +229,12 @@ sed -i 's,/usr//usr/lib64,%{_libdir},g' %{buildroot}/%{_libdir}/cmake/PDAL/PDALC %{_libdir}/libpdal_plugin_writer_pgpointcloud.so.%{sovers} %{_libdir}/libpdal_util.so.%{sovers} -%files -n %{name}-devel -%defattr(-,root,root,-) +%files bash-completion +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/pdal + +%files devel %license LICENSE.txt %doc AUTHORS.txt README.md CONTRIBUTING.md %{_includedir}/pdal @@ -272,8 +255,7 @@ sed -i 's,/usr//usr/lib64,%{_libdir},g' %{buildroot}/%{_libdir}/cmake/PDAL/PDALC %{_libdir}/cmake/PDAL %{_bindir}/pdal-config -%files -n %{name}-doc -%defattr(-,root,root,-) +%files doc %doc doc %changelog