Changes - SailfishOS Open Build Service

Changes of Revision 3

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Added	_service:tar_git:libzypp.changes
@@ -0,0 +1,47 @@ +* Wed Dec 09 2015 lbt <david@dgreaves.com> - 14.35.0-10 +- [license] Unify open source licenses. Contributes to JB#33648 +- [license] Unify open source licenses. Contributes to JB#33648 + +* Tue Oct 27 2015 pycage <martin.grimme@gmail.com> - 14.35.0-9 +- [deltarpm] Ensure that the destination path for applying the delta rpm exists. Fixes JB#31668 + +* Wed Sep 02 2015 stskeeps <carsten.munk@gmail.com> - 14.35.0-8 +- [libzypp] Set rpm.install.excludedocs = yes. Save space on mobile devices. Fixes JB#31669 + +* Wed Sep 02 2015 stskeeps <carsten.munk@gmail.com> - 14.35.0-7 +- [libzypp] Set download.use_deltarpm.always=true . Fixes JB#31671 + +* Wed May 27 2015 stskeeps <carsten.munk@gmail.com> - 14.35.0-6 +- [rpm] Fix compatibility with RPM < 4.12.x (Contributes to JB#28828) + +* Tue May 19 2015 Thomas Perl <m@thp.io> - 14.35.0-5 +- [zypp] Support for .check files in the systemCheck.d directory +- [zypp] Support for /etc/zypp/systemCheck.d (Contributes to JB#28828) + + Tue May 19 2015 Thomas Perl <m@thp.io> - 14.35.0-3 +- [spec] Require libsolv 0.6.8 (Fixes JB#28755) + +* Fri May 08 2015 Thomas Perl <m@thp.io> - 14.35.0-2 +- [rebuild] Bug reference in changelog +- [upstream] Sync to version 14.35.0 (Contributes to JB#25649) +- [zypp] Add patch: Use GPG_BINARY in PublicKey.cc (Contributes to JB#25649) + +* Fri Mar 20 2015 thp <m@thp.io> - 14.35.0-1 +- [upstream] Sync to version 14.35.0 +- [zypp] Add patch: Use GPG_BINARY in PublicKey.cc + +* Mon Dec 30 2013 Islam Amer <pharon@gmail.com> - 12.2.0+git2 +- [packaging] create and own systemCheck.d directory +- [spec] Easier rebuilding +- [zypp] Only read .check files from the systemCheck.d directory +- [zypp] Supports systemCheck.d directory + + Wed Nov 06 2013 Juha Kallioinen <juha.kallioinen@jolla.com> - 12.2.0+git1 +- [libzypp] Add workaround for tnhl +- [libzypp] Drop date and time from builds so that we don't cause more rebuilds. +- [libzypp] Enable netrc-optional on libcurl to allow for easier image building in SDK +- [libzypp] Set unrestricted auth curl option +- [libzypp] Use gpg2 instead of gpg +- [packaging] Add packaging +- [packaging] Add rpmlintrc +
[-] [+]	Added	_service:tar_git:libzypp.spec ^
@@ -0,0 +1,227 @@ +Name: libzypp +License: GPLv2+ +Group: System/Packages +Summary: Package, Patch, Pattern, and Product Management +Version: 14.35.0+master.20170521010510.4.ge9f65d4 +Release: 10 +Source: %{name}-%{version}.tar.bz2 +Source1: %{name}-rpmlintrc +Patch0: 0001-zypp-PublicKey.cc-Use-GPG_BINARY-from-KeyRing.cc.patch +Patch1: 0002-Diffs-14.35.0-10.patch +Patch2: aarch64.patch +BuildRequires: cmake +BuildRequires: openssl-devel +BuildRequires: libudev-devel +# Need boost > 1.53 for string_ref utility +BuildRequires: boost-devel >= 1.53.0 +BuildRequires: doxygen +BuildRequires: gcc-c++ >= 4.6 +BuildRequires: gettext-devel +BuildRequires: libxml2-devel +BuildRequires: pkgconfig(libproxy-1.0) +BuildRequires: libsolv-devel >= 0.6.8 +Requires: libsolv-tools >= 0.6.8 +Requires: libsolv0 >= 0.6.8 +BuildRequires: expat-devel +BuildRequires: glib2-devel +BuildRequires: popt-devel +BuildRequires: rpm-devel +Requires: gnupg2 +BuildRequires: curl-devel + +%description +Package, Patch, Pattern, and Product Management + +Authors: +-------- + Michael Andres <ma@suse.de> + Jiri Srain <jsrain@suse.cz> + Stefan Schubert <schubi@suse.de> + Duncan Mac-Vicar <dmacvicar@suse.de> + Klaus Kaempf <kkaempf@suse.de> + Marius Tomaschewski <mt@suse.de> + Stanislav Visnovsky <visnov@suse.cz> + Ladislav Slezak <lslezak@suse.cz> + +%package devel +Requires: libzypp = %{version} +Requires: libxml2-devel +Requires: openssl-devel +Requires: rpm-devel +Requires: glibc-devel +Requires: zlib-devel +Requires: bzip2 +Requires: popt-devel +Requires: boost-devel >= 1.60.0 +Requires: libstdc++-devel +Requires: libudev-devel +Requires: cmake +Requires: curl-devel +Requires: libsolv-devel +Summary: Package, Patch, Pattern, and Product Management - developers files + +%description -n libzypp-devel +Package, Patch, Pattern, and Product Management - developers files + +Authors: +-------- + Michael Andres <ma@suse.de> + Jiri Srain <jsrain@suse.cz> + Stefan Schubert <schubi@suse.de> + Duncan Mac-Vicar <dmacvicar@suse.de> + Klaus Kaempf <kkaempf@suse.de> + Marius Tomaschewski <mt@suse.de> + Stanislav Visnovsky <visnov@suse.cz> + Ladislav Slezak <lslezak@suse.cz> + Alexey Andreyev <aa13q@ya.ru> + +%prep +%setup -q -n %{name}-%{version}/upstream +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build +mkdir -p build +cd build + +# There is gcc bug that prevents using gdwarf-4 atm. +export CFLAGS="$CFLAGS -gdwarf-2" +export CXXFLAGS="$CXXFLAGS -gdwarf-2" + +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DDOC_INSTALL_DIR=%{_docdir} \ + -DLIB=%{_lib} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 \ + -DUSE_TRANSLATION_SET=${TRANSLATION_SET:-zypp} \ + .. +make %{?_smp_mflags} VERBOSE=1 +make -C doc/autodoc %{?_smp_mflags} +make -C po %{?_smp_mflags} translations + +%if 0%{?run_testsuite} + make -C tests %{?_smp_mflags} + pushd tests + LD_LIBRARY_PATH=$PWD/../zypp:$LD_LIBRARY_PATH ctest . + popd +%endif + +%install +rm -rf "$RPM_BUILD_ROOT" +cd build +make install DESTDIR=$RPM_BUILD_ROOT +make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/services.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vendors.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/multiversion.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/systemCheck.d +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/commit +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/services +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/system +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/urlresolver +mkdir -p $RPM_BUILD_ROOT%{_var}/lib/zypp +mkdir -p $RPM_BUILD_ROOT%{_var}/log/zypp +mkdir -p $RPM_BUILD_ROOT%{_var}/cache/zypp + +make -C po install DESTDIR=$RPM_BUILD_ROOT +# Create filelist with translations +cd .. +%{find_lang} zypp + +%post +/sbin/ldconfig +if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi + +# convert old lock file to new +# TODO make this a separate file? +# TODO run the sript only when updating form pre-11.0 libzypp versions +LOCKSFILE=%{_sysconfdir}/zypp/locks +OLDLOCKSFILE=%{_sysconfdir}/zypp/locks.old + +is_old(){ + # if no such file, exit with false (1 in bash) + test -f ${LOCKSFILE} \|\| return 1 + TEMP_FILE=`mktemp` + cat ${LOCKSFILE} \| sed '/^\#./ d;/.:./d;/^[^[a-zA-Z\?.0-9]$/d' > ${TEMP_FILE} + if [ -s ${TEMP_FILE} ] + then + RES=0 + else + RES=1 + fi + rm -f ${TEMP_FILE} + return ${RES} +} + +append_new_lock(){ + case "$#" in + 1 ) + echo " +solvable_name: $1 +match_type: glob +" >> ${LOCKSFILE} +;; + 2 ) #TODO version + echo " +solvable_name: $1 +match_type: glob +version: $2 +" >> ${LOCKSFILE} +;; + 3 ) #TODO version + echo " +solvable_name: $1 +match_type: glob +version: $2 $3 +" >> ${LOCKSFILE} + ;; +esac +} + +die() { + echo $1 + exit 1 +} + +if is_old ${LOCKSFILE} + then + mv -f ${LOCKSFILE} ${OLDLOCKSFILE} \|\| die "cannot backup old locks" + cat ${OLDLOCKSFILE}\| sed "/^\#./d"\| while read line + do + append_new_lock $line + done +fi + +%postun -p /sbin/ldconfig
[-] [+]	Added	_service:tar_git:0001-zypp-PublicKey.cc-Use-GPG_BINARY-from-KeyRing.cc.patch ^
@@ -0,0 +1,64 @@ +From 50ed977e1b166ba23a029f3a5194121ea4d45dd7 Mon Sep 17 00:00:00 2001 +From: Thomas Perl <m@thp.io> +Date: Fri, 6 Feb 2015 16:28:43 +0100 +Subject: [PATCH] zypp/PublicKey.cc: Use GPG_BINARY from KeyRing.cc + +On systems where "gpg" is not available, checking the public key +would fail. Use GPG_BINARY in both PublicKey.cc and KeyRing.cc, +and define it in a single place only (ExternalProgram.h). + +The original patch was partially integrated in upstream +commit 092cded378742fcbb0761cc470da863cb32ed537, but only as a duplicated +define in KeyRing and PublicKey. This patch now just moves the define to +ExternalProgram.h +--- + zypp/ExternalProgram.h \| 2 ++ + zypp/KeyRing.cc \| 3 --- + zypp/PublicKey.cc \| 3 --- + 3 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/zypp/ExternalProgram.h b/zypp/ExternalProgram.h +index f3fc850..99a3143 100644 +--- a/zypp/ExternalProgram.h ++++ b/zypp/ExternalProgram.h +@@ -22,6 +22,8 @@ + #include "zypp/base/ExternalDataSource.h" + #include "zypp/Pathname.h" + ++#define GPG_BINARY "/usr/bin/gpg2" ++ + namespace zypp { + + / +diff --git a/zypp/KeyRing.cc b/zypp/KeyRing.cc +index d6b8246..826ce4c 100644 +--- a/zypp/KeyRing.cc ++++ b/zypp/KeyRing.cc +@@ -35,9 +35,6 @@ using std::endl; + #undef ZYPP_BASE_LOGGER_LOGGROUP + #define ZYPP_BASE_LOGGER_LOGGROUP "zypp::KeyRing" + +-/ \todo Fix duplicate define in PublicKey/KeyRing / +-#define GPG_BINARY "/usr/bin/gpg2" +- + /////////////////////////////////////////////////////////////////// + namespace zypp + { ///////////////////////////////////////////////////////////////// +diff --git a/zypp/PublicKey.cc b/zypp/PublicKey.cc +index fa17b79..fdbc95e 100644 +--- a/zypp/PublicKey.cc ++++ b/zypp/PublicKey.cc +@@ -28,9 +28,6 @@ + + #include <ctime> + +-/* \todo Fix duplicate define in PublicKey/KeyRing */ +-#define GPG_BINARY "/usr/bin/gpg2" +- + using std::endl; + + /////////////////////////////////////////////////////////////////// +-- +1.8.3-rc3 + +
[-] [+]	Added	_service:tar_git:0002-Diffs-14.35.0-10.patch ^
@@ -0,0 +1,40 @@ +diff --git a/zypp.conf b/zypp.conf +index dfe7f64..5292843 100644 +--- a/zypp.conf ++++ b/zypp.conf +@@ -199,7 +199,7 @@ + ## + ## This option has no effect unless download.use_deltarpm is set true. + ## +-# download.use_deltarpm.always = false ++download.use_deltarpm.always = true + + ## + ## Hint which media to prefer when installing packages (download vs. CD). +@@ -427,6 +427,16 @@ + # solver.checkSystemFile = /etc/zypp/systemCheck + + ## ++## This directory can contain files that contain requirements/conflicts ++## which fulfill the needs of a running system (see checkSystemFile). ++## ++## Files are read in alphabetical order. ++## ++## Default value: {configdir}/systemCheck.d ++## ++# solver.checkSystemFileDir = /etc/zypp/systemCheck.d ++ ++## + ## When committing a dist upgrade (e.g. 'zypper dup') a solver testcase + ## is written to /var/log/updateTestcase-<date>. It is needed in bugreports. + ## This option returns the number of testcases to keep on the system. Old +@@ -595,7 +505,7 @@ multiversion.kernels = latest,latest-1,running + ## Valid values: boolean + ## Default value: no + ## +-# rpm.install.excludedocs = no ++rpm.install.excludedocs = yes + + ## + ## Location of history log file. +
[-] [+]	Added	_service:tar_git:aarch64.patch ^
@@ -0,0 +1,14 @@ +Index: zypp/ZConfig.cc +=================================================================== +--- zypp.orig/ZConfig.cc ++++ zypp/ZConfig.cc +@@ -133,7 +133,8 @@ namespace zypp + ERR << "Cant open " << PathInfo("/proc/cpuinfo") << endl; + } + } +- else if ( architecture == Arch_armv7l \|\| architecture == Arch_armv6l ) ++ else if ( architecture == Arch_armv7l \|\| architecture == Arch_armv6l \|\| ++ architecture == Arch_aarch64 ) + { + std::ifstream platform( "/etc/rpm/platform" ); + if (platform)
[-] [+]	Changed	_service ^
@@ -3,6 +3,6 @@ <param name="url">https://git.merproject.org/aa13q/libzypp</param> <param name="branch">master</param> <param name="revision">e9f65d4001a20a7bf511fe1f19692b255a6d8412</param> - <param name="dumb">Y</param> + <param name="dumb">N</param> </service> </services>
	Added	_service:tar_git:libzypp-14.35.0+master.20170521010510.4.ge9f65d4.tar.bz2 ^
[-] [+]	Added	_service:tar_git:libzypp-rpmlintrc ^
@@ -0,0 +1 @@ +addFilter("libzypp.* shlib-policy-name-error")