From 4957698a3945fdca67157fe828504d49f95d2b8d Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 30 Jun 2022 16:44:26 +0200 Subject: [PATCH] - updated to 4.3.2 (new soname) --- libwebsockets.spec | 95 +++++++++++++++++++++++++++++----------------- no-git.patch | 22 +++++------ 2 files changed, 69 insertions(+), 48 deletions(-) diff --git a/libwebsockets.spec b/libwebsockets.spec index e736767..c67e888 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -1,31 +1,49 @@ +# TODO: +# - subpackages for event libraries +# - more event libraries support? (libevent, glib, systemd/sd-event, libubox/uloop) +# - more features? (SQLITE3, FSMOUNT, HUBBUB) Summary: Lightweight C library for Websockets +Summary(pl.UTF-8): Lekka biblioteka C implementująca Websockets Name: libwebsockets -Version: 4.2.0 -Release: 2 +Version: 4.3.2 +Release: 1 License: MIT +Group: Libraries +#SourceDownload: https://github.com/warmcat/libwebsockets/tags Source0: https://github.com/warmcat/libwebsockets/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: e6613bf565664adb6954f17c8e908149 +# Source0-md5: a73519f68c0e617e6bc7f8704903a9fe Patch0: no-git.patch URL: http://libwebsockets.org -BuildRequires: cmake +BuildRequires: cmake >= 2.8.12 +BuildRequires: libcap-devel BuildRequires: libev-devel BuildRequires: libuv-devel BuildRequires: openssl-devel +BuildRequires: pkgconfig BuildRequires: zlib-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description This is the libwebsockets C library for lightweight websocket clients and servers. +%description -l pl.UTF-8 +libwebsockets to biblioteka C do tworzenia lekkich klientów i serwerów +websockets. + %package devel -Summary: Headers for developing programs that will use %{name} +Summary: Headers for developing programs that will use libwebsockets +Summary(pl.UTF-8): Pliki nagłówkowe do tworzenia programów wykorzystujących libwebsockets +Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libev-devel -Requires: libuv-devel %description devel -This package contains the header files needed for developing %{name} -applications. +This package contains the header files needed for developing +libwebsockets applications. + +%description devel -l pl.UTF-8 +Ten pakiet zawiera pliki nagłówkowe potrzebne do tworzenia aplikacji +opertych na libwebsockets. %prep %setup -q @@ -37,34 +55,34 @@ cd build export CFLAGS="%{rpmcflags} -pthread" %cmake \ - -DLWS_SUPPRESS_DEPRECATED_API_WARNINGS=ON \ - -DLWS_WITH_HTTP2=ON \ -DLWS_IPV6=ON \ - -DLWS_WITH_ZIP_FOPS=ON \ - -DLWS_WITH_SOCKS5=ON \ - -DLWS_WITH_RANGES=ON \ + -DLWS_LINK_TESTAPPS_DYNAMIC=ON \ + -DLWS_SUPPRESS_DEPRECATED_API_WARNINGS=ON \ + -DLWS_UNIX_SOCK=ON \ + -DLWS_USE_BUNDLED_ZLIB=OFF \ -DLWS_WITH_ACME=ON \ - -DLWS_WITH_LIBUV=ON \ - -DLWS_WITH_LIBEV=ON \ - -DLWS_WITH_LIBEVENT=OFF \ + -DLWS_WITH_DISKCACHE=ON \ -DLWS_WITH_FTS=ON \ - -DLWS_WITH_THREADPOOL=ON \ - -DLWS_UNIX_SOCK=ON \ + -DLWS_WITH_HTTP2=ON \ -DLWS_WITH_HTTP_PROXY=ON \ - -DLWS_WITH_DISKCACHE=ON \ + -DLWS_WITH_LIBEVENT=OFF \ + -DLWS_WITH_LIBEV=ON \ + -DLWS_WITH_LIBUV=ON \ -DLWS_WITH_LWSAC=ON \ - -DLWS_LINK_TESTAPPS_DYNAMIC=ON \ -DLWS_WITHOUT_BUILTIN_GETIFADDRS=ON \ - -DLWS_USE_BUNDLED_ZLIB=OFF \ -DLWS_WITHOUT_BUILTIN_SHA1=ON \ - -DLWS_WITH_STATIC=OFF \ -DLWS_WITHOUT_CLIENT=OFF \ -DLWS_WITHOUT_SERVER=OFF \ -DLWS_WITHOUT_TESTAPPS=ON \ - -DLWS_WITHOUT_TEST_SERVER=ON \ - -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \ - -DLWS_WITHOUT_TEST_PING=ON \ -DLWS_WITHOUT_TEST_CLIENT=ON \ + -DLWS_WITHOUT_TEST_PING=ON \ + -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \ + -DLWS_WITHOUT_TEST_SERVER=ON \ + -DLWS_WITH_RANGES=ON \ + -DLWS_WITH_SOCKS5=ON \ + -DLWS_WITH_STATIC=OFF \ + -DLWS_WITH_THREADPOOL=ON \ + -DLWS_WITH_ZIP_FOPS=ON \ .. %{__make} @@ -75,8 +93,12 @@ rm -rf $RPM_BUILD_ROOT %{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -delete -find $RPM_BUILD_ROOT -name '*_static.pc' -delete +# static library not built +%{__rm} $RPM_BUILD_ROOT%{_pkgconfigdir}/libwebsockets_static.pc + +# disable completeness check incompatible with split packaging +%{__sed} -i -e '/^foreach(target .*IMPORT_CHECK_TARGETS/,/^endforeach/d; /^unset(_IMPORT_CHECK_TARGETS)/d' \ + $RPM_BUILD_ROOT%{_libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake %clean rm -rf $RPM_BUILD_ROOT @@ -86,14 +108,17 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc README.md changelog -%attr(755,root,root) %{_libdir}/%{name}.so.18 +%doc LICENSE README.md changelog +%attr(755,root,root) %{_libdir}/libwebsockets.so.19 +%attr(755,root,root) %{_libdir}/libwebsockets-evlib_ev.so +%attr(755,root,root) %{_libdir}/libwebsockets-evlib_uv.so %files devel %defattr(644,root,root,755) -%doc READMEs/README.coding.md READMEs -%{_includedir}/*.h -%{_includedir}/%{name} -%attr(755,root,root) %{_libdir}/%{name}*.so -%{_pkgconfigdir}/%{name}.pc +%doc READMEs +%attr(755,root,root) %{_libdir}/libwebsockets.so +%{_includedir}/libwebsockets +%{_includedir}/libwebsockets.h +%{_includedir}/lws_config.h +%{_pkgconfigdir}/libwebsockets.pc %{_libdir}/cmake/libwebsockets diff --git a/no-git.patch b/no-git.patch index 4d7b528..1a9e5ac 100644 --- a/no-git.patch +++ b/no-git.patch @@ -1,6 +1,6 @@ ---- libwebsockets-4.2.0/CMakeLists.txt~ 2021-04-15 18:44:02.000000000 +0200 -+++ libwebsockets-4.2.0/CMakeLists.txt 2021-05-23 13:57:51.126039907 +0200 -@@ -338,37 +338,6 @@ +--- libwebsockets-4.3.2/CMakeLists.txt~ 2021-04-15 18:44:02.000000000 +0200 ++++ libwebsockets-4.3.2/CMakeLists.txt 2021-05-23 13:57:51.126039907 +0200 +@@ -370,37 +370,6 @@ endmacro() # Try to find the current Git hash # @@ -35,19 +35,15 @@ - message("Git commit hash: ${LWS_BUILD_HASH}") -endif() - - set(PACKAGE "libwebsockets") - set(CPACK_RPM_PACKAGE_LICENSE "MIT") - set(CPACK_PACKAGE_NAME "${PACKAGE}") -@@ -376,10 +345,11 @@ - set(CPACK_PACKAGE_VERSION_MINOR "2") - set(CPACK_PACKAGE_VERSION_PATCH_NUMBER "0") + if ("${LWS_BUILD_HASH}" STREQUAL "") + set(LWS_BUILD_HASH "unknown") + endif() +@@ -412,7 +381,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR "4") + set(CPACK_PACKAGE_VERSION_MINOR "3") + set(CPACK_PACKAGE_VERSION_PATCH_NUMBER "2") -set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH_NUMBER}-${LWS_BUILD_HASH}") +set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH_NUMBER}") set(CPACK_PACKAGE_RELEASE 1) set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") -+set(LWS_BUILD_HASH ${CPACK_PACKAGE_VERSION}) - set(CPACK_PACKAGE_VENDOR "andy@warmcat.com") - set(CPACK_PACKAGE_CONTACT "andy@warmcat.com") - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${CPACK_PACKAGE_VERSION}") -- 2.44.0