Accepting request 1228317 from Archiving

- Update to version 0.1.2+git20240721.b467f7a:
  * ci: use vcpkg for both builds
  * Add CI builds + add support for static linux binaries (#23)
  * tool: Ignore the output file in case it's inside the input path (#20)
  * Bump version
  * build: force MODULE mode for find_package(zstd)
  * build: add pkg-config support
  * build: general improvements
  * Install the zarchive executable
  * Don't hardcode the installation path of the library
- Drop use_pkgconfig_for_zstd.patch

OBS-URL: https://build.opensuse.org/request/show/1228317
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ZArchive?expand=0&rev=4

ZArchive-0.1.2+git20220908.d2c7177.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ec85220dbf922d6540b6538fdf7d2defbbcbb3d287ab0e4a67bd11fcc56d188
-size 71691

ZArchive-0.1.2+git20240721.b467f7a.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:502a0881fcf8af7876dffc5a2628ccfe086d090d007470854ebc532b8604d232
+size 77835

ZArchive.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Dec  4 13:35:30 UTC 2024 - Martin Pluskal <mpluskal@suse.com>
+
+- Update to version 0.1.2+git20240721.b467f7a:
+  * ci: use vcpkg for both builds
+  * Add CI builds + add support for static linux binaries (#23)
+  * tool: Ignore the output file in case it's inside the input path (#20)
+  * Bump version
+  * build: force MODULE mode for find_package(zstd)
+  * build: add pkg-config support
+  * build: general improvements
+  * Install the zarchive executable
+  * Don't hardcode the installation path of the library
+- Drop use_pkgconfig_for_zstd.patch
+
 -------------------------------------------------------------------
 Mon May 15 19:29:55 UTC 2023 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
 

ZArchive.obsinfo

@@ -1,4 +1,4 @@
 name: ZArchive
-version: 0.1.2+git20220908.d2c7177
-mtime: 1662600486
-commit: d2c717730092c7bf8cbb033b12fd4001b7c4d932
+version: 0.1.2+git20240721.b467f7a
+mtime: 1721582022
+commit: b467f7aa342895e66a1a003377ed63b3c1be3de3

ZArchive.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ZArchive
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,17 +18,15 @@
 
 %define libpackage libzarchive0_1
 Name:           ZArchive
-Version:        0.1.2+git20220908.d2c7177
+Version:        0.1.2+git20240721.b467f7a
 Release:        0
 Summary:        Library and program for creating and reading .zar files
 License:        MIT-0
 URL:            https://github.com/Exzap/ZArchive
 Source0:        ZArchive-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE
-Patch1:         use_pkgconfig_for_zstd.patch
 BuildRequires:  cmake >= 3.15
 %if 0%{?suse_version} < 1550
-BuildRequires:  gcc12-c++
+BuildRequires:  gcc13-c++
 %else
 BuildRequires:  gcc-c++ >= 11
 %endif
@@ -55,7 +53,7 @@ This subpackage contains the devel files for ZArchive
 
 %build
 %if 0%{?suse_version} < 1550
-export CXX=g++-12
+export CXX=g++-13
 %endif
 %cmake
 %cmake_build
@@ -73,7 +71,7 @@ export CXX=g++-12
 %files -n %{libpackage}
 %license LICENSE
 %{_libdir}/libzarchive.so.0.1
-%{_libdir}/libzarchive.so.0.1.2
+%{_libdir}/libzarchive.so.0.1.3
 
 %files devel
 %license LICENSE

_service

@@ -1,11 +1,12 @@
 <services>
-  <service name="obs_scm" mode="disabled">
+  <service name="obs_scm" mode="manual">
     <param name="url">https://github.com/Exzap/ZArchive.git</param>
     <param name="scm">git</param>
+    <param name="changesgenerate">enable</param>
     <param name="versionformat">@PARENT_TAG@+git%cd.%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>
   </service>
-  <service name="set_version" mode="disabled"/>
+  <service name="set_version" mode="manual"/>
   <service name="tar" mode="buildtime"/>
   <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>

_servicedata

@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://github.com/Exzap/ZArchive.git</param>
+              <param name="changesrevision">b467f7aa342895e66a1a003377ed63b3c1be3de3</param></service></servicedata>

use_pkgconfig_for_zstd.patch

@@ -1,50 +0,0 @@
-Index: ZArchive-0.1.2+git20220908.d2c7177/cmake/Findzstd.cmake
-===================================================================
---- ZArchive-0.1.2+git20220908.d2c7177.orig/cmake/Findzstd.cmake
-+++ ZArchive-0.1.2+git20220908.d2c7177/cmake/Findzstd.cmake
-@@ -3,31 +3,18 @@
- 
- include(FindPackageHandleStandardArgs)
- 
--find_package(zstd CONFIG QUIET)
--if (zstd_FOUND)
--	# Use upstream zstdConfig.cmake if possible
--	if (NOT TARGET zstd::zstd)
--		if (TARGET zstd::libzstd_static)
--			add_library(zstd::zstd ALIAS zstd::libzstd_static)
--		elseif (TARGET zstd::libzstd_shared)
--			add_library(zstd::zstd ALIAS zstd::libzstd_shared)
--		endif()
--	endif()
--	find_package_handle_standard_args(zstd CONFIG_MODE)
--else()
--	# Fallback to pkg-config otherwise
--	find_package(PkgConfig)
--	if (PKG_CONFIG_FOUND)
--		pkg_search_module(libzstd IMPORTED_TARGET GLOBAL libzstd)
--		if (libzstd_FOUND)
--			add_library(zstd::zstd ALIAS PkgConfig::libzstd)
--		endif()
--	endif()
--
--	find_package_handle_standard_args(zstd
--		REQUIRED_VARS
--			libzstd_LINK_LIBRARIES
--			libzstd_FOUND
--		VERSION_VAR libzstd_VERSION
--	)
-+# Fallback to pkg-config otherwise
-+find_package(PkgConfig)
-+if (PKG_CONFIG_FOUND)
-+    pkg_search_module(libzstd IMPORTED_TARGET GLOBAL libzstd)
-+    if (libzstd_FOUND)
-+        add_library(zstd::zstd ALIAS PkgConfig::libzstd)
-+    endif()
- endif()
-+
-+find_package_handle_standard_args(zstd
-+    REQUIRED_VARS
-+        libzstd_LINK_LIBRARIES
-+        libzstd_FOUND
-+    VERSION_VAR libzstd_VERSION
-+)