X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=live.spec;h=ee86f8e3b00f9031889d7b3d57dad29129472761;hb=7d2b9f2b135d5cbcd2fe1197b77718ed8eee7650;hp=9e55eb63531ebf5263b3178955e0c338620f8fa6;hpb=a1791c8f35b24124c88043ba5f07b9830f81dcd7;p=packages%2Flive.git

diff --git a/live.spec b/live.spec
index 9e55eb6..ee86f8e 100644
--- a/live.spec
+++ b/live.spec
@@ -4,24 +4,29 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# static libraries
+%bcond_without	atomic_flag	# C++20 std::atomic_flag functionality
 
 Summary:	LIVE555 streaming media server
 Summary(pl.UTF-8):	LIVE555 - serwer strumieni multimedialnych
 Name:		live
-Version:	2021.01.16
+Version:	2024.02.28
 Release:	1
 Epoch:		2
 License:	LGPL v2.1+
 Group:		Applications/Multimedia
 Source0:	http://www.live555.com/liveMedia/public/%{name}.%{version}.tar.gz
-# Source0-md5:	6370f3810a20be4fa98519d4781dedc4
+# Source0-md5:	8c4a142349abbdf6e5e24813c7a15501
 Source1:	http://www.live555.com/liveMedia/public/changelog.txt
-# Source1-md5:	a7310cd38b859f905f46e7250047aa32
+# Source1-md5:	000f6435ea418b0365f68d83edd7a361
 Patch0:		%{name}-link.patch
 # from debian
 Patch1:		%{name}-pkgconfig.patch
 URL:		http://www.live555.com/liveMedia/
+%if %{with atomic_flag}
+BuildRequires:	libstdc++-devel >= 6:11
+%else
 BuildRequires:	libstdc++-devel
+%endif
 BuildRequires:	openssl-devel
 BuildRequires:	sed >= 4.0
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
@@ -76,10 +81,8 @@ Biblioteki statyczne LIVE555 do strumieni multimedialnych.
 
 %prep
 %setup -q -c
-%patch0 -p0
-cd live
+%patch0 -p1
 %patch1 -p1
-cd ..
 
 # disable building test programs
 %{__sed} -i -e '/cd \$(TESTPROGS_DIR)/d' live/Makefile.tail
@@ -99,7 +102,7 @@ cd live-static
 %{__make} \
 	C_COMPILER="%{__cc}" \
 	CPLUSPLUS_COMPILER="%{__cxx}" \
-	CPPFLAGS="%{rpmcppflags}" \
+	CPPFLAGS="%{rpmcppflags} %{!?with_atomic_flag:-DNO_STD_LIB}" \
 	CFLAGS="%{rpmcflags} -fPIC" \
 	CXXFLAGS="%{rpmcxxflags} -fPIC"
 cd ..
@@ -110,7 +113,7 @@ cd live-shared
 %{__make} \
 	C_COMPILER="%{__cc}" \
 	CPLUSPLUS_COMPILER="%{__cxx}" \
-	CPPFLAGS="%{rpmcppflags}" \
+	CPPFLAGS="%{rpmcppflags} %{!?with_atomic_flag:-DNO_STD_LIB}" \
 	CFLAGS="%{rpmcflags}" \
 	CXXFLAGS="%{rpmcxxflags}" \
 	LIBRARY_LINK="%{__cxx} -o"
@@ -146,13 +149,13 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libBasicUsageEnvironment.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libBasicUsageEnvironment.so.1
+%attr(755,root,root) %ghost %{_libdir}/libBasicUsageEnvironment.so.2
 %attr(755,root,root) %{_libdir}/libUsageEnvironment.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libUsageEnvironment.so.3
 %attr(755,root,root) %{_libdir}/libgroupsock.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgroupsock.so.26
+%attr(755,root,root) %ghost %{_libdir}/libgroupsock.so.30
 %attr(755,root,root) %{_libdir}/libliveMedia.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libliveMedia.so.89
+%attr(755,root,root) %ghost %{_libdir}/libliveMedia.so.112
 
 %files devel
 %defattr(644,root,root,755)