[packages/libzypp] - up to 17.35.10
qboosh
qboosh at pld-linux.org
Sun Sep 15 22:15:02 CEST 2024
commit 9ea49b0998e1052327b3b44a92126edfa7b28933
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Sep 15 22:17:51 2024 +0200
- up to 17.35.10
libzypp-gpgme-pkgconfig.patch | 49 -------------------------------------------
libzypp-libxml2.patch | 20 ------------------
libzypp-link.patch | 11 ----------
libzypp.spec | 16 +++++---------
4 files changed, 5 insertions(+), 91 deletions(-)
---
diff --git a/libzypp.spec b/libzypp.spec
index 87428a2..c8b00a7 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -8,17 +8,14 @@
Summary: Package management library
Summary(pl.UTF-8): Biblioteka do zarządzania pakietami
Name: libzypp
-Version: 17.31.25
+Version: 17.35.10
Release: 1
License: GPL v2+
Group: Libraries
#Source0Download: https://github.com/openSUSE/libzypp/tags
Source0: https://github.com/openSUSE/libzypp/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 0d5335fab74f93b8e0fc12c86af960f0
+# Source0-md5: e92b13fc5aed1ea44a68f71032c670b6
Patch0: %{name}-rpm5.patch
-Patch1: %{name}-link.patch
-Patch2: %{name}-gpgme-pkgconfig.patch
-Patch3: %{name}-libxml2.patch
URL: https://en.opensuse.org/Portal:Libzypp
BuildRequires: boost-devel
BuildRequires: cmake >= 3.1
@@ -27,7 +24,7 @@ BuildRequires: curl-devel
BuildRequires: expat-devel >= 1.95
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 2.0
-BuildRequires: gpgme-devel
+BuildRequires: gpgme-devel >= 1.8.0
BuildRequires: libproxy-devel
BuildRequires: libsigc++-devel >= 2.0
# with helixrepo enabled
@@ -96,9 +93,6 @@ Dokumentacja API biblioteki Zypp.
%if %{with rpm5}
%patch0 -p1
%endif
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
install -d build
@@ -142,8 +136,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/zypp-CheckAccessDeleted
%attr(755,root,root) %{_bindir}/zypp-NameReqPrv
%attr(755,root,root) %{_libdir}/libzypp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libzypp.so.1722
-%attr(755,root,root) %{_libdir}/libzypp-tui.so
+%attr(755,root,root) %ghost %{_libdir}/libzypp.so.1735
%dir %{_libexecdir}/zypp
%attr(755,root,root) %{_libexecdir}/zypp/zypp-rpm
%{_datadir}/zypp
@@ -154,6 +147,7 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libzypp.so
+%{_libdir}/libzypp-tui.a
%{_includedir}/zypp
%{_includedir}/zypp-core
%{_includedir}/zypp-curl
diff --git a/libzypp-gpgme-pkgconfig.patch b/libzypp-gpgme-pkgconfig.patch
deleted file mode 100644
index 1df0d9e..0000000
--- a/libzypp-gpgme-pkgconfig.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- libzypp-17.31.9/cmake/modules/FindGpgme.cmake.orig 2023-03-31 18:39:00.000000000 +0200
-+++ libzypp-17.31.9/cmake/modules/FindGpgme.cmake 2023-04-02 15:15:24.414928189 +0200
-@@ -213,14 +213,14 @@ else() # not WIN32
- set( GPGME_PTHREAD_FOUND false )
- set( GPGME_PTH_FOUND false )
-
-- find_program( _GPGMECONFIG_EXECUTABLE NAMES gpgme-config )
-+ find_program( _GPGMECONFIG_EXECUTABLE NAMES pkg-config )
-
- # if gpgme-config has been found
- if ( _GPGMECONFIG_EXECUTABLE )
-
- message( STATUS "Found gpgme-config at ${_GPGMECONFIG_EXECUTABLE}" )
-
-- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION )
-+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --modversion gpgme OUTPUT_VARIABLE GPGME_VERSION )
-
- set( _GPGME_MIN_VERSION "1.1.7" )
-
-@@ -232,17 +232,17 @@ else() # not WIN32
-
- message( STATUS "Found gpgme v${GPGME_VERSION}, checking for flavours..." )
-
-- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret )
-+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs gpgme OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret )
- if ( _ret )
- set( _gpgme_config_vanilla_libs )
- endif()
-
-- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
-+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs gpgme OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
- if ( _ret )
- set( _gpgme_config_pthread_libs )
- endif()
-
-- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth --libs OUTPUT_VARIABLE _gpgme_config_pth_libs RETURN_VALUE _ret )
-+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs gpgme OUTPUT_VARIABLE _gpgme_config_pth_libs RETURN_VALUE _ret )
- if ( _ret )
- set( _gpgme_config_pth_libs )
- endif()
-@@ -256,7 +256,7 @@ else() # not WIN32
-
- if ( _gpgme_config_vanilla_libs OR _gpgme_config_pthread_libs OR _gpgme_config_pth_libs )
-
-- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _GPGME_CFLAGS )
-+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags gpgme OUTPUT_VARIABLE _GPGME_CFLAGS )
-
- if ( _GPGME_CFLAGS )
- string( REGEX REPLACE "(\r?\n)+$" " " _GPGME_CFLAGS "${_GPGME_CFLAGS}" )
diff --git a/libzypp-libxml2.patch b/libzypp-libxml2.patch
deleted file mode 100644
index 62a2043..0000000
--- a/libzypp-libxml2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libzypp-17.31.25/zypp/parser/xml/Reader.cc.orig 2023-12-14 11:09:38.000000000 +0100
-+++ libzypp-17.31.25/zypp/parser/xml/Reader.cc 2023-12-16 18:25:50.480719604 +0100
-@@ -50,7 +50,7 @@ namespace zypp
-
-
- std::list<std::string> structuredErrors;
-- void structuredErrorFunc( void * userData, xmlErrorPtr error )
-+ void structuredErrorFunc( void * userData, const xmlError *error )
- {
- if ( error )
- {
-#@@ -116,7 +116,7 @@ namespace zypp
-# // set error handler
-# // TODO: Fix using a global lastStructuredError string is not reentrant.
-# structuredErrors.clear();
-#- xmlTextReaderSetStructuredErrorHandler( _reader, structuredErrorFunc, NULL );
-#+ xmlTextReaderSetStructuredErrorHandler( _reader, &structuredErrorFunc, NULL );
-# // TODO: set validation
-#
-# // advance to 1st node
diff --git a/libzypp-link.patch b/libzypp-link.patch
deleted file mode 100644
index 16778fc..0000000
--- a/libzypp-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libzypp-17.31.8/zypp/CMakeLists.txt.orig 2023-02-13 16:49:44.000000000 +0100
-+++ libzypp-17.31.8/zypp/CMakeLists.txt 2023-02-27 17:22:31.715118622 +0100
-@@ -903,7 +903,7 @@ macro( ADDZYPPLIB LIBNAME )
- TARGET_LINK_LIBRARIES(${LIBNAME} zypp-protobuf )
-
- TARGET_LINK_LIBRARIES(${LIBNAME} ${UTIL_LIBRARY} )
-- TARGET_LINK_LIBRARIES(${LIBNAME} ${RPM_LIBRARY} )
-+ TARGET_LINK_LIBRARIES(${LIBNAME} ${RPM_LIBRARY} ${RPMIO_LIBRARY} )
- TARGET_LINK_LIBRARIES(${LIBNAME} ${GETTEXT_LIBRARIES} )
- #TARGET_LINK_LIBRARIES(${LIBNAME} ${CURL_LIBRARIES} )
- #TARGET_LINK_LIBRARIES(${LIBNAME} ${LIBXML2_LIBRARIES} )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libzypp.git/commitdiff/9ea49b0998e1052327b3b44a92126edfa7b28933
More information about the pld-cvs-commit
mailing list