Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2014-10-14 07:09:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2014-09-28 19:53:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2014-10-14 07:09:07.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Oct 10 16:01:31 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 (bnc#899603) + +------------------------------------------------------------------- +Thu Oct 9 01:13:15 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Oct 5 01:14:42 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Sep 28 01:13:30 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.M4YqZS/_old 2014-10-14 07:09:08.000000000 +0200 +++ /var/tmp/diff_new_pack.M4YqZS/_new 2014-10-14 07:09:08.000000000 +0200 @@ -365,7 +365,8 @@ %{_datadir}/zypp %{_bindir}/* %{_libdir}/libzypp*so.* -%doc %{_mandir}/man5/locks.5.* +%doc %{_mandir}/man1/*.1.* +%doc %{_mandir}/man5/*.5.* %files devel %defattr(-,root,root) ++++++ libzypp-14.29.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/CMakeLists.txt new/libzypp-14.29.4/CMakeLists.txt --- old/libzypp-14.29.4/CMakeLists.txt 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/CMakeLists.txt 2014-09-29 14:17:09.000000000 +0200 @@ -4,10 +4,33 @@ SET( CMAKE_MODULE_PATH ${LIBZYPP_SOURCE_DIR}/cmake/modules ) cmake_minimum_required(VERSION 2.6) +OPTION (ENABLE_BUILD_DOCS "Build documentation by default?" OFF) +OPTION (ENABLE_BUILD_TRANS "Build translation files by default?" OFF) +OPTION (ENABLE_BUILD_TESTS "Build and run test suite by default?" OFF) OPTION (DISABLE_LIBPROXY "Build without libproxy support even if package is installed?" OFF) OPTION (DISABLE_AUTODOCS "Do not require doxygen being installed (required to build autodocs)?" OFF) +#-------------------------------------------------------------------------------- +SET (have_system x) + +IF (DEBIAN) + MESSAGE (STATUS "Building for Debian") + SET (ENABLE_BUILD_DOCS ON) + SET (ENABLE_BUILD_TRANS ON) + SET (ENABLE_BUILD_TESTS ON) + SET (have_system ${have_system}x) +ENDIF (DEBIAN) + +IF (${have_system} STREQUAL x) + MESSAGE (STATUS "Building for SUSE") +ENDIF (${have_system} STREQUAL x) + +IF (${have_system} STRGREATER xx) + MESSAGE (FATAL_ERROR "Can only build for one system type.") +ENDIF (${have_system} STRGREATER xx) +#-------------------------------------------------------------------------------- + # allow name libraries by name mixed with full # paths if(COMMAND cmake_policy) @@ -213,15 +236,23 @@ #################################################################### ADD_SUBDIRECTORY( zypp ) -#ADD_SUBDIRECTORY( zypp2 ) # do not build devel by default ADD_SUBDIRECTORY( devel EXCLUDE_FROM_ALL ) ADD_SUBDIRECTORY( tools ) ADD_SUBDIRECTORY( examples ) -ADD_SUBDIRECTORY( po EXCLUDE_FROM_ALL ) ADD_SUBDIRECTORY( doc ) ADD_SUBDIRECTORY( vendor ) -ADD_SUBDIRECTORY( tests EXCLUDE_FROM_ALL ) +IF ( ENABLE_BUILD_TRANS ) + ADD_SUBDIRECTORY( po ) +ELSE ( ENABLE_BUILD_TRANS ) + ADD_SUBDIRECTORY( po EXCLUDE_FROM_ALL ) +ENDIF ( ENABLE_BUILD_TRANS ) + +IF ( ENABLE_BUILD_TESTS ) + ADD_SUBDIRECTORY( tests ) +ELSE ( ENABLE_BUILD_TESTS ) + ADD_SUBDIRECTORY( tests EXCLUDE_FROM_ALL ) +ENDIF ( ENABLE_BUILD_TESTS ) INCLUDE(CTest) ENABLE_TESTING() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/cmake/modules/ZyppCommon.cmake new/libzypp-14.29.4/cmake/modules/ZyppCommon.cmake --- old/libzypp-14.29.4/cmake/modules/ZyppCommon.cmake 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/cmake/modules/ZyppCommon.cmake 2014-09-26 13:49:10.000000000 +0200 @@ -8,6 +8,13 @@ SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) ENDIF ( DEFINED LIB ) MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) +# Headers +IF (DEFINED INCLUDE) + SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE}") +else (DEFINED INCLUDE) + SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") +ENDIF (DEFINED INCLUDE) +MESSAGE (STATUS "Header files will be installed in ${INCLUDE_INSTALL_DIR}") # system configuration dir (etc) IF( NOT DEFINED SYSCONFDIR ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/doc/CMakeLists.txt new/libzypp-14.29.4/doc/CMakeLists.txt --- old/libzypp-14.29.4/doc/CMakeLists.txt 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/doc/CMakeLists.txt 2014-10-02 16:21:09.000000000 +0200 @@ -1,7 +1,50 @@ -ADD_SUBDIRECTORY( autodoc EXCLUDE_FROM_ALL) +IF ( ENABLE_BUILD_DOCS ) + ADD_SUBDIRECTORY( autodoc ) +ELSE ( ENABLE_BUILD_DOCS ) + ADD_SUBDIRECTORY( autodoc EXCLUDE_FROM_ALL ) +ENDIF ( ENABLE_BUILD_DOCS ) -INSTALL( - FILES locks.5 - DESTINATION ${MANDIR}/man5 + +SET (libzypp_MAN1 + zypp-CheckAccessDeleted.1 zypp-NameReqPrv.1) + +SET (libzypp_MAN5 + locks.5) + +SET (libzypp_MAN + ${libzypp_MAN1} ${libzypp_MAN5}) + +ADD_CUSTOM_TARGET( man ALL + DEPENDS ${libzypp_MAN} ) +FOREACH (libzypp_MANIDX 1 2 3 4 5 6 7 8) + INSTALL (FILES + ${libzypp_MAN${libzypp_MANIDX}} + DESTINATION ${MANDIR}/man${libzypp_MANIDX} + ) +ENDFOREACH (libzypp_MANIDX) + +# +# If a2x is installed, auto update manpage from asciidoc manpage.txt: +# +FIND_PROGRAM(A2X a2x) +FOREACH (libzypp_MANTARGET ${libzypp_MAN}) + IF (A2X) + ADD_CUSTOM_COMMAND ( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${libzypp_MANTARGET} + COMMAND ${A2X} -f manpage ${libzypp_MANTARGET}.txt + DEPENDS ${libzypp_MANTARGET}.txt + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) + ELSE (A2X) + ADD_CUSTOM_COMMAND ( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${libzypp_MANTARGET} + DEPENDS ${libzypp_MANTARGET}.txt + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Forgott to fix manpage after changing ascidoc? Install a2x for automated creation or 'touch ${libzypp_MANTARGET}'" + ) + ENDIF (A2X) +ENDFOREACH (libzypp_MANTARGET) + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/doc/autodoc/CMakeLists.txt new/libzypp-14.29.4/doc/autodoc/CMakeLists.txt --- old/libzypp-14.29.4/doc/autodoc/CMakeLists.txt 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/doc/autodoc/CMakeLists.txt 2014-09-29 14:17:09.000000000 +0200 @@ -56,17 +56,10 @@ DESTINATION ${DOC_INSTALL_DIR}/libzypp/libzypp.doxytag ) -# We could use the thing below but it wont work with cmake older than 2.4.4 -FILE(GLOB docfiles ${CMAKE_CURRENT_BINARY_DIR}/html/*) -INSTALL( FILES - ${docfiles} - DESTINATION ${DOC_INSTALL_DIR}/libzypp/html +INSTALL( DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/html + DESTINATION ${DOC_INSTALL_DIR}/libzypp ) - -#INSTALL( DIRECTORY -# ${CMAKE_CURRENT_BINARY_DIR}/html -# DESTINATION ${DOC_INSTALL_DIR} -#) ### ################################################## ENDIF ( DOXYGEN ) ### ################################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/doc/downloaders-mediaset.txt new/libzypp-14.29.4/doc/downloaders-mediaset.txt --- old/libzypp-14.29.4/doc/downloaders-mediaset.txt 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/doc/downloaders-mediaset.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ - -Downloaders and MediaSet -======================== [email protected] Files old/libzypp-14.29.4/doc/libzypp.zargo and new/libzypp-14.29.4/doc/libzypp.zargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/doc/locks.5 new/libzypp-14.29.4/doc/locks.5 --- old/libzypp-14.29.4/doc/locks.5 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/doc/locks.5 2014-10-02 16:21:09.000000000 +0200 @@ -1,199 +1,290 @@ -.TH "locks" "5" "4.25.0" "libzypp" "System Tools" +'\" t +.\" Title: locks +.\" Author: [see the "AUTHORS" section] +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/02/2014 +.\" Manual: LIBZYPP +.\" Source: libzypp +.\" Language: English +.\" +.TH "LOCKS" "5" "10/02/2014" "libzypp" "LIBZYPP" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH "NAME" -.LP -locks - libzypp locking file - +locks \- libzypp locking file .SH "DESCRIPTION" -.LP -The file \fI/etc/zypp/locks\fR is read by libzypp at startup if -\fIzypp.conf\fR allows it. The entries are used for initial locking of -packages. Locking a package means not allowing to install or uninstall -it. Valid entries are -.TP -\fI attribute\fR\fB:\fR \fIvalue\fR -Where attributes and their values are described below. -.br -Locks are separated by empty lines. - +.sp +The file \fI/etc/zypp/locks\fR is read by libzypp at start\-up if \fIzypp\&.conf\fR allows it\&. The entries are used for initial locking of packages\&. Locking a package means not allowing to install or uninstall it\&. +.sp +Valid entries are of the form: +.PP +\fIattribute\fR\fB:\fR \fIvalue\fR +.RS 4 +Where attributes and their values are described below\&. +.RE +.sp +Locks are separated by an empty lines\&. .SH "ATTRIBUTES" -.LP -All attributes are lower-case. - -.TP -.B repo -specifies repository restriction. Only alias is accepted. -.br -By default all repositories match. - -.TP -.B type -resolvable type restriction -.br -The values can be \fBpackage\fR, \fBpatch\fR, \fBpattern\fR, \fBproduct\fR and \fBsrcpackage\fR. -.br -By default all types match. - -.TP -.B case_sensitive -if strings are matched case sensitive. -The values are \fBtrue\fR, \fBfalse\fR, \fBon\fR, \fBoff\fR. -.br -The default is case insensitive. - -.TP -.B install_status -status of object. Possible states are \fBinstalled\fR, -\fBnot-installed\fR and \fBall\fR. If more install statuses are -specified then the last one is used. -.br -The values are \fBinstalled\fR for all packages which are installed, \fBnon-installed\fR for packages which can be installed or reinstalled and \fBall\fR for both. -.br -The default is \fBall\fR. - -.TP -.B match_type -type of string matching in values. Does not affect \fBtype\fR and \fBrepo\fR which must be specified exactly. -.br -The values are \fBexact\fR, \fBsubstring\fR, \fBregex\fR for regular -expressions, \fBglob\fR for matching as on the command line, and \fBword\fR. -.br -The default is \fBsubstring\fR. - -.TP -.B query_string -String to be matched in multiple attributes. Should be restricted by -another attribute with empty value ( it is recommended, because without restriction expect some performance problems ). - -.TP -.B version -Restrict the lock only to some versions. It contains two parts: an -optional operator and the version. -.br -The operator is \fB==\fR,\fB!=\fR,\fB<\fR,\fB>\fR,\fB<=\fR,\fB>=\fR. If operator is not specified then \fB==\fR is used. -.br -The version has the format -.RB [ epoch: ] version [ -release ]. -.br -Example: version: < 0:0.11.4-2 - -.TP -.B solvable_name -name of object (e.g. zypper) - -.TP -.B solvable_summary +.sp +All attributes are lower\-case\&. +.PP +\fBrepo\fR +.RS 4 +specifies repository restriction\&. Only alias is accepted\&. + +By default all repositories match\&. +.RE +.PP +\fBtype\fR +.RS 4 +resolvable type restriction\&. The values can be +\fBpackage\fR, +\fBpatch\fR, +\fBpattern\fR, +\fBproduct\fR +and +\fBsrcpackage\fR\&. + +By default all types match\&. +.RE +.PP +\fBcase_sensitive\fR +.RS 4 +if strings are matched case sensitive\&. The values are +\fBtrue\fR, +\fBfalse\fR, +\fBon\fR, +\fBoff\fR\&. + +The default is case insensitive\&. +.RE +.PP +\fBinstall_status\fR +.RS 4 +status of object\&. Possible states are +\fBinstalled\fR, +\fBnot\-installed\fR +and +\fBall\fR\&. If more install statuses are specified then the last one is used\&. The values are +\fBinstalled\fR +for all packages which are installed, +\fBnon\-installed\fR +for packages which can be installed or reinstalled and +\fBall\fR +for both\&. + +The default is +\fBall\fR\&. +.RE +.PP +\fBmatch_type\fR +.RS 4 +type of string matching in values\&. Does not affect +\fBtype\fR +and +\fBrepo\fR +which must be specified exactly\&. The values are +\fBexact\fR, +\fBsubstring\fR, +\fBregex\fR +for regular expressions, +\fBglob\fR +for matching as on the command line, and +\fBword\fR\&. + +The default is +\fBsubstring\fR\&. +.RE +.PP +\fBquery_string\fR +.RS 4 +String to be matched in multiple attributes\&. Should be restricted by another attribute with empty value (it is recommended, because without restriction expect some performance problems)\&. +.RE +.PP +\fBversion\fR +.RS 4 +Restrict the lock only to some versions\&. It contains two parts: an optional operator and the version\&. + +The operator is +\fB==\fR, +\fB!=\fR, +\fB<\fR, +\fB>\fR, +\fB⇐\fR, +\fB>=\fR\&. If operator is not specified then +\fB==\fR +is used\&. + +The version has the format [\fIepoch\fR\fB:\fR]\fIversion\fR[\fB\-\fR\fIrelease\fR]\&. + +Example: +\fBversion: < 0:0\&.11\&.4\-2\fR +.RE +.PP +\fBsolvable_name\fR +.RS 4 +name of object (e\&.g\&. zypper) +.RE +.PP +\fBsolvable_summary\fR +.RS 4 summary of object - -.TP -.B solvable_arch -architecture of object (e.g. x86_64, i586) - -.TP -.B solvable_description -description of object - -.TP -.B solvable_eula +.RE +.PP +\fBsolvable_arch\fR +.RS 4 +architecture of object (e\&.g\&. x86_64, i586) +.RE +.PP +\fBsolvable_description\fR +.RS 4 +description of object +.RE +.PP +\fBsolvable_eula\fR +.RS 4 license text of objects which request accepting license by user - -.TP -.B solvable_license -license of package (only for package) (e.g. GPL2) - -.TP -.B solvable_keywords +.RE +.PP +\fBsolvable_license\fR +.RS 4 +license of package (only for package) (e\&.g\&. GPL2) +.RE +.PP +\fBsolvable_keywords\fR +.RS 4 keywords which specify package (only for package) - -.TP -.B solvable_authors +.RE +.PP +\fBsolvable_authors\fR +.RS 4 authors of package (only for package) - -.TP -.B solvable_group -package group (only for package) (e.g. Development/Tools/Version Control ) - -.TP -.B update_reference_type -reference for update (e.g. bugzilla,cve) (only for patches) - +.RE +.PP +\fBsolvable_group\fR +.RS 4 +package group (only for package) (e\&.g\&. Development/Tools/Version Control ) +.RE +.PP +\fBupdate_reference_type\fR +.RS 4 +reference for update (e\&.g\&. bugzilla,cve) (only for patches) +.RE .SH "EXAMPLES" -.LP - -.TP -.B Exact Package -This is the way YaST UI does it. Lock k3b (e.g. you don't want to update it). -.br ------locks----- -.br +.PP +\fBExact Package\fR +.RS 4 +This is the way YaST UI does it\&. Lock k3b (e\&.g\&. you don\(cqt want to update it)\&. +.RE +.sp +.if n \{\ +.RS 4 +.\} +.nf +\-\-\-\-\-locks\-\-\-\-\- type: package -.br solvable_name: k3b -.br match_type: exact -.br case_sensitive: on - -.TP -.B Package Wildcard -This is the way "zypper addlock cross-*-gcc-icecream-backend" does it. -.br ------locks----- -.br +.fi +.if n \{\ +.RE +.\} +.PP +\fBPackage Wildcard\fR +.RS 4 +This is the way "zypper addlock cross\-*\-gcc\-icecream\-backend" does it\&. +.RE +.sp +.if n \{\ +.RS 4 +.\} +.nf +\-\-\-\-\-locks\-\-\-\-\- type: package -.br -solvable_name: cross-*-gcc-icecream-backend -.br +solvable_name: cross\-*\-gcc\-icecream\-backend match_type: glob -.br case_sensitive: on - -.TP -.B Versioned Lock -Do not install new GCC. This format is used when converting from the -openSUSE-10.3 lock format. -.br ------locks----- -.br +.fi +.if n \{\ +.RE +.\} +.PP +\fBVersioned Lock\fR +.RS 4 +Do not install new GCC\&. This format is used when converting from the openSUSE\-10\&.3 lock format\&. +.RE +.sp +.if n \{\ +.RS 4 +.\} +.nf +\-\-\-\-\-locks\-\-\-\-\- solvable_name: gcc -.br match_type: glob -.br -version: > 4.2 - -.TP -.B Anything named KDE -Locks everything which contains kde in the name. -.br ------locks----- -.br +version: > 4\&.2 +.fi +.if n \{\ +.RE +.\} +.PP +\fBAnything named KDE\fR +.RS 4 +Locks everything which contains kde in the name\&. +.RE +.sp +.if n \{\ +.RS 4 +.\} +.nf +\-\-\-\-\-locks\-\-\-\-\- solvable_name: kde - -.TP -.B Anything mentioning KDE -Locks everything which contains kde in the name, summary, or description. -.br ------locks----- -.br +.fi +.if n \{\ +.RE +.\} +.PP +\fBAnything mentioning KDE\fR +.RS 4 +Locks everything which contains kde in the name, summary, or description\&. +.RE +.sp +.if n \{\ +.RS 4 +.\} +.nf +\-\-\-\-\-locks\-\-\-\-\- query_string: kde -.br solvable_name: -.br solvable_summary: -.br solvable_description: - +.fi +.if n \{\ +.RE +.\} .SH "HOMEPAGE" - -This manual page only covers the most important attributes. The -complete list is available at -http://en.opensuse.org/Libzypp/Locksfile - +.sp +This manual page only covers the most important attributes\&. The complete list is available at http://en\&.opensuse\&.org/Libzypp/Locksfile .SH "AUTHORS" -.LP -Josef Reidinger <[email protected]> -.br -Manual page contributions by Martin Vidner <[email protected]>. - +.sp +Josef Reidinger <jreidinger@suse\&.cz> Manual page contributions by Martin Vidner <mvidner@suse\&.cz>\&. .SH "SEE ALSO" -.LP +.sp zypper(8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/doc/locks.5.txt new/libzypp-14.29.4/doc/locks.5.txt --- old/libzypp-14.29.4/doc/locks.5.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-14.29.4/doc/locks.5.txt 2014-10-02 16:21:09.000000000 +0200 @@ -0,0 +1,153 @@ +locks(5) +======== +:man manual: LIBZYPP +:man source: libzypp + + +NAME +---- +locks - libzypp locking file + + +DESCRIPTION +----------- +The file '/etc/zypp/locks' is read by libzypp at start-up if 'zypp.conf' allows it. The entries are used for initial locking of packages. Locking a package means not allowing to install or uninstall it. + +Valid entries are of the form: + +'attribute'*:* 'value':: + Where attributes and their values are described below. + +Locks are separated by an empty lines. + + +ATTRIBUTES +---------- +All attributes are lower-case. + +*repo*:: + specifies repository restriction. Only alias is accepted. + + By default all repositories match. + +*type*:: + resolvable type restriction. The values can be *package*, *patch*, *pattern*, *product* and *srcpackage*. + + By default all types match. + + +*case_sensitive*:: + if strings are matched case sensitive. The values are *true*, *false*, *on*, *off*. + + The default is case insensitive. + + +*install_status*:: + status of object. Possible states are *installed*, *not-installed* and *all*. If more install statuses are specified then the last one is used. The values are *installed* for all packages which are installed, *non-installed* for packages which can be installed or reinstalled and *all* for both. + + The default is *all*. + + +*match_type*:: + type of string matching in values. Does not affect *type* and *repo* which must be specified exactly. The values are *exact*, *substring*, *regex* for regular expressions, *glob* for matching as on the command line, and *word*. + + The default is *substring*. + +*query_string*:: + String to be matched in multiple attributes. Should be restricted by another attribute with empty value (it is recommended, because without restriction expect some performance problems). + +*version*:: + Restrict the lock only to some versions. It contains two parts: an optional operator and the version. + + The operator is *==*, *!=*, *<*, *>*, *<=*, *>=*. If operator is not specified then *==* is used. + + The version has the format ['epoch'*:*+]+'version'[*-*'release']. + + Example: *version: < 0:0.11.4-2* + +*solvable_name*:: + name of object (e.g. zypper) + +*solvable_summary*:: + summary of object + +*solvable_arch*:: + architecture of object (e.g. x86_64, i586) + +*solvable_description*:: + description of object + +*solvable_eula*:: + license text of objects which request accepting license by user + +*solvable_license*:: + license of package (only for package) (e.g. GPL2) + +*solvable_keywords*:: + keywords which specify package (only for package) + +*solvable_authors*:: + authors of package (only for package) + +*solvable_group*:: + package group (only for package) (e.g. Development/Tools/Version Control ) + +*update_reference_type*:: + reference for update (e.g. bugzilla,cve) (only for patches) + + +EXAMPLES +-------- +*Exact Package*:: + This is the way YaST UI does it. Lock k3b (e.g. you don't want to update it). +-------------------- +-----locks----- +type: package +solvable_name: k3b +match_type: exact +case_sensitive: on +-------------------- + +*Package Wildcard*:: + This is the way "zypper addlock cross-*-gcc-icecream-backend" does it. +-------------------- +-----locks----- +type: package +solvable_name: cross-*-gcc-icecream-backend +match_type: glob +case_sensitive: on +-------------------- + +*Versioned Lock*:: + Do not install new GCC. This format is used when converting from the openSUSE-10.3 lock format. +-------------------- +-----locks----- +solvable_name: gcc +match_type: glob +version: > 4.2 +-------------------- + +*Anything named KDE*:: + Locks everything which contains kde in the name. +-------------------- +-----locks----- +solvable_name: kde +-------------------- + +*Anything mentioning KDE*:: + Locks everything which contains kde in the name, summary, or description. +-------------------- +-----locks----- +query_string: kde +solvable_name: +solvable_summary: +solvable_description: +-------------------- + + +HOMEPAGE +-------- +This manual page only covers the most important attributes. The complete list is available at http://en.opensuse.org/Libzypp/Locksfile + + +AUTHORS +------- +Josef Reidinger <[email protected]> +Manual page contributions by Martin Vidner <[email protected]>. + + +SEE ALSO +-------- +zypper(8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/doc/solverstates.dot new/libzypp-14.29.4/doc/solverstates.dot --- old/libzypp-14.29.4/doc/solverstates.dot 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/doc/solverstates.dot 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -digraph solver_states { - - size="8,5"; - - graph [fontsize=14]; - edge [fontsize=12]; - node [fontsize=12]; - node [shape=doublecircle]; Installed Uninstalled; - node [shape=circle]; Satisfied Incomplete; - node [shape=box]; -// ranksep = 1.5; -// rankdir = LR; -// nodesep = 0.5; - edge [style="setlinewidth(1)"]; - - Installed [label="Installed"]; - Uninstalled [label="Uninstalled"]; - Satisfied [label="Satisfied"]; - Incomplete [label="Incomplete"]; - - Uninstalled -> To_be_installed [ label ="install,explicit"]; - Uninstalled -> To_be_installed [ label ="install,implicit"]; - Installed -> To_be_removed [ label ="remove,explicit"]; - Installed -> To_be_removed [ label ="remove,implicit"]; - To_be_installed -> Installed [ label ="commit"]; - To_be_removed -> Uninstalled [ label ="commit"]; - - Uninstalled -> Satisfied [ label="establish,good" ]; - Uninstalled -> Incomplete [ label="establish,bad" ]; - - Installed -> Incomplete [ label="establish,bad" ]; - - Incomplete -> To_be_installed [ label="resolve" ]; - Incomplete -> To_be_removed [ label="remove" ]; - - Satisfied -> Installed [ label="install" ]; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/doc/zypp-CheckAccessDeleted.1 new/libzypp-14.29.4/doc/zypp-CheckAccessDeleted.1 --- old/libzypp-14.29.4/doc/zypp-CheckAccessDeleted.1 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-14.29.4/doc/zypp-CheckAccessDeleted.1 2014-10-02 16:21:09.000000000 +0200 @@ -0,0 +1,49 @@ +'\" t +.\" Title: zypp-CheckAccessDeleted +.\" Author: [see the "AUTHORS" section] +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/02/2014 +.\" Manual: LIBZYPP +.\" Source: libzypp +.\" Language: English +.\" +.TH "ZYPP\-CHECKACCESSDEL" "1" "10/02/2014" "libzypp" "LIBZYPP" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +zypp-CheckAccessDeleted \- List processes which access deleted files +.SH "SYNOPSIS" +.sp +\fBzypp\-CheckAccessDeleted\fR [\fIOPTION\fR]\&... +.SH "DESCRIPTION" +.sp +List running processes which access deleted files\&. This may help to identify services and processes which need to be restarted after an update, e\&.g\&. if they still refer to meanwhile deleted libraries\&. The output is similar to \(oq\fBzypper ps\fR\(cq but does not sort out processes accessing normal files only\&. +.SH "OPTIONS" +.PP +\fB\-\-help\fR +.RS 4 +display help and exit +.RE +.SH "AUTHORS" +.sp +Michael Andres <ma@suse\&.de> +.SH "SEE ALSO" +.sp +zypper(8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/doc/zypp-CheckAccessDeleted.1.txt new/libzypp-14.29.4/doc/zypp-CheckAccessDeleted.1.txt --- old/libzypp-14.29.4/doc/zypp-CheckAccessDeleted.1.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-14.29.4/doc/zypp-CheckAccessDeleted.1.txt 2014-10-02 16:21:09.000000000 +0200 @@ -0,0 +1,35 @@ +zypp-CheckAccessDeleted(1) +========================== +:man manual: LIBZYPP +:man source: libzypp + + +NAME +---- +zypp-CheckAccessDeleted - List processes which access deleted files + + +SYNOPSIS +-------- +*zypp-CheckAccessDeleted* [_OPTION_]... + + +DESCRIPTION +----------- +List running processes which access deleted files. This may help to identify services and processes which need to be restarted after an update, e.g. if they still refer to meanwhile deleted libraries. The output is similar to `*zypper ps*' but does not sort out processes accessing normal files only. + + +OPTIONS +------- +*--help*:: + display help and exit + + +AUTHORS +------- +Michael Andres <[email protected]> + + +SEE ALSO +-------- +zypper(8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/doc/zypp-NameReqPrv.1 new/libzypp-14.29.4/doc/zypp-NameReqPrv.1 --- old/libzypp-14.29.4/doc/zypp-NameReqPrv.1 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-14.29.4/doc/zypp-NameReqPrv.1 2014-10-02 16:21:09.000000000 +0200 @@ -0,0 +1,135 @@ +'\" t +.\" Title: zypp-NameReqPrv +.\" Author: [see the "AUTHORS" section] +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/02/2014 +.\" Manual: LIBZYPP +.\" Source: libzypp +.\" Language: English +.\" +.TH "ZYPP\-NAMEREQPRV" "1" "10/02/2014" "libzypp" "LIBZYPP" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +zypp-NameReqPrv \- Investigate packages and dependencies in solver test\-cases +.SH "SYNOPSIS" +.sp +\fBzypp\-NameReqPrv\fR [\fB\-\-root\fR \fIDIR\fR] [[\fIOPTIONS\fR] \fINAME\fR\&...]\&... +.SH "DESCRIPTION" +.sp +Load all enabled repositories (without refresh) and search for occurrences of regular expression \fINAME\fR in package names or dependencies\&. In case \fIDIR\fR denotes a directory containing a solver test\-case, repositories and settings provided by the test\-case are loaded instead\&. +.sp +A solver test\-case is an abstract of repositories, packages, hardware and dependency resolution related settings which can be created by using zyppers \fB\-\-debug\-solver\fR option\&. Attached to a bug report the test\-case helps investigating the reported behavior\&. Options and output of this command are tailored to this use\-case and may change as needed\&. +.sp +Reported matches show the packages \fIinternal id\fR, \fIname\fR, \fIversion\fR and \fIarchitecture\fR, \fIpriority\fR and name of the providing \fIrepository\fR, \fIvendor\fR, \fIbuildtime\fR and the locations matching \fINAME\fR\&. +.sp +.if n \{\ +.RS 4 +.\} +.nf +2431 zypper\-1\&.9\&.16\-22\&.2\&.x86_64 (99)@System openSUSE 1400499579 + nam: zypper +40947 zypper\-1\&.9\&.3\-1\&.1\&.x86_64 (99)repo\-oss (13\&.1) openSUSE 1383049437 + nam: zypper +56140 zypper\-1\&.9\&.16\-22\&.2\&.x86_64 (99)repo\-oss\-update (13\&.1) openSUSE 1400499579 + nam: zypper +.fi +.if n \{\ +.RE +.\} +.SH "OPTIONS" +.PP +\fB\-\-root\fR \fIDIR\fR +.RS 4 +Load repos from the system located below +\fIDIR\fR\&. If +\fIDIR\fR +denotes a solver test\-case, the test\-case is loaded\&. +.RE +.PP +\fB\-\-installed\fR +.RS 4 +Process installed packages only\&. +.RE +.PP +\fB\-i\fR/\fB\-I\fR +.RS 4 +Turn on/off case insensitive search (default on) +.RE +.PP +\fB\-n\fR/\fB\-N\fR +.RS 4 +Turn on/off looking for names (default on) +.RE +.PP +\fB\-p\fR/\fB\-P\fR +.RS 4 +Turn on/off looking for provides (default off) +.RE +.PP +\fB\-r\fR/\fB\-R\fR +.RS 4 +Turn on/off looking for requires (default off) +.RE +.PP +\fB\-c\fR/\fB\-C\fR +.RS 4 +Turn on/off looking for conflicts (default off) +.RE +.PP +\fB\-o\fR/\fB\-O\fR +.RS 4 +Turn on/off looking for obsoletes (default off) +.RE +.PP +\fB\-m\fR/\fB\-M\fR +.RS 4 +Turn on/off looking for recommends (default off) +.RE +.PP +\fB\-s\fR/\fB\-S\fR +.RS 4 +Turn on/off looking for supplements (default off) +.RE +.PP +\fB\-a\fR +.RS 4 +Short for +\fB\-n \-p \-r\fR +.RE +.PP +\fB\-A\fR +.RS 4 +Short for +\fB\-n \-P \-R\fR +.RE +.PP +\fB\-D\fR \fIPKG\fR +.RS 4 +Dump dependencies of package +\fIPKG\fR +(exact name)\&. +.RE +.SH "AUTHORS" +.sp +Michael Andres <ma@suse\&.de> +.SH "SEE ALSO" +.sp +zypper(8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/doc/zypp-NameReqPrv.1.txt new/libzypp-14.29.4/doc/zypp-NameReqPrv.1.txt --- old/libzypp-14.29.4/doc/zypp-NameReqPrv.1.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-14.29.4/doc/zypp-NameReqPrv.1.txt 2014-10-02 16:21:09.000000000 +0200 @@ -0,0 +1,72 @@ +zypp-NameReqPrv(1) +================== +:man manual: LIBZYPP +:man source: libzypp + + +NAME +---- +zypp-NameReqPrv - Investigate packages and dependencies in solver test-cases + + +SYNOPSIS +-------- +*zypp-NameReqPrv* [*--root* 'DIR'] [['OPTIONS'] 'NAME'...]... + + +DESCRIPTION +----------- +Load all enabled repositories (without refresh) and search for occurrences of regular expression 'NAME' in package names or dependencies. In case 'DIR' denotes a directory containing a solver test-case, repositories and settings provided by the test-case are loaded instead. + +A solver test-case is an abstract of repositories, packages, hardware and dependency resolution related settings which can be created by using zyppers *--debug-solver* option. Attached to a bug report the test-case helps investigating the reported behavior. Options and output of this command are tailored to this use-case and may change as needed. + +Reported matches show the packages 'internal id', 'name', 'version' and 'architecture', 'priority' and name of the providing 'repository', 'vendor', 'buildtime' and the locations matching 'NAME'. + +-------------------- +2431 zypper-1.9.16-22.2.x86_64 (99)@System openSUSE 1400499579 + nam: zypper +40947 zypper-1.9.3-1.1.x86_64 (99)repo-oss (13.1) openSUSE 1383049437 + nam: zypper +56140 zypper-1.9.16-22.2.x86_64 (99)repo-oss-update (13.1) openSUSE 1400499579 + nam: zypper +-------------------- + + +OPTIONS +------- +*--root* 'DIR':: + Load repos from the system located below 'DIR'. If 'DIR' denotes a solver test-case, the test-case is loaded. +*--installed*:: + Process installed packages only. +*-i*/*-I*:: + Turn on/off case insensitive search (default on) +*-n*/*-N*:: + Turn on/off looking for names (default on) +*-p*/*-P*:: + Turn on/off looking for provides (default off) +*-r*/*-R*:: + Turn on/off looking for requires (default off) +*-c*/*-C*:: + Turn on/off looking for conflicts (default off) +*-o*/*-O*:: + Turn on/off looking for obsoletes (default off) +*-m*/*-M*:: + Turn on/off looking for recommends (default off) +*-s*/*-S*:: + Turn on/off looking for supplements (default off) +*-a*:: + Short for *-n -p -r* +*-A*:: + Short for *-n -P -R* +*-D* 'PKG':: + Dump dependencies of package 'PKG' (exact name). + + +AUTHORS +------- +Michael Andres <[email protected]> + + +SEE ALSO +-------- +zypper(8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/libzypp.pc.cmake new/libzypp-14.29.4/libzypp.pc.cmake --- old/libzypp-14.29.4/libzypp.pc.cmake 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/libzypp.pc.cmake 2014-09-26 13:49:10.000000000 +0200 @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@LIB_INSTALL_DIR@/zypp libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +includedir=@INCLUDE_INSTALL_DIR@ Name: @PACKAGE@ Version: @VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/libzypp.spec.cmake new/libzypp-14.29.4/libzypp.spec.cmake --- old/libzypp-14.29.4/libzypp.spec.cmake 2014-09-25 18:01:10.000000000 +0200 +++ new/libzypp-14.29.4/libzypp.spec.cmake 2014-10-02 17:17:09.000000000 +0200 @@ -365,7 +365,8 @@ %{_datadir}/zypp %{_bindir}/* %{_libdir}/libzypp*so.* -%doc %{_mandir}/man5/locks.5.* +%doc %{_mandir}/man1/*.1.* +%doc %{_mandir}/man5/*.5.* %files devel %defattr(-,root,root) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/package/libzypp.changes new/libzypp-14.29.4/package/libzypp.changes --- old/libzypp-14.29.4/package/libzypp.changes 2014-09-25 18:01:10.000000000 +0200 +++ new/libzypp-14.29.4/package/libzypp.changes 2014-10-13 09:39:35.000000000 +0200 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Fri Oct 10 16:01:31 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 (bnc#899603) + +------------------------------------------------------------------- +Thu Oct 9 01:13:15 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Oct 5 01:14:42 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Sep 28 01:13:30 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Thu Sep 25 17:59:06 CEST 2014 - [email protected] - Trigger appdata plugin when system repos have changed (bnc#866257) Files old/libzypp-14.29.4/po/zypp-po.tar.bz2 and new/libzypp-14.29.4/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/tests/CMakeLists.txt new/libzypp-14.29.4/tests/CMakeLists.txt --- old/libzypp-14.29.4/tests/CMakeLists.txt 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/tests/CMakeLists.txt 2014-09-29 14:17:09.000000000 +0200 @@ -13,5 +13,5 @@ ADD_SUBDIRECTORY( sat ) ADD_CUSTOM_TARGET( ctest - COMMAND ctest -a + COMMAND ctest -VV -a ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/tests/lib/CMakeLists.txt new/libzypp-14.29.4/tests/lib/CMakeLists.txt --- old/libzypp-14.29.4/tests/lib/CMakeLists.txt 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/tests/lib/CMakeLists.txt 2014-09-29 14:17:09.000000000 +0200 @@ -7,4 +7,4 @@ WebServer.cc ) -TARGET_LINK_LIBRARIES(zypp_test_utils mongoose zypp boost_thread-mt) +TARGET_LINK_LIBRARIES(zypp_test_utils mongoose zypp boost_thread) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/tests/zypp/Fetcher_test.cc new/libzypp-14.29.4/tests/zypp/Fetcher_test.cc --- old/libzypp-14.29.4/tests/zypp/Fetcher_test.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/tests/zypp/Fetcher_test.cc 2014-09-26 13:49:10.000000000 +0200 @@ -289,7 +289,7 @@ // it should throw because unsigned file throws BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), FileCheckException); fetcher.reset(); - // the target file was NOT transfered + // the target file was NOT transferred BOOST_CHECK( ! PathInfo(dest.path() + "/images/images.xml").isExist() ); fetcher.reset(); } @@ -359,7 +359,7 @@ BOOST_CHECK( ! PathInfo(dest.path() + "/complexdir-broken/subdir2/subdir2-file1.txt").isExist() ); - // this one got transfered before the failure, so it is there + // this one got transferred before the failure, so it is there BOOST_CHECK( PathInfo(dest.path() + "/complexdir-broken/subdir1/subdir1-file1.txt").isExist() ); BOOST_CHECK( ! PathInfo(dest.path() + "/complexdir-broken/subdir1/subdir1-file2.txt").isExist() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/tests/zypp/KeyRingTestReceiver.h new/libzypp-14.29.4/tests/zypp/KeyRingTestReceiver.h --- old/libzypp-14.29.4/tests/zypp/KeyRingTestReceiver.h 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/tests/zypp/KeyRingTestReceiver.h 2014-09-26 13:49:10.000000000 +0200 @@ -124,9 +124,9 @@ virtual void trustedKeyAdded( const zypp::PublicKey &key ) { - MIL << "TEST: trusted key added to zypp Keyring. Syncronizing keys with fake rpm keyring" << std::endl; + MIL << "TEST: trusted key added to zypp Keyring. Synchronizing keys with fake rpm keyring" << std::endl; _trusted_key_added_called = true; - //std::cout << "trusted key added to zypp Keyring. Syncronizing keys with rpm keyring" << std::endl; + //std::cout << "trusted key added to zypp Keyring. Synchronizing keys with rpm keyring" << std::endl; //_rpmdb.importZyppKeyRingTrustedKeys(); //_rpmdb.exportTrustedKeysInZyppKeyRing(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/tools/zypp-NameReqPrv.cc new/libzypp-14.29.4/tools/zypp-NameReqPrv.cc --- old/libzypp-14.29.4/tools/zypp-NameReqPrv.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/tools/zypp-NameReqPrv.cc 2014-10-02 16:21:09.000000000 +0200 @@ -28,8 +28,7 @@ } cerr << "Usage: " << appname << " [--root ROOTDIR] [OPTIONS] NAME... [[OPTIONS] NAME...]..." << endl; cerr << " Load all enabled repositories (no refresh) and search for" << endl; - cerr << " occurrences of NAME (regex) in package names, provides or" << endl; - cerr << " requires." << endl; + cerr << " occurrences of NAME (regex) in package names or dependencies" << endl; cerr << " --root Load repos from the system located below ROOTDIR. If ROOTDIR" << endl; cerr << " denotes a sover testcase, the testcase is loaded." << endl; cerr << " --installed Process installed packages only." << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/zypp/CMakeLists.txt new/libzypp-14.29.4/zypp/CMakeLists.txt --- old/libzypp-14.29.4/zypp/CMakeLists.txt 2014-07-25 12:58:04.000000000 +0200 +++ new/libzypp-14.29.4/zypp/CMakeLists.txt 2014-09-26 13:49:10.000000000 +0200 @@ -192,7 +192,7 @@ ZYpp.h ) -INSTALL( FILES ${zypp_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/zypp" ) +INSTALL( FILES ${zypp_HEADERS} DESTINATION "${INCLUDE_INSTALL_DIR}/zypp" ) SET( zypp_base_SRCS base/InterProcessMutex.cc @@ -271,7 +271,7 @@ INSTALL( FILES ${zypp_base_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/base + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/base ) SET( zypp_media_SRCS @@ -334,7 +334,7 @@ INSTALL( FILES ${zypp_media_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/media + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/media ) IF ( LIBPROXY_FOUND ) @@ -356,7 +356,7 @@ INSTALL( FILES ${zypp_media_proxyinfo_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/media/proxyinfo + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/media/proxyinfo ) SET( zypp_parser_SRCS @@ -384,7 +384,7 @@ INSTALL( FILES ${zypp_parser_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/parser ) SET( zypp_parser_susetags_SRCS @@ -399,7 +399,7 @@ INSTALL( FILES ${zypp_parser_susetags_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/susetags + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/parser/susetags ) SET( zypp_parser_xml_SRCS @@ -428,7 +428,7 @@ INSTALL( FILES ${zypp_parser_xml_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/xml + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/parser/xml ) SET( zypp_parser_yum_SRCS @@ -443,7 +443,7 @@ INSTALL( FILES ${zypp_parser_yum_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/yum + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/parser/yum ) SET( zypp_parser_ws_SRCS @@ -456,7 +456,7 @@ INSTALL( FILES ${zypp_parser_ws_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/ws + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/parser/ws ) @@ -474,7 +474,7 @@ INSTALL( FILES ${zypp_pool_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/pool + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/pool ) SET( zypp_solver_detail_SRCS @@ -514,7 +514,7 @@ INSTALL( FILES ${zypp_solver_detail_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/solver/detail + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/solver/detail ) SET( zypp_sat_SRCS @@ -552,7 +552,7 @@ INSTALL( FILES ${zypp_sat_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/sat + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/sat ) SET( zypp_sat_detail_SRCS @@ -566,7 +566,7 @@ INSTALL( FILES ${zypp_sat_detail_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/sat/detail + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/sat/detail ) @@ -600,7 +600,7 @@ INSTALL( FILES ${zypp_target_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/target ) IF(NOT UDEV_FOUND) @@ -626,7 +626,7 @@ INSTALL( FILES ${zypp_target_modalias_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/modalias + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/target/modalias ) SET( zypp_target_rpm_SRCS @@ -652,7 +652,7 @@ INSTALL( FILES ${zypp_target_rpm_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/rpm + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/target/rpm ) SET( zypp_thread_SRCS @@ -668,7 +668,7 @@ INSTALL( FILES ${zypp_thread_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/thread + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/thread ) SET( zypp_ui_SRCS @@ -689,7 +689,7 @@ INSTALL( FILES ${zypp_ui_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/ui + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/ui ) SET( zypp_url_SRCS @@ -705,7 +705,7 @@ INSTALL( FILES ${zypp_url_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/url + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/url ) SET( zypp_zypp_detail_SRCS @@ -719,7 +719,7 @@ INSTALL( FILES ${zypp_zypp_detail_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/zypp_detail + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/zypp_detail ) SET( zypp_repo_SRCS @@ -764,7 +764,7 @@ INSTALL( FILES ${zypp_repo_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/repo + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/repo ) SET( zypp_repo_yum_SRCS @@ -808,7 +808,7 @@ INSTALL( FILES ${zypp_misc_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/misc + DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/misc ) #################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/zypp/Fetcher.cc new/libzypp-14.29.4/zypp/Fetcher.cc --- old/libzypp-14.29.4/zypp/Fetcher.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/zypp/Fetcher.cc 2014-09-26 13:49:10.000000000 +0200 @@ -573,7 +573,7 @@ if ( resource.optional() ) { ZYPP_CAUGHT(excpt_r); - WAR << "optional resource " << resource << " could not be transfered" << endl; + WAR << "optional resource " << resource << " could not be transferred" << endl; return; } else @@ -798,7 +798,7 @@ provideToDest(media, (*it_res)->location, dest_dir, (*it_res)->deltafile); - // if the file was not transfered, and no exception, just + // if the file was not transferred, and no exception, just // return, as it was an optional file if ( ! PathInfo(dest_dir + (*it_res)->location.filename()).isExist() ) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/zypp/Fetcher.h new/libzypp-14.29.4/zypp/Fetcher.h --- old/libzypp-14.29.4/zypp/Fetcher.h 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/zypp/Fetcher.h 2014-09-26 13:49:10.000000000 +0200 @@ -158,7 +158,7 @@ * checksums ) that will be retrieved and read * before the job processing starts. * - * Nothing will be transfered or checked + * Nothing will be transferred or checked * until \ref start() is called. * * The index is relative to the media path, and @@ -181,7 +181,7 @@ /** * Enqueue a object for transferal, they will not - * be transfered until \ref start() is called + * be transferred until \ref start() is called * */ void enqueue( const OnMediaLocation &resource, @@ -189,7 +189,7 @@ /** * Enqueue a object for transferal, they will not - * be transfered until \ref start() is called + * be transferred until \ref start() is called * * \note As \ref OnMediaLocation contains the digest information, * a \ref ChecksumFileChecker is automatically added to the @@ -244,7 +244,7 @@ * in each subdirectory. * * \note Every file CHECKSUMS.* except of CHECKSUMS.(asc|key|(void)) will - * not be transfered and will be ignored. + * not be transferred and will be ignored. * */ void enqueueDir( const OnMediaLocation &resource, @@ -288,7 +288,7 @@ * in each subdirectory. * * \note Every file CHECKSUMS.* except of CHECKSUMS.(asc|key|(void)) will - * not be transfered and will be ignored. + * not be transferred and will be ignored. * */ void enqueueDigestedDir( const OnMediaLocation &resource, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/zypp/RepoManager.cc new/libzypp-14.29.4/zypp/RepoManager.cc --- old/libzypp-14.29.4/zypp/RepoManager.cc 2014-09-25 18:01:10.000000000 +0200 +++ new/libzypp-14.29.4/zypp/RepoManager.cc 2014-09-26 13:49:10.000000000 +0200 @@ -1677,7 +1677,7 @@ // TranslatorExplanation '%s' is a filename ZYPP_THROW(RepoException( todelete, str::form( _("Can't delete '%s'"), todelete.filepath().c_str() ))); } - MIL << todelete.alias() << " sucessfully deleted." << endl; + MIL << todelete.alias() << " successfully deleted." << endl; } else { @@ -1714,7 +1714,7 @@ cleanMetadata( todelete, mSubprogrcv ); cleanPackages( todelete, pSubprogrcv ); reposManip().erase(todelete); - MIL << todelete.alias() << " sucessfully deleted." << endl; + MIL << todelete.alias() << " successfully deleted." << endl; HistoryLog(_options.rootDir).removeRepository(todelete); return; } // else filepath is empty @@ -1866,7 +1866,7 @@ // TranslatorExplanation '%s' is a filename ZYPP_THROW(ServiceException( service, str::form( _("Can't delete '%s'"), location.c_str() ) )); } - MIL << alias << " sucessfully deleted." << endl; + MIL << alias << " successfully deleted." << endl; } else { @@ -1885,7 +1885,7 @@ it->dumpAsIniOn(file); } - MIL << alias << " sucessfully deleted from file " << location << endl; + MIL << alias << " successfully deleted from file " << location << endl; } // now remove all repositories added by this service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/zypp/target/rpm/RpmDb.cc new/libzypp-14.29.4/zypp/target/rpm/RpmDb.cc --- old/libzypp-14.29.4/zypp/target/rpm/RpmDb.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/zypp/target/rpm/RpmDb.cc 2014-09-26 13:49:10.000000000 +0200 @@ -426,7 +426,7 @@ } } - MIL << "Syncronizing keys with zypp keyring" << endl; + MIL << "Synchronizing keys with zypp keyring" << endl; syncTrustedKeys(); // Close the database in case any write acces (create/convert) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.4/zypp/ui/Selectable.h new/libzypp-14.29.4/zypp/ui/Selectable.h --- old/libzypp-14.29.4/zypp/ui/Selectable.h 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.29.4/zypp/ui/Selectable.h 2014-09-26 13:49:10.000000000 +0200 @@ -222,7 +222,7 @@ * If the specified candidate is not already installed (\ref identicalInstalled), * and the \a causer_r has sufficient permisssion, then \a newCandidate_r is set as the new * candidate (\ref setCandidate) and selected for installation. - * \returns \c True if \a newCandidate_r is already installed or sucessfully selected for installation. + * \returns \c True if \a newCandidate_r is already installed or successfully selected for installation. */ bool setOnSystem( const PoolItem & newCandidate_r, ResStatus::TransactByValue causer_r = ResStatus::USER ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
