diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..0a80fdce31f59c062e2abba28776e9521eddff30 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..be996f01b5a31a2d30f2e10e80b792c7402d3c3e --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/poco diff --git a/poco-1.12.4.tar.gz b/poco-1.12.4.tar.gz index 3876f2eee66dd8b9e3390ab5e9d4337f13a14446..81c37ab8149bb2b9931a8280bf14ac6abb5df1dc 100644 Binary files a/poco-1.12.4.tar.gz and b/poco-1.12.4.tar.gz differ diff --git a/poco-deal-with-libsuffix.patch b/poco-deal-with-libsuffix.patch new file mode 100644 index 0000000000000000000000000000000000000000..09540f72901afb59b67e8039e7f807951b832644 --- /dev/null +++ b/poco-deal-with-libsuffix.patch @@ -0,0 +1,12 @@ +--- poco-poco-1.12.4-release/CMakeLists.txt.orig 2025-08-23 10:35:09.617111500 +0800 ++++ poco-poco-1.12.4-release/CMakeLists.txt 2025-08-23 10:38:06.806080300 +0800 +@@ -52,6 +52,9 @@ + + # Enable standard installation directories + include(GNUInstallDirs) ++if("${LIB_SUFFIX}" STREQUAL "" AND NOT ${CMAKE_INSTALL_LIBDIR} STREQUAL "lib") ++ STRING(REPLACE "lib" "" LIB_SUFFIX ${CMAKE_INSTALL_LIBDIR}) ++endif("${LIB_SUFFIX}" STREQUAL "" AND NOT ${CMAKE_INSTALL_LIBDIR} STREQUAL "lib") + + # Include some common macros to simpilfy the Poco CMake files + include(PocoMacros) diff --git a/poco.spec b/poco.spec index 9db1fb91bdccfe5297b5a69dbae27cfbbb37a04e..a0dc0eb484a034831e042a709607eb3ed6193d96 100644 --- a/poco.spec +++ b/poco.spec @@ -19,7 +19,7 @@ Name: poco Version: 1.12.4 -Release: 2 +Release: 3 Summary: C++ class libraries for network-centric applications License: BSL-1.0 @@ -31,6 +31,8 @@ Source: https://github.com/pocoproject/poco/archive/poco-%{version}-re Patch: 0001-Fix-XML-compilation-due-to-new-methods-being-guarded.patch # Disable the tests that will fail under Koji (mostly network) Patch: 0002-Disable-tests-that-fail-in-koji.patch +# Deal with upcoming LIB_SUFFIX removal +Patch: poco-deal-with-libsuffix.patch #add by uos Patch100: 100-poco-uos-add-sw_64-support.patch #end @@ -470,5 +472,8 @@ HTML format. %doc README NEWS LICENSE CONTRIBUTORS CHANGELOG doc/* %changelog +* Sat Aug 23 2025 Funda Wang - 1.12.4-3 +- deal with upcoming LIB_SUFFIX removal + * Thu Feb 27 2025 zhangshaoning - 1.12.4-2 - Add sw_64 support