Author: mlandres Date: Thu Oct 2 18:52:03 2008 New Revision: 11234 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11234&view=rev Log: - Add product attribute: PRODUCTLINE. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/libzypp.spec.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/Product.cc trunk/libzypp/zypp/sat/SolvAttr.cc trunk/libzypp/zypp/sat/SolvAttr.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11234&r1=11233&r2=11234&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Oct 2 18:52:03 2008 @@ -63,6 +63,6 @@ SET(LIBZYPP_MINOR "14") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 5.13.1 (13) +# LAST RELEASED: 5.14.0 (13) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=11234&r1=11233&r2=11234&view=diff ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Thu Oct 2 18:52:03 2008 @@ -24,7 +24,7 @@ Provides: yast2-packagemanager Obsoletes: yast2-packagemanager BuildRequires: cmake -BuildRequires: libsatsolver-devel >= 0.10.13 openssl-devel +BuildRequires: libsatsolver-devel >= 0.11.0 openssl-devel BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel %if 0%{?suse_version} Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11234&r1=11233&r2=11234&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Oct 2 18:52:03 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 2 18:50:11 CEST 2008 - ma@suse.de + +- Add product attribute: PRODUCTLINE. +- revision 11234 +- version 5.14.0 (13) + +------------------------------------------------------------------- Thu Oct 2 17:18:19 CEST 2008 - ma@suse.de - Do not consider self provided requirements whan computing the Modified: trunk/libzypp/zypp/Product.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Product.cc?rev=11234&r1=11233&r2=11234&view=diff ============================================================================== --- trunk/libzypp/zypp/Product.cc (original) +++ trunk/libzypp/zypp/Product.cc Thu Oct 2 18:52:03 2008 @@ -118,10 +118,7 @@ } std::string Product::productLine() const - { -#warning productLine needs to be implemented. - return std::string(); - } + { return lookupStrAttribute( sat::SolvAttr::productProductLine ); } /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/sat/SolvAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.cc?rev=11234&r1=11233&r2=11234&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.cc (original) +++ trunk/libzypp/zypp/sat/SolvAttr.cc Thu Oct 2 18:52:03 2008 @@ -98,6 +98,7 @@ const SolvAttr SolvAttr::extends ( SOLVABLE_EXTENDS ); // product + const SolvAttr SolvAttr::productProductLine ( PRODUCT_PRODUCTLINE ); const SolvAttr SolvAttr::productShortlabel ( PRODUCT_SHORTLABEL ); const SolvAttr SolvAttr::productDistproduct ( PRODUCT_DISTPRODUCT ); const SolvAttr SolvAttr::productDistversion ( PRODUCT_DISTVERSION ); Modified: trunk/libzypp/zypp/sat/SolvAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.h?rev=11234&r1=11233&r2=11234&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.h (original) +++ trunk/libzypp/zypp/sat/SolvAttr.h Thu Oct 2 18:52:03 2008 @@ -123,6 +123,7 @@ /** \name product */ //@{ + static const SolvAttr productProductLine; static const SolvAttr productShortlabel; static const SolvAttr productDistproduct; static const SolvAttr productDistversion; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org