Fix soname problems

Related: rhbz#1974621
This commit is contained in:
Tomas Korbar 2021-06-30 11:36:41 +02:00
parent 59c63ccd94
commit f6dda19af9
2 changed files with 8 additions and 10 deletions

View File

@ -1,4 +1,4 @@
commit 72c9d6c2e026dd7b844d2b662cd733b8d617dcc6
commit 092a90b38b0988c0d9faa23d44aa91362b2a78b3
Author: Tomas Korbar <tkorbar@redhat.com>
Date: Wed Jun 23 13:50:36 2021 +0200
@ -1046,7 +1046,7 @@ index 0000000..18aacef
+endif()
diff --git a/build/SerfVersion.cmake b/build/SerfVersion.cmake
new file mode 100644
index 0000000..48837f9
index 0000000..04fdc8b
--- /dev/null
+++ b/build/SerfVersion.cmake
@@ -0,0 +1,53 @@
@ -1091,7 +1091,7 @@ index 0000000..48837f9
+ endif()
+
+ set(SERF_VERSION "${major_}.${minor_}.${patch_}" PARENT_SCOPE)
+ set(SERF_SOVERSION "${major_}.${minor_}.0" PARENT_SCOPE)
+ set(SERF_SOVERSION "0" PARENT_SCOPE)
+ set(SERF_MAJOR_VERSION "${major_}" PARENT_SCOPE)
+ set(SERF_MINOR_VERSION "${minor_}" PARENT_SCOPE)
+ set(SERF_PATCH_VERSION "${patch_}" PARENT_SCOPE)

View File

@ -1,6 +1,6 @@
Name: libserf
Version: 1.3.9
Release: 22%{?dist}
Release: 23%{?dist}
Summary: High-Performance Asynchronous HTTP Client Library
License: ASL 2.0
URL: http://serf.apache.org/
@ -30,12 +30,6 @@ developing applications that use %{name}.
%prep
%autosetup -n serf-%{version} -p1
# Shared library versioning support in scons is worse than awful...
# minimally, here fix the soname to match serf-1.2.x. Minor version
# handling should be fixed too; really requires better upstream support:
# http://scons.tigris.org/issues/show_bug.cgi?id=2869
sed -i '/SHLIBVERSION/s/MAJOR/0/' SConstruct
%build
%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir}
%cmake_build
@ -64,6 +58,10 @@ rm -rf %{buildroot}%{_datadir}
%{_libdir}/pkgconfig/serf*.pc
%changelog
* Wed Jun 30 2021 Tomas Korbar <tkorbar@redhat.com> - 1.3.9-23
- Fix soname problems
- Related: rhbz#1974621
* Wed Jun 30 2021 Tomas Korbar <tkorbar@redhat.com> - 1.3.9-22
- Remove scons from build requirements
- Related: rhbz#1974621