diff --git a/.gitignore b/.gitignore index 61358d3..d629a4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /weechat-*.tar.xz +/weechat-*.tar.xz.asc diff --git a/A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8 b/A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8 new file mode 100644 index 0000000..3302ef4 --- /dev/null +++ b/A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8 @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +bZlCOWLXBLOqK0Z0 +=MySb +-----END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index 42d71e6..28d80d2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (weechat-4.2.1.tar.xz) = e9ed67cd45b374435b05043dd9f085d30f4b429dff1afa82fe5f50522283faa86b5e6909ec1f51af033a612abe5f52f4441433bcc94e59027fc5ccff86e84c62 +SHA512 (weechat-4.6.2.tar.xz) = 202c694b806ddcad97b7bc9899c4170d30f11aac85b30f8ea496bba5e9d6e0fa2453e4cefb71a80ac18d479b0e07918bc24ccd9de7c530d453f513dd1f79ae5a +SHA512 (weechat-4.6.2.tar.xz.asc) = 3646c5e0b909db8919b15272452b01a52944f0a67cad9c22dbd9fecf24227cff754b9ad960cd089851d69d21c112ba7886c66dcb5a617bc2e8c774a569b8e139 diff --git a/weechat-3.4-disable-memleak-detection.patch b/weechat-3.4-disable-memleak-detection.patch deleted file mode 100644 index 1b46a2d..0000000 --- a/weechat-3.4-disable-memleak-detection.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ruN weechat-3.4/tests/tests.cpp weechat-3.4-disable-memleak-detection/tests/tests.cpp ---- weechat-3.4/tests/tests.cpp 2021-12-17 23:57:32.000000000 -0800 -+++ weechat-3.4-disable-memleak-detection/tests/tests.cpp 2022-01-14 16:36:08.330205164 -0800 -@@ -49,6 +49,7 @@ - } - - #include "CppUTest/CommandLineTestRunner.h" -+#include "CppUTest/MemoryLeakWarningPlugin.h" - - #define LOCALE_TESTS "en_US.UTF-8" - -@@ -330,6 +331,11 @@ - return 1; - } - -+ /* this fails on basically every test right now -+ * see https://cpputest.github.io/manual.html#turning-memory-leak-detection-off-and-on -+ */ -+ MemoryLeakWarningPlugin::turnOffNewDeleteOverloads(); -+ - /* clean WeeChat home */ - dir_exec_on_files (WEECHAT_TESTS_HOME, 1, 1, &exec_on_files_cb, NULL); - diff --git a/weechat-3.4-tests-fPIC.patch b/weechat-3.4-tests-fPIC.patch deleted file mode 100644 index 6cbf7d6..0000000 --- a/weechat-3.4-tests-fPIC.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN weechat-3.4/tests/CMakeLists.txt weechat-3.4-tests-fPIC/tests/CMakeLists.txt ---- weechat-3.4/tests/CMakeLists.txt 2021-12-17 23:57:32.000000000 -0800 -+++ weechat-3.4-tests-fPIC/tests/CMakeLists.txt 2022-01-14 15:34:23.072801796 -0800 -@@ -22,6 +22,8 @@ - remove_definitions(-DHAVE_CONFIG_H) - include_directories(${CPPUTEST_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}) - -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") -+ - # unit tests (core) - set(LIB_WEECHAT_UNIT_TESTS_CORE_SRC - unit/core/test-core-arraylist.cpp diff --git a/weechat.spec b/weechat.spec index 02ce12d..7a8e0f9 100644 --- a/weechat.spec +++ b/weechat.spec @@ -1,85 +1,44 @@ -%if 0%{?fedora} || 0%{?rhel} >= 8 -%bcond_without check -%else -# no cpputest in EL7 -%bcond_with check -%endif - -%if 0%{?fedora} || 0%{?rhel} < 8 -%bcond_without docs -%else -# TODO: package rubygem-asciidoctor -%bcond_with docs -%endif - -%if 0%{?rhel} && 0%{?rhel} < 9 -%undefine __cmake_in_source_build -%endif %global __provides_exclude_from ^%{_libdir}/weechat/plugins/.*$ -%if %{?_pkgdocdir:1}0 -%if 0%{?rhel} -%global _doc %{name}-%{version} -%else -%global _doc %{name} -%endif -%else -%global _doc %{name}-%{version} -%global _pkgdocdir %{_docdir}/%{_doc} -%endif - Name: weechat -Version: 4.2.1 +Version: 4.6.2 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications URL: http://weechat.org -License: GPLv3 +License: GPL-3.0-only -Source: http://weechat.org/files/src/%{name}-%{version}.tar.xz -# /usr/bin/ld: CMakeFiles/charset.dir/charset.o: -# relocation R_X86_64_PC32 against symbol `weechat_charset_plugin' -# can not be used when making a shared object; recompile with -fPIC -Patch0: weechat-3.4-tests-fPIC.patch -# this fails on too many tests, we want to let them finish anyway -Patch1: weechat-3.4-disable-memleak-detection.patch +Source: https://weechat.org/files/src/%{name}-%{version}.tar.xz +Source1: https://weechat.org/files/src/%{name}-%{version}.tar.xz.asc +Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8 -BuildRequires: gcc -%if %{with check} -BuildRequires: cpputest-devel -BuildRequires: glibc-langpack-en -%endif -%if %{with docs} BuildRequires: asciidoctor -%endif BuildRequires: ca-certificates +BuildRequires: cjson-devel BuildRequires: cmake +BuildRequires: cpputest-devel BuildRequires: docbook-style-xsl BuildRequires: enchant-devel +BuildRequires: gcc BuildRequires: gettext +BuildRequires: glibc-langpack-en +BuildRequires: gnupg2 BuildRequires: gnutls-devel -%if 0%{?fedora} >= 30 || 0%{?rhel} > 8 -BuildRequires: guile22-devel -%else -BuildRequires: guile-devel -%endif +BuildRequires: guile30-devel BuildRequires: libcurl-devel BuildRequires: libgcrypt-devel +BuildRequires: libzstd-devel BuildRequires: lua-devel BuildRequires: ncurses-devel -BuildRequires: perl-ExtUtils-Embed BuildRequires: perl-devel +BuildRequires: perl-ExtUtils-Embed BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: ruby BuildRequires: ruby-devel BuildRequires: source-highlight BuildRequires: tcl-devel -BuildRequires: libzstd-devel BuildRequires: zlib-devel -%if 0%{?rhel} -BuildRequires: cmake3 -%endif Requires: hicolor-icon-theme @@ -102,49 +61,37 @@ This package contains include files and pc file for weechat. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 -n %{name}-%{version} -find doc/ -type f -name 'CMakeLists.txt' \ - -exec sed -i -e 's#${PROJECT_NAME}#%{_doc}#g' '{}' \; %build -%cmake3 \ +%cmake \ -DPREFIX=%{_prefix} \ -DLIBDIR=%{_libdir} \ -DENABLE_ENCHANT=ON \ -DENABLE_PHP=OFF \ -%if %{with check} -DENABLE_TESTS=ON \ -%else - -DENABLE_TESTS=OFF \ -%endif -%if %{with docs} -DENABLE_DOC=ON \ -DENABLE_DOC_INCOMPLETE=ON \ -DENABLE_MAN=ON \ -%else - -DENABLE_DOC=OFF \ - -DENABLE_MAN=OFF \ -%endif - -DCA_FILE=/etc/pki/tls/certs/ca-bundle.crt \ %{nil} -%cmake3_build +%cmake_build %install -%cmake3_install +%cmake_install %find_lang %name -%if %{with check} -%ctest3 -- -V -%endif +%check +%ctest --verbose %files -f %{name}.lang -%doc AUTHORS.adoc ChangeLog.adoc Contributing.adoc -%doc README.adoc ReleaseNotes.adoc +%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md +%doc README.md UPGRADING.md %license COPYING %{_bindir}/%{name}-curses %{_bindir}/%{name} @@ -157,13 +104,11 @@ find doc/ -type f -name 'CMakeLists.txt' \ %{_datadir}/icons/hicolor/256x256/apps/%{name}.png %{_datadir}/icons/hicolor/512x512/apps/%{name}.png %{_datadir}/icons/hicolor/64x64/apps/%{name}.png -%if 0%{?fedora} || 0%{?rhel} < 8 %{_pkgdocdir}/weechat_*.html %{_mandir}/man1/weechat.1* %{_mandir}/*/man1/weechat.1* %{_mandir}/man1/%{name}-headless.1* %{_mandir}/*/man1/%{name}-headless.1* -%endif %files devel %dir %{_includedir}/%{name}