From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 23 May 2022 16:12:37 +0000 (+0200)
Subject: - up to 17.30.0
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=aa7e58a5df54c6ae4c6bd7b957ee9a4943f7d470;p=packages%2Flibzypp.git

- up to 17.30.0
---

diff --git a/libzypp-link.patch b/libzypp-link.patch
index 80bdaaf..473c947 100644
--- a/libzypp-link.patch
+++ b/libzypp-link.patch
@@ -1,19 +1,11 @@
---- libzypp-17.23.4/zypp/CMakeLists.txt.orig	2020-04-19 16:38:59.304780542 +0200
-+++ libzypp-17.23.4/zypp/CMakeLists.txt	2020-04-19 16:40:38.104245299 +0200
-@@ -910,7 +910,7 @@
-   # System libraries
-   SET(UTIL_LIBRARY util)
+--- libzypp-17.30.0/zypp/CMakeLists.txt.orig	2022-03-25 17:09:27.000000000 +0100
++++ libzypp-17.30.0/zypp/CMakeLists.txt	2022-05-22 20:39:45.256161090 +0200
+@@ -902,7 +902,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} rpmdb rpmio )
++  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} )
-@@ -937,6 +937,7 @@
-   ENDIF ( UDEV_FOUND )
- 
-   TARGET_LINK_LIBRARIES( ${LIBNAME} ${LIBPROXY_LIBRARIES} )
-+  TARGET_LINK_LIBRARIES( ${LIBNAME} pthread )
- 
- endmacro()
- 
diff --git a/libzypp.spec b/libzypp.spec
index 2c2fa5d..eb1f1bf 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -7,13 +7,13 @@
 Summary:	Package management library
 Summary(pl.UTF-8):	Biblioteka do zarządzania pakietami
 Name:		libzypp
-Version:	17.28.0
+Version:	17.30.0
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 #Source0Download: https://github.com/openSUSE/libzypp/releases
 Source0:	https://github.com/openSUSE/libzypp/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	2607d7d977f5995a89feb05d7a3530bd
+# Source0-md5:	51bfd25a747e45e1e684d474f5cbefe8
 Patch0:		%{name}-rpm5.patch
 Patch1:		%{name}-link.patch
 URL:		https://en.opensuse.org/Portal:Libzypp
@@ -148,6 +148,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libzypp.so
 %{_includedir}/zypp
 %{_includedir}/zypp-core
+%{_includedir}/zypp-curl
+%{_includedir}/zypp-media
 %{_pkgconfigdir}/libzypp.pc
 %{_datadir}/cmake/Modules/FindZypp.cmake
 %{_datadir}/cmake/Modules/ZyppCommon.cmake