Merge and update to 2023.06.20-2

.gitignore

@@ -1 +1 @@
-SOURCES/live.2023.03.30.tar.gz
+SOURCES/live.2023.06.20.tar.gz

.live555.metadata

@@ -1 +1 @@
-6f7a3542174e7414c9f14dfbf9963b53a61f15de  SOURCES/live.2023.03.30.tar.gz
+d8b317c87b4b5f622d7a3db1d28177df5d2b2946  SOURCES/live.2023.06.20.tar.gz

SPECS/live555.spec

@@ -1,110 +1,121 @@
-Name:		live555
+## START: Set by rpmautospec
-Version:	2023.03.30
+## (rpmautospec version 0.3.5)
-Release:	1%{?dist}
+## RPMAUTOSPEC: autorelease, autochangelog
-Summary:	Live555.com streaming libraries
+%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-
+    release_number = 2;
-License:	LGPLv2+
+    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
-URL:		http://live555.com/liveMedia/
+    print(release_number + base_release_number - 1);
-Source0:	%{url}/public/live.%{version}.tar.gz
+}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
+## END: Set by rpmautospec
+
+%global common_description %{expand:
+This package provides a set of C++ libraries for multimedia streaming, using
+using open standard protocols (RTP/RTCP, RTSP, SIP). These libraries can be
+used  to build streaming applications.
+
+The libraries can also be used to stream, receive, and process MPEG, H.263+ or
+JPEG video, and several audio codecs. They can easily be extended to support
+additional (audio and/or video) codecs, and can also be used to build basic
+RTSP or SIP clients and servers, and have been used to add streaming support to
+existing media player applications.}
+
+Name:           live555
+Version:        2023.06.20
+Release:        %autorelease
+Summary:        RTP/RTCP/RTSP/SIP multimedia streaming libraries
+
+License:        LGPL-3.0-or-later AND GPL-3.0-or-later
+URL:            http://live555.com/liveMedia
+Source:         %{url}/public/live.%{version}.tar.gz
 
 BuildRequires:  gcc-c++
+BuildRequires:  make
 BuildRequires:  openssl-devel
 
-# Packages using live555 must Requires this:
+%description    %{common_description}
-#%%{?live555_version:Requires: live555%%{?_isa} = %%{live555_version}}
-
-
-%description
-This code forms a set of C++ libraries for multimedia streaming, 
-using open standard protocols (RTP/RTCP, RTSP, SIP). These 
-libraries - which can be compiled for Unix (including Linux and Mac OS X), 
-Windows, and QNX (and other POSIX-compliant systems) - can be used 
-to build streaming applications.
-The libraries can also be used to stream, receive, and process MPEG, 
-H.263+ or JPEG video, and several audio codecs. They can easily be 
-extended to support additional (audio and/or video) codecs, and can 
-also be used to build basic RTSP or SIP clients and servers, and have 
-been used to add streaming support to existing media player applications.
-
-%package	devel
-Summary:	Development files for live555.com streaming libraries
-Requires:	%{name}%{?_isa} = %{version}-%{release}
-
-%description	devel
-This code forms a set of C++ libraries for multimedia streaming, 
-using open standard protocols (RTP/RTCP, RTSP, SIP). These 
-libraries - which can be compiled for Unix (including Linux and Mac OS X), 
-Windows, and QNX (and other POSIX-compliant systems) - can be used 
-to build streaming applications.
-The libraries can also be used to stream, receive, and process MPEG, 
-H.263+ or JPEG video, and several audio codecs. They can easily be 
-extended to support additional (audio and/or video) codecs, and can 
-also be used to build basic RTSP or SIP clients and servers, and have 
-been used to add streaming support to existing media player applications.
-
-%package	tools
-Summary:	RTSP streaming tools using live555.com streaming libraries
-Requires:	%{name}%{?_isa} = %{version}-%{release}
-
-%description	tools
-This code forms a set of C++ libraries for multimedia streaming, 
-using open standard protocols (RTP/RTCP, RTSP, SIP). These 
-libraries - which can be compiled for Unix (including Linux and Mac OS X), 
-Windows, and QNX (and other POSIX-compliant systems) - can be used 
-to build streaming applications.
-The libraries can also be used to stream, receive, and process MPEG, 
-H.263+ or JPEG video, and several audio codecs. They can easily be 
-extended to support additional (audio and/or video) codecs, and can 
-also be used to build basic RTSP or SIP clients and servers, and have 
-been used to add streaming support to existing media player applications.
-
-This package contains the live555.com streaming server
-(live555MediaServer), the example programs (openRTSP, playSIP, sapWatch,
-vobStreamer) and a variety of test tools.
 
+%package        devel
+Summary:        Development files for live555.com streaming libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%prep
+%description    devel %{common_description}
-%setup -q -n live
-sed -i -e "s|-O2|%{optflags}|" \
-  config.linux-with-shared-libraries
 
+This package contains development headers and libraries for live555.
 
-%build
+%package        tools
-./genMakefiles %{_target_os}-with-shared-libraries
+Summary:        RTSP streaming tools using live555.com streaming libraries
-%make_build LDFLAGS="%{?__global_ldflags}"
 
+%description    tools %{common_description}
 
-%install
+This package contains the live555.com streaming server (live555MediaServer),
-%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir}
+the example programs (openRTSP, playSIP, sapWatch, vobStreamer) and a variety
+of test tools.
 
-#RPM Macros support
+%prep
-mkdir -p %{buildroot}%{rpmmacrodir}
+%setup -q -n live
-cat > %{buildroot}%{rpmmacrodir}/macros.%{name} << EOF
-# live555 RPM Macros
-%live555_version	%{version}
-EOF
-touch -r COPYING %{buildroot}%{rpmmacrodir}/macros.%{name}
 
-#Fix library dependency detection
+%build
-chmod +x %{buildroot}%{_libdir}/*.so*
+# C++20 is because of:
+# BasicTaskScheduler.cpp:191:40: error: 'struct std::atomic_flag' has no member named 'test'
+export CXXFLAGS="-std=c++20 %{optflags}"
 
+./genMakefiles %{_target_os}-with-shared-libraries
+%make_build
 
-%ldconfig_scriptlets
+%install
+%make_install PREFIX="%{_prefix}" LIBDIR="%{_libdir}"
 
+# Fix library dependency detection
+chmod +x %{buildroot}%{_libdir}/*.so*
 
 %files
-%license COPYING
+%license COPYING COPYING.LESSER
-%{_libdir}/libBasicUsageEnvironment.so.2*
+%doc README
-%{_libdir}/libgroupsock.so.30*
+%{_libdir}/libBasicUsageEnvironment.so.2{,*}
-%{_libdir}/libliveMedia.so.107*
+%{_libdir}/libgroupsock.so.30{,*}
-%{_libdir}/libUsageEnvironment.so.3*
+%{_libdir}/libliveMedia.so.107{,*}
+%{_libdir}/libUsageEnvironment.so.3{,*}
 
 %files tools
-%{_bindir}/*
+%{_bindir}/live555HLSProxy
+%{_bindir}/live555MediaServer
+%{_bindir}/live555ProxyServer
+%{_bindir}/mikeyParse
+%{_bindir}/MPEG2TransportStreamIndexer
+%{_bindir}/openRTSP
+%{_bindir}/playSIP
+%{_bindir}/registerRTSPStream
+%{_bindir}/sapWatch
+%{_bindir}/testAMRAudioStreamer
+%{_bindir}/testDVVideoStreamer
+%{_bindir}/testH264VideoStreamer
+%{_bindir}/testH264VideoToHLSSegments
+%{_bindir}/testH264VideoToTransportStream
+%{_bindir}/testH265VideoStreamer
+%{_bindir}/testH265VideoToTransportStream
+%{_bindir}/testMKVSplitter
+%{_bindir}/testMKVStreamer
+%{_bindir}/testMP3Receiver
+%{_bindir}/testMP3Streamer
+%{_bindir}/testMPEG1or2AudioVideoStreamer
+%{_bindir}/testMPEG1or2ProgramToTransportStream
+%{_bindir}/testMPEG1or2Splitter
+%{_bindir}/testMPEG1or2VideoReceiver
+%{_bindir}/testMPEG1or2VideoStreamer
+%{_bindir}/testMPEG2TransportReceiver
+%{_bindir}/testMPEG2TransportStreamer
+%{_bindir}/testMPEG2TransportStreamSplitter
+%{_bindir}/testMPEG2TransportStreamTrickPlay
+%{_bindir}/testMPEG4VideoStreamer
+%{_bindir}/testOggStreamer
+%{_bindir}/testOnDemandRTSPServer
+%{_bindir}/testRelay
+%{_bindir}/testReplicator
+%{_bindir}/testRTSPClient
+%{_bindir}/testWAVAudioStreamer
+%{_bindir}/vobStreamer
 
 %files devel
-%doc README
-%{rpmmacrodir}/macros.%{name}
 %{_libdir}/libBasicUsageEnvironment.so
 %{_libdir}/libgroupsock.so
 %{_libdir}/libliveMedia.so
@@ -114,11 +125,16 @@ chmod +x %{buildroot}%{_libdir}/*.so*
 %{_includedir}/liveMedia/
 %{_includedir}/UsageEnvironment/
 
-
 %changelog
-* Mon Jul 24 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 2023.03.30-1
+* Mon Jul 24 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 2023.06.20-1
 - Rebuilt for MSVSphere 9.2
 
+* Tue Jun 27 2023 Davide Cavalca <dcavalca@fedoraproject.org> - 2023.06.20-1
+- Update to 2023.06.20
+- Update license tag and convert it to SPDX
+- Tweak package summary and description
+- Rework specfile to follow the Fedora packaging guidelines
+
 * Mon Apr 10 2023 Leigh Scott <leigh123linux@gmail.com> - 2023.03.30-1
 - Update to 2023.03.30
 
@@ -440,15 +456,15 @@ chmod +x %{buildroot}%{_libdir}/*.so*
 - Removed all .o files
 
 * Fri Dec 12 2003 Dams <anvil[AT]livna.org> 0:0-0.fdr.2.2003.11.25
-- Snipped the devel pacakge. 
+- Snipped the devel pacakge.
 
 * Fri Dec 12 2003 Dams <anvil[AT]livna.org> 0:0-0.fdr.1.2003.11.25
 - Version-Release respecting fedora.us guidelines
-- Spec file cleanup. 
+- Spec file cleanup.
 
 * Sat Nov 29 2003 Peter Backlund <peter dot backlund at home dot se> - 0:0.0.2003.11.25-0.fdr.1
 - Added 0.0. to version, to allow for upgrade to 0.x/1.x release
- 
+
 * Sat Nov 29 2003 Peter Backlund <peter dot backlund at home dot se> - 0:2003.11.25-0.fdr.1
 - New upstream release
 
@@ -459,3 +475,4 @@ chmod +x %{buildroot}%{_libdir}/*.so*
 
 * Fri Nov 14 2003 Peter Backlund <peter dot backlund at home dot se> - 0:2003.11.14-0.fdr.1
 - Initial RPM release.
+