public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/zstr] f44: Version 1.2.0
@ 2026-09-25 15:22 Jerry James
  0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-09-25 15:22 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/zstr
Branch : f44
Commit : b73328b0af70e6761287b2aedd640e90d4f0da60
Author : Jerry James <loganjerry@gmail.com>
Date   : 2026-09-25T09:21:58-06:00
Stats  : +30/-17 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/zstr/c/b73328b0af70e6761287b2aedd640e90d4f0da60?branch=f44

Log:
Version 1.2.0

---
diff --git a/sources b/sources
index b3e4d5b..996ef0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zstr-1.1.0.tar.gz) = 21778d2b07c30da4fb9ee35832f39b02c95e54478c6610e28cece98908c51bcee6aed0754ec3948b71aa1e671a3d15ff2b555369379dc4583048c76d2b8305e8
+SHA512 (zstr-1.2.0.tar.gz) = 3f38761b9724fdcd8e3c1641cd37f0497fb6173a80817ac6c26a53853fd6673f39ca54893917b68b90036b6c86656853ada997851c2966a814ca2f01966a0524

diff --git a/zstr-zlib-ng.patch b/zstr-zlib-ng.patch
index 6dfaf22..4157bc7 100644
--- a/zstr-zlib-ng.patch
+++ b/zstr-zlib-ng.patch
@@ -1,20 +1,23 @@
---- zstr-1.1.0/CMakeLists.txt.orig	2025-10-20 09:17:37.000000000 -0600
-+++ zstr-1.1.0/CMakeLists.txt	2025-10-20 11:45:56.725568759 -0600
-@@ -16,8 +16,8 @@ endif()
+--- zstr-1.2.0/CMakeLists.txt.orig	2026-09-24 16:10:35.000000000 -0600
++++ zstr-1.2.0/CMakeLists.txt	2026-09-25 08:46:06.902324692 -0600
+@@ -4,8 +4,8 @@ project(zstr VERSION 1.2.0 LANGUAGES CXX
  
  # -- locate zlib
  
 -find_package(ZLIB 1.2.3 REQUIRED) # defines imported target ZLIB::ZLIB
 -message(STATUS "zstr - found ZLIB (version: ${ZLIB_VERSION_STRING})")
-+find_package(zlib-ng 2.1.0 REQUIRED) # defines imported target zlib-ng::zlib
++find_package(zlib-ng 2.3.0 REQUIRED) # defines imported target zlib-ng::zlib
 +message(STATUS "zstr - found ZLIB (version: ${zlib-ng_VERSION_STRING})")
  
  # -- add target
  
-@@ -27,20 +27,19 @@ add_library(zstr::zstr ALIAS zstr)
- # -- set target properties
- 
- target_include_directories(zstr INTERFACE "${PROJECT_SOURCE_DIR}/src")
+@@ -17,23 +17,22 @@ add_library(zstr::zstr ALIAS zstr)
+ include(GNUInstallDirs)
+ target_include_directories(zstr INTERFACE 
+   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
+-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
++  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/zstr>
+ )
 -target_link_libraries(zstr INTERFACE ZLIB::ZLIB)
 -target_compile_features(zstr INTERFACE cxx_std_11) # require c++11 flag
 +target_link_libraries(zstr INTERFACE zlib-ng::zlib)
@@ -36,8 +39,22 @@
 +          libraries: zlib-ng::zlib
            features : cxx_std_11"
  )
---- zstr-1.1.0/src/zstr.hpp.orig	2025-10-20 09:17:37.000000000 -0600
-+++ zstr-1.1.0/src/zstr.hpp	2025-10-20 11:49:38.553413378 -0600
+ 
+@@ -41,10 +40,10 @@ include(CMakePackageConfigHelpers)
+ set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/zstr")
+ install(TARGETS zstr
+   EXPORT zstrTargets
+-  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zstr
+ )
+ install(DIRECTORY "${PROJECT_SOURCE_DIR}/src/"
+-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zstr
+ )
+ install(EXPORT zstrTargets
+   FILE zstrTargets.cmake
+--- zstr-1.2.0/src/zstr.hpp.orig	2026-09-24 16:10:35.000000000 -0600
++++ zstr-1.2.0/src/zstr.hpp	2026-09-25 08:36:20.911888666 -0600
 @@ -15,7 +15,7 @@
  #ifdef MINIZ
  #include <miniz.h>

diff --git a/zstr.spec b/zstr.spec
index 37676d8..9716c71 100644
--- a/zstr.spec
+++ b/zstr.spec
@@ -5,7 +5,7 @@
 %bcond ctest 1
 
 Name:           zstr
-Version:        1.1.0
+Version:        1.2.0
 Release:        %autorelease
 Summary:        A C++ header-only ZLib wrapper
 
@@ -48,15 +48,11 @@ Provides:       %{name}-static = %{version}-%{release}
 %prep
 %autosetup -p1
 
-%install
-#%%cmake_install does nothing, so install manually
-mkdir -p %{buildroot}%{_includedir}/zstr
-install -m 0644 -p src/*.hpp %{buildroot}%{_includedir}/zstr
-
 %files devel
 %doc README.org
 %license LICENSE
 %{_includedir}/zstr/
+%{_datadir}/cmake/zstr/
 
 %changelog
 %autochangelog

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-25 15:22 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-25 15:22 [rpms/zstr] f44: Version 1.2.0 Jerry James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox