[packages/cdflib] - updated to 3.6.4 - updated opt patch - added soname patch (set library soname, install using .so.V

[qboosh]

commit d11fe43d7906a94f2b9946c92b5af26ec8eb2581
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed May 16 19:48:40 2018 +0200

    - updated to 3.6.4
    - updated opt patch
    - added soname patch (set library soname, install using .so.VERSION instead of .VERSION.so suffix)

 cdflib-opt.patch    | 10 +++++-----
 cdflib-soname.patch | 27 +++++++++++++++++++++++++++
 cdflib.spec         | 21 ++++++++++++++-------
 3 files changed, 46 insertions(+), 12 deletions(-)
---
diff --git a/cdflib.spec b/cdflib.spec
index 819f096..b1f867a 100644
--- a/cdflib.spec
+++ b/cdflib.spec
@@ -1,15 +1,16 @@
 Summary:	CDF (Common Data Format) software
 Summary(pl.UTF-8):	Oprogramowanie obsługujące CDF (Common Data Format)
 Name:		cdflib
-Version:	3.6.1
+Version:	3.6.4
 Release:	1
 License:	freely usable, non-commercially distributable
 Group:		Libraries
-# see http://cdf.gsfc.nasa.gov/html/sw_and_docs.html
-Source0:	http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf36_1/linux/cdf36_1-dist-all.tar.gz
-# Source0-md5:	9a2120adb512838742dbb344f96fdf3b
+# see https://cdf.gsfc.nasa.gov/html/sw_and_docs.html
+Source0:	https://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf36_4/linux/cdf36_4-dist-all.tar.gz
+# Source0-md5:	55baa5e6d7bc502bd13330f48c42650f
 Patch0:		%{name}-opt.patch
-URL:		http://cdf.gsfc.nasa.gov/cdf_home.html
+Patch1:		%{name}-soname.patch
+URL:		https://cdf.gsfc.nasa.gov/cdf_home.html
 BuildRequires:	gcc-fortran >= 6:4.4.2
 BuildRequires:	ncurses-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,8 +59,9 @@ Java API for CDF library.
 API Javy do biblioteki CDF.
 
 %prep
-%setup -q -n cdf36_1-dist
+%setup -q -n cdf36_4-dist
 %patch0 -p1
+%patch1 -p1
 
 # note: included zlib (src/lib/zlib) is modified (at last public symbol names)
 
@@ -97,18 +99,23 @@ cp -p cdfjava/classes/cdfjava.jar $RPM_BUILD_ROOT%{_javadir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc CDF_copyright.txt CHANGES.txt README_cdf_tools.txt Release.notes Welcome.txt
 %attr(755,root,root) %{_bindir}/cdf*
 %attr(755,root,root) %{_bindir}/skeletoncdf
 %attr(755,root,root) %{_bindir}/skeletontable
-%attr(755,root,root) %{_libdir}/libcdf.so
+%attr(755,root,root) %{_libdir}/libcdf.so.%{version}
+%attr(755,root,root) %ghost %{_libdir}/libcdf.so.3
 %{_libdir}/cdf
 %{_datadir}/cdf
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcdf.so
 %dir %{_includedir}/cdf
 # C
 %{_includedir}/cdf/cdf.h
diff --git a/cdflib-opt.patch b/cdflib-opt.patch
index 6969d89..7f7947b 100644
--- a/cdflib-opt.patch
+++ b/cdflib-opt.patch
@@ -1,15 +1,15 @@
---- cdf35_0-dist/Makefile.orig	2013-09-09 18:31:16.000000000 +0200
-+++ cdf35_0-dist/Makefile	2014-03-08 17:36:13.311830189 +0100
-@@ -781,7 +781,7 @@
- 	@cd $(TOOLSsrcDIR); $(MAKE) \
+--- cdf36_4-dist/Makefile.orig	2017-03-20 21:09:02.000000000 +0100
++++ cdf36_4-dist/Makefile	2018-05-16 19:17:48.324239219 +0200
+@@ -824,7 +824,7 @@
  "CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
  "CCx=$(CC_$(OS)_$(ENV))" \
+ "MAKE=$(MAKE)" \
 -"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
 +"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
  "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
  "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
  "CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
-@@ -793,7 +793,7 @@
+@@ -837,7 +837,7 @@
  "SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
  "FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
  "FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
diff --git a/cdflib-soname.patch b/cdflib-soname.patch
new file mode 100644
index 0000000..fb2d552
--- /dev/null
+++ b/cdflib-soname.patch
@@ -0,0 +1,27 @@
+--- cdf36_4-dist/src/lib/Makefile.orig	2017-01-04 21:58:09.000000000 +0100
++++ cdf36_4-dist/src/lib/Makefile	2018-05-16 19:29:54.154230934 +0200
+@@ -125,8 +125,8 @@
+ libcdf.dll \
+ libcdf.sl: $(OBJs)
+ 	@if [ -f $@ ] ; then rm $@ ; else $(NULL) ; fi
+-	@echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
+-	      $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
++	@echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) -Wl,-soname,libcdf.so.3
++	      $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) -Wl,-soname,libcdf.so.3
+ 	@if [ $(MACVERSION) -gt 0 ]; then \
+ 	  rm -f $(MACLIB)/$@; \
+ 	  cp $@ $(MACLIB)/libcdf.$(VERSION).dylib; \
+--- cdf36_4-dist/Makefile.orig	2018-05-16 19:31:40.914229713 +0200
++++ cdf36_4-dist/Makefile	2018-05-16 19:31:55.137562887 +0200
+@@ -994,9 +994,9 @@
+ 
+ copy.lib.so:
+ 	@echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
+-	      cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib/libcdf.$(VERSION).so
++	      cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib/libcdf.so.$(VERSION)
+ 	      rm -f $(INSTALLDIR)/lib/libcdf.so
+-	      cd $(INSTALLDIR)/lib && ln -s libcdf.$(VERSION).so libcdf.so
++	      cd $(INSTALLDIR)/lib && ln -s libcdf.so.$(VERSION) libcdf.so.3 && ln -s libcdf.so.$(VERSION) libcdf.so
+ 
+ copy.lib.sl:
+ 	@echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cdflib.git/commitdiff/d11fe43d7906a94f2b9946c92b5af26ec8eb2581