commit 3e1a6e818478f309f6816aee29dd04673949a36b
Author: Jakub Bogusz <[email protected]>
Date: Sun Apr 19 17:51:04 2020 +0200
- updated to 17.23.4
- updated link patch
- removed obsolete includes patch
libzypp-includes.patch | 10 ----------
libzypp-link.patch | 32 ++++++++++++++++----------------
libzypp.spec | 34 ++++++++++++++++++++++++++--------
3 files changed, 42 insertions(+), 34 deletions(-)
---
diff --git a/libzypp.spec b/libzypp.spec
index e499032..36b7978 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -1,36 +1,45 @@
#
# Conditional build:
%bcond_without apidocs # do not build and package API docs
+%bcond_with rpm4 # rpm.org 4.x instead of rpm5
+%bcond_with zchunk # zchunk compression
#
Summary: Package management library
Summary(pl.UTF-8): Biblioteka do zarządzania pakietami
Name: libzypp
-Version: 17.18.0
+Version: 17.23.4
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: 8bbdddd5d7fb9b123c29dbf4da45ae89
+# Source0-md5: 699b0c0864293a0cbc10c4b9b7a31d4a
Patch0: %{name}-rpm5.patch
-Patch1: %{name}-includes.patch
-Patch2: %{name}-link.patch
+Patch1: %{name}-link.patch
URL: https://en.opensuse.org/Portal:Libzypp
BuildRequires: boost-devel
-BuildRequires: cmake >= 2.6
+BuildRequires: cmake >= 3.1
BuildRequires: curl-devel
%{?with_apidocs:BuildRequires: doxygen}
BuildRequires: expat-devel >= 1.95
BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 2.0
BuildRequires: gpgme-devel
BuildRequires: libproxy-devel
+BuildRequires: libsigc++-devel >= 2.0
# with helixrepo enabled
BuildRequires: libsolv-devel >= 0.6.8
BuildRequires: libstdc++-devel >= 6:5
BuildRequires: libxml2-devel >= 2.0
BuildRequires: openssl-devel
+BuildRequires: pkgconfig
+%if %{with rpm4}
+BuildRequires: rpm-devel >= 4.15
+%else
BuildRequires: rpm-devel >= 5
+%endif
BuildRequires: udev-devel
+%{?with_zchunk:BuildRequires: zchunk-devel}
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,7 +62,11 @@ Requires: curl-devel
Requires: libsolv-devel >= 0.6.8
Requires: libstdc++-devel >= 6:5
Requires: libxml2-devel >= 2.0
+%if %{with rpm4}
+Requires: rpm-devel >= 4.15
+%else
Requires: rpm-devel >= 5
+%endif
%description devel
Header files for Zypp library.
@@ -74,16 +87,21 @@ Dokumentacja API biblioteki Zypp.
%prep
%setup -q
+%if %{without rpm4}
%patch0 -p1
+%endif
%patch1 -p1
-%patch2 -p1
%build
install -d build
cd build
+# MEDIABACKEND_TESTS require nginx+fcgi+fcgi++
%cmake .. \
%{?with_apidocs:-DENABLE_BUILD_DOCS=ON} \
- -DENABLE_BUILD_TRANS=ON
+ -DENABLE_BUILD_TRANS=ON \
+ -DDISABLE_MEDIABACKEND_TESTS=ON \
+ %{?with_zchunk:-DENABLE_ZCHUNK_COMPRESSION=ON}
+
%{__make}
%install
@@ -114,7 +132,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.1712
+%attr(755,root,root) %ghost %{_libdir}/libzypp.so.1722
%{_datadir}/zypp
%{_mandir}/man1/zypp-CheckAccessDeleted.1*
%{_mandir}/man1/zypp-NameReqPrv.1*
diff --git a/libzypp-includes.patch b/libzypp-includes.patch
deleted file mode 100644
index d773d3b..0000000
--- a/libzypp-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libzypp-14.36.0/zypp/target/RpmPostTransCollector.cc.orig 2015-02-09
16:07:05.000000000 +0100
-+++ libzypp-14.36.0/zypp/target/RpmPostTransCollector.cc 2015-02-18
21:01:59.000864806 +0100
-@@ -19,6 +19,7 @@
- #include "zypp/HistoryLog.h"
- #include "zypp/ZYppCallbacks.h"
- #include "zypp/ExternalProgram.h"
-+#include "zypp/ZConfig.h"
- #include "zypp/target/rpm/RpmHeader.h"
-
-
diff --git a/libzypp-link.patch b/libzypp-link.patch
index f4f43d3..80bdaaf 100644
--- a/libzypp-link.patch
+++ b/libzypp-link.patch
@@ -1,19 +1,19 @@
---- libzypp-14.36.0/zypp/CMakeLists.txt.orig 2015-02-09 16:07:05.000000000
+0100
-+++ libzypp-14.36.0/zypp/CMakeLists.txt 2015-02-19 20:52:36.890595858
+0100
-@@ -921,7 +921,7 @@
- # System libraries
- SET(UTIL_LIBRARY util)
- TARGET_LINK_LIBRARIES(zypp ${UTIL_LIBRARY} )
--TARGET_LINK_LIBRARIES(zypp ${RPM_LIBRARY} )
-+TARGET_LINK_LIBRARIES(zypp ${RPM_LIBRARY} rpmdb rpmio )
- TARGET_LINK_LIBRARIES(zypp ${GETTEXT_LIBRARIES} )
- TARGET_LINK_LIBRARIES(zypp ${CURL_LIBRARIES} )
- TARGET_LINK_LIBRARIES(zypp ${LIBXML2_LIBRARIES} )
-@@ -940,6 +940,7 @@
- ENDIF ( UDEV_FOUND )
+--- 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)
+ TARGET_LINK_LIBRARIES(${LIBNAME} ${UTIL_LIBRARY} )
+- TARGET_LINK_LIBRARIES(${LIBNAME} ${RPM_LIBRARY} )
++ TARGET_LINK_LIBRARIES(${LIBNAME} ${RPM_LIBRARY} rpmdb rpmio )
+ 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(zypp ${LIBPROXY_LIBRARIES} )
-+TARGET_LINK_LIBRARIES(zypp pthread )
+ TARGET_LINK_LIBRARIES( ${LIBNAME} ${LIBPROXY_LIBRARIES} )
++ TARGET_LINK_LIBRARIES( ${LIBNAME} pthread )
- INSTALL(TARGETS zypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
+ endmacro()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libzypp.git/commitdiff/3e1a6e818478f309f6816aee29dd04673949a36b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
