[packages/netcdf-cxx] - updated for recent texinfo; versioned Obsoletes, release 8

[qboosh]

commit 79324202b277a3819f724807e48de3d668f220d7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Dec 16 21:17:10 2024 +0100

    - updated for recent texinfo; versioned Obsoletes, release 8

 netcdf-cxx-info.patch | 23 ++++++++++++++++++++---
 netcdf-cxx.spec       | 13 ++++++-------
 2 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/netcdf-cxx.spec b/netcdf-cxx.spec
index 8c04018..c945221 100644
--- a/netcdf-cxx.spec
+++ b/netcdf-cxx.spec
@@ -1,13 +1,12 @@
 #
 # Conditional build:
-%bcond_without	tests		# don't perform "make check"
-				# (note: tests need endoder-enabled szip)
+%bcond_without	tests	# unit tests (need endoder-enabled szip)
 #
 Summary:	NetCDF C++ library (old API)
 Summary(pl.UTF-8):	Biblioteka NetCDF dla języka C++ (stare API)
 Name:		netcdf-cxx
 Version:	4.2
-Release:	7
+Release:	8
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.unidata.ucar.edu/pub/netcdf/%{name}-%{version}.tar.gz
@@ -21,7 +20,7 @@ BuildRequires:	libtool >= 2:2.2
 BuildRequires:	netcdf-devel >= 4.2
 BuildRequires:	texinfo
 Requires:	netcdf >= 4.2
-Obsoletes:	netcdf-c++
+Obsoletes:	netcdf-c++ < 4.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,7 +50,7 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	libstdc++-devel
 Requires:	netcdf-devel >= 4.2
-Obsoletes:	netcdf-c++-devel
+Obsoletes:	netcdf-c++-devel < 4.2
 
 %description devel
 Header files for netCDF - old C++ interface.
@@ -64,7 +63,7 @@ Summary:	NetCDF C++ static library (old API)
 Summary(pl.UTF-8):	Biblioteka statyczna netCDF dla języka C++ (stare API)
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
-Obsoletes:	netcdf-c++-static
+Obsoletes:	netcdf-c++-static < 4.2
 
 %description static
 Static version of netCDF C++ library with old API.
@@ -74,7 +73,7 @@ Statyczna wersja biblioteki netCDF dla języka C++ ze starym API.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch -P0 -p1
 
 %build
 %{__libtoolize}
diff --git a/netcdf-cxx-info.patch b/netcdf-cxx-info.patch
index d71f313..d936634 100644
--- a/netcdf-cxx-info.patch
+++ b/netcdf-cxx-info.patch
@@ -1,6 +1,14 @@
---- netcdf-4.0.1/man4/netcdf-cxx.texi.orig	2006-08-17 23:29:23.000000000 +0200
-+++ netcdf-4.0.1/man4/netcdf-cxx.texi	2008-11-01 12:42:09.140730777 +0100
-@@ -16,9 +16,9 @@
+--- netcdf-cxx-4.2/man4/netcdf-cxx.texi.orig	2011-09-22 14:04:29.000000000 +0200
++++ netcdf-cxx-4.2/man4/netcdf-cxx.texi	2024-12-16 18:55:32.834926254 +0100
+@@ -5,7 +5,6 @@
+ @setfilename netcdf-cxx.info
+ @settitle NetCDF C++ Interface Guide
+ @setchapternewpage odd
+- at setcontentsaftertitlepage
+ @c Combine the variable and function indices.
+ @synindex vr cp
+ @synindex fn cp
+@@ -17,9 +16,9 @@
  @include defines.texi
  
  @ifinfo
@@ -12,3 +20,12 @@
  @end direntry
  @end ifinfo
  
+@@ -35,6 +34,8 @@
+ @insertcopying
+ @end titlepage
+ 
++ at contents
++
+ @ifnottex
+ @node Top, Introduction, (dir), (dir)
+ @top @value{cxx-man}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/netcdf-cxx.git/commitdiff/79324202b277a3819f724807e48de3d668f220d7