updated 2 packages

fmt-9.1.0-1

rspamd-3.3-1

f/fmt/fmt-vl.spec

@@ -1,39 +1,21 @@
 %undefine __cmake_in_source_build
-%bcond_with doc
 
 Name:           fmt
 Summary:        Small, safe and fast formatting library for C++
-Version:        7.1.3
-Release:        2%{?_dist_release}
+Version:        9.1.0
+Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
-
 License:        BSD
 URL:            https://github.com/fmtlib/%{name}
 Source0:        %{url}/archive/%{version}.tar.gz
-# See https://github.com/fmtlib/fmt/issues/443 and https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/LVKYLDLJVWAVJE4MQVKDO6PYZRD5MCP6/
-Patch1:         doc-build-removed-all-pip-internet-stuff.patch
-Patch3:         doc-build-do-not-create-virtual-environment.patch
-Patch4:         doc-_templates-layout-stripped-Google-Analytics.patch
-Patch5:         doc-_templates-layout-stripped-download-links.patch
-Patch6:         doc-index-removed-GitHub-iframe.patch
-Patch7:         doc-build-use-sphinx-build-3.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  ninja
 BuildRequires:  cmake
-%if %{with doc}
-BuildRequires:  doxygen
-BuildRequires:  nodejs
-BuildRequires:  python3-sphinx
-BuildRequires:  python3-breathe
-%else
-Provides:       %{name}-doc = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-doc < %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
 
 # This package replaces the old name of cppformat
 Provides:       cppformat = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -57,22 +39,6 @@ Obsoletes:      cppformat-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 This package contains the header file for using %{name}.
 
 
-%if %{with doc}
-%package        doc
-Summary:        Documentation files for %{name}
-Group:          documentation
-License:        Python
-BuildArch:      noarch
-
-# This package replaces the old name of cppformat
-Provides:       cppformat-doc = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      cppformat-doc < %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description    doc
-This package contains documentation for developer documentation for %{name}.
-%endif
-
-
 %debug_package
 
 
@@ -90,24 +56,15 @@ sed -i "s/'--clean-css',//" doc/build.py
     -G Ninja                                  \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo         \
     -DCMAKE_POSITION_INDEPENDENT_CODE=ON      \
-    -DFMT_CMAKE_DIR=%{_datadir}/cmake/%{name} \
+    -DFMT_CMAKE_DIR=%{_libdir}/cmake/%{name} \
     -DFMT_LIB_DIR=%{_libdir}
 
-%__cmake --build . \
-%if %{with doc}
-    --target doc \
-%endif
-    --target all
-
-%if %{with doc}
-# Remove temporary build products
-rm -rf %{_vpath_builddir}/doc/html/{.buildinfo,.doctrees,objects.inv}
-%endif
+%cmake_build
 
 
 %install
-DESTDIR="%{buildroot}" %__cmake --install .
-  
+%cmake_install
+
 
 #%check
 #%ctest
@@ -116,22 +73,19 @@ DESTDIR="%{buildroot}" %__cmake --install .
 %files
 %license LICENSE.rst
 %doc ChangeLog.rst README.rst
-%{_libdir}/lib%{name}.so.7*
+%{_libdir}/lib%{name}.so.*
 
 %files devel
 %{_includedir}/%{name}
 %{_libdir}/lib%{name}.so
-%{_datadir}/cmake/%{name}
+%{_libdir}/cmake/%{name}
 %{_libdir}/pkgconfig/%{name}.pc
 
-%if %{with doc}
-%files doc
-%doc %{_datadir}/doc/%{name}
-%license doc/python-license.txt
-%endif
-
 
 %changelog
+* Sun Oct 02 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 9.1.0-1
+- new upstream release.
+
 * Sat Dec 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 7.1.3-2
 - initial build for Vine Linux.
 

r/rspamd/rspamd-vl.spec

@@ -12,7 +12,7 @@
 
 Summary:        Rapid spam filtering system
 Name:           rspamd
-Version:        3.2
+Version:        3.3
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          servers
 Vendor:         Project Vine
@@ -21,6 +21,8 @@ Distribution:   Vine Linux
 License:        ASL 2.0
 URL:            https://rspamd.com
 Source0:        https://github.com/rspamd/rspamd/archive/%{version}.tar.gz#/%{name}-%{version}.tar.xz
+Source1000:     rspamd.init
+Source1001:     rspamd.logrotate
 Patch1:         rspamd-3.1-32bit-noasm.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
@@ -125,12 +127,12 @@ pushd ./centos/sources/
 
 %if %{with systemd}
 %{__install} -p -D -m 0644 80-rspamd.preset %{buildroot}%{_presetdir}/80-rspamd.preset
-%{__install} -p -D -m 0644 %{name}.logrotate.systemd %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -p -D -m 0644 %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -p -m 0755 %{buildroot}%{rspamd_logdir}
 %else
-%{__install} -p -D -m 0755 %{name}.init %{buildroot}%{_initrddir}/%{name}
+%{__install} -p -D -m 0755 %{SOURCE1000} %{buildroot}%{_initrddir}/%{name}
+%{__install} -p -D -m 0644 %{SOURCE1001} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -p -m 0755 %{buildroot}%{_localstatedir}/run/rspamd
-%{__install} -p -D -m 0644 %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -p -m 0755 %{buildroot}%{rspamd_logdir}
 %endif
 
@@ -253,6 +255,9 @@ fi
 
 
 %changelog
+* Sun Oct 02 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3-1
+- new upstream release.
+
 * Sun Mar 27 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2-1
 - new upstream release.