Author: mlandres Date: Fri Sep 7 15:26:40 2007 New Revision: 7150 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7150&view=rev Log: - Install a sample /etc/zypp.conf. (#306615) - Fixed missing soversion symlink in package. Added: trunk/libzypp/zypp.conf Modified: trunk/libzypp/CMakeLists.txt trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/Parse.cc trunk/libzypp/libzypp.spec.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/CMakeLists.txt Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=7150&r1=7149&r2=7150&view=diff ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Fri Sep 7 15:26:40 2007 @@ -32,7 +32,7 @@ ADD_DEFINITIONS( -D_FILE_OFFSET_BITS=64 ) ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" ) SET( LIBZYPP_VERSION_INFO "${LIBZYPP_SO_FIRST}.${LIBZYPP_AGE}.${LIBZYPP_PATCH}" ) - +SET( LIBZYPP_SOVERSION_INFO "${LIBZYPP_SO_FIRST}" ) SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Novell's package management core engine.") SET(CPACK_PACKAGE_VENDOR "Novell Inc.") @@ -206,6 +206,9 @@ MESSAGE(STATUS "FindZypp.cmake will be installed in ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules") INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ) +MESSAGE(STATUS "zypp.conf will be installed in /etc/zypp") +INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp.conf DESTINATION /etc/zypp ) + #################################################################### # SUBDIRECTORIES # #################################################################### Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7150&r1=7149&r2=7150&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Sep 7 15:26:40 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "22") SET(LIBZYPP_COMPATMINOR "21") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_PATCH "5") Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?rev=7150&r1=7149&r2=7150&view=diff ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Fri Sep 7 15:26:40 2007 @@ -351,23 +351,6 @@ INT << "===[START]==========================================" << endl; setenv( "ZYPP_CONF", "/Local/ROOT/zypp.conf", 1 ); - Vtst( "", "" ); - Vtst( "", "a" ); - Vtst( "", "suse lkgjhdl" ); - Vtst( "", "opensuse" ); - Vtst( "a", "" ); - Vtst( "a", "a" ); - Vtst( "a", "suse lkgjhdl" ); - Vtst( "a", "opensuse" ); - Vtst( "suse", "" ); - Vtst( "suse", "a" ); - Vtst( "suse", "suse lkgjhdl" ); - Vtst( "suse", "opensuse" ); - Vtst( "opensuse fdhgdd", "" ); - Vtst( "opensuse fdhgdd", "a" ); - Vtst( "opensuse fdhgdd", "suse lkgjhdl" ); - Vtst( "opensuse fdhgdd", "opensuse" ); - throw; DigestReceive foo; KeyRingSignalsReceive baa; Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=7150&r1=7149&r2=7150&view=diff ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Fri Sep 7 15:26:40 2007 @@ -90,9 +90,10 @@ cd build make install DESTDIR=$RPM_BUILD_ROOT make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/etc/zypp/repos.d %suse_update_desktop_file -G "" -C "" package-manager make -C po install DESTDIR=$RPM_BUILD_ROOT -# Create filelist with translatins +# Create filelist with translations cd .. %{find_lang} zypp @@ -108,13 +109,16 @@ %files -f zypp.lang %defattr(-,root,root) +%dir /etc/zypp +%dir /etc/zypp/repos.d +%config(noreplace) /etc/zypp/zypp.conf %{prefix}/lib/zypp %{prefix}/share/zypp -%{_libdir}/libzypp*so.* %{prefix}/share/applications/package-manager.desktop %{prefix}/share/pixmaps/package-manager-icon.png %{prefix}/bin/package-manager %{prefix}/bin/package-manager-su +%{_libdir}/libzypp*so.* %files devel %defattr(-,root,root) Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=7150&r1=7149&r2=7150&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Sep 7 15:26:40 2007 @@ -1,9 +1,16 @@ ------------------------------------------------------------------- +Fri Sep 7 13:27:26 CEST 2007 - ma@suse.de + +- Install a sample /etc/zypp.conf. (#306615) +- Fixed missing soversion symlink in package. +- version 3.22.5 + +------------------------------------------------------------------- Fri Sep 7 13:03:48 CEST 2007 - schubi@suse.de - RequirementIsMet: return true only if ALL Atoms are NOT incomplete; Bug 308252 -- r 7143 +- r 7143 ------------------------------------------------------------------- Thu Sep 6 18:22:36 CEST 2007 - schubi@suse.de Added: trunk/libzypp/zypp.conf URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp.conf?rev=7150&view=auto ============================================================================== --- trunk/libzypp/zypp.conf (added) +++ trunk/libzypp/zypp.conf Fri Sep 7 15:26:40 2007 @@ -0,0 +1,129 @@ +## Configuration file for software management +## /etc/zypp/zypp.conf +## +## Boolean values are 0 1 yes no on off true false + + +[main] + + +## +## Override the detected architecture +## +## Valid values: i586, i686, x86_64, ppc, ppc64, ia64, s390, s390x, .. +## Default value: Autodetected +## +## ** CAUTION: Only set if you know what you're doing ! +## ** Changing this needs a full refresh (incl. download) +## ** of all repository data. +## +# arch = s390 + + +## +## Path where the repo metadata is downloaded and kept. +## +## Valid values: A directory +## Default value: /var/cache/zypp/raw +## +## Changing this needs a full refresh (incl. download) of all repository data +## +# metadatadir = /var/cache/zypp/raw + + +## +## Path where the known repositories .repo files are kept +## +## Valid values: A directory +## Default value: /etc/zypp/repos.d +## +## Changing this invalidates all known repositories +## +# reposdir = /etc/zypp/repos.d + + +## +## Path where the processed cache is kept (this is where zypp.db is located) +## +## Valid values: A directory +## Default value: /var/cache/zypp +## +## Changing this needs a full refresh (except download) of all repository data +## +# cachedir = /var/cache/zypp + + +## +## Whether repository urls should be probed when added +## +## Valid values: boolean +## Default value: false +## +## If true, accessability of repositories is checked immediately (when added) +## (e.g. 'zypper ar' will check immediately) +## If false, accessability of repositories is checked when refreshed +## (e.g. 'zypper ar' will delay the check until the next refresh) +## +# repo.add.probe = false + + +## +## Amount of time in minutes that must pass before another refresh. +## +## Valid values: Integer +## Default value: 10 +## +## If you have autorefresh enabled for a repository, it is checked for +## up-to-date metadata not more often than every +## minutes. If an automatic request for refresh comes before +## minutes passed since the last check, the request is ignored. +## +## A value of 0 means the repository will always be checked. To get the oposite +## effect, disable autorefresh for your repositories. +## +## This option has no effect for repositories with autorefresh disabled, nor for +## user-requested refresh. +## +# repo.refresh.delay = 10 + + +## +## Whether to consider using a .patch.rpm when downloading a package +## +## Valid values: boolean +## Default value: true +## +## Using a patch rpm will decrease the download size for package updates +## since it does not contain all files of the package but only the changed +## ones. The .patch.rpm is ready to be installed immediately after download. +## There is no further processing needed, as it is for a .delta.rpm. +## +# download.use_patchrpm = true + + +## +## Whether to consider using a .delta.rpm when downloading a package +## +## Valid values: boolean +## Default value: true +## +## Using a delta rpm will decrease the download size for package updates +## since it does not contain all files of the package but only the binary +## diff of changed ones. Recreating the rpm package on the local machine +## is an expensive operation (memory,CPU). If your network connection is +## not too slow, you benefit from disabling .delta.rpm. +## +# download.use_deltarpm = true + + +[locking] + + +## DEPRECATED +## Mimic old-fashioned behavior of locking all foreign vendor packages. +## +## Valid values: boolean +## Default value: false +## +# autolock_untrustedvendor = false + Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=7150&r1=7149&r2=7150&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Fri Sep 7 15:26:40 2007 @@ -1143,6 +1143,7 @@ ADD_LIBRARY(zypp SHARED ${zypp_lib_SRCS}) SET_TARGET_PROPERTIES( zypp PROPERTIES VERSION "${LIBZYPP_VERSION_INFO}" ) +SET_TARGET_PROPERTIES( zypp PROPERTIES SOVERSION "${LIBZYPP_SOVERSION_INFO}" ) ADD_DEPENDENCIES(zypp schema_header) # System libraries TARGET_LINK_LIBRARIES(zypp boost_filesystem util ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org