Author: mlandres Date: Wed Jul 30 19:15:36 2008 New Revision: 10702 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10702&view=rev Log: - /var/lib/zypp and /var/cache/zypp should be owned by libzypp (bnc #412094) Added: trunk/libzypp/mkChangelog (with props) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/MaTest.cc trunk/libzypp/libzypp.spec.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10702&r1=10701&r2=10702&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Wed Jul 30 19:15:36 2008 @@ -42,9 +42,27 @@ # # 6) If any interfaces have been removed since the last public release, then # set COMPATMINOR to MINOR. (binary incompatible change) -# +# ================================================== +#======= +# - Update version according to your changes, +# but based on 'LAST RELEASED:' below. I.e +# there's no need to increase LIBZYPP_MINOR +# if it already differs from 'LAST RELEASED:'. +# +# - MOST IMPORTANT: +# Before you submitt to autobuild, rmember the +# new version in 'LAST RELEASED:', and add a +# note in the changes file. +# +# - Consider calling ./mkChangelog to edit the +# changes file. See './mkChangelog -h' for help. +# SET(LIBZYPP_MAJOR "5") -SET(LIBZYPP_MINOR "4") SET(LIBZYPP_COMPATMINOR "4") +SET(LIBZYPP_MINOR "4") SET(LIBZYPP_PATCH "0") +# +# LAST RELEASED: 5.3.0 (2) +# (The number in parenthesis is LIBZYPP_COMPATMINOR) +#======= Modified: trunk/libzypp/devel/devel.ma/MaTest.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/MaTest.cc?rev=10702&r1=10701&r2=10702&view=diff ============================================================================== --- trunk/libzypp/devel/devel.ma/MaTest.cc (original) +++ trunk/libzypp/devel/devel.ma/MaTest.cc Wed Jul 30 19:15:36 2008 @@ -73,7 +73,7 @@ X() {_s=++s;} X( const X & ) {_s=++s;} X& operator=( const X & ) { return *this; } - ~X() {_s=-_s;} + virtual ~X() {_s=-_s;} static int s; int _s; @@ -102,7 +102,7 @@ { X x; - m.siga().connect( boost::bind( &X::pong, &x, _1 ) ); + m.siga().connect( boost::bind( &X::pong, boost::ref(x), _1 ) ); m.ping(); X y; Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=10702&r1=10701&r2=10702&view=diff ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Wed Jul 30 19:15:36 2008 @@ -204,6 +204,8 @@ %dir /etc/zypp/products.d %config(noreplace) /etc/zypp/zypp.conf %config(noreplace) /etc/zypp/systemCheck +%dir /var/lib/zypp +%dir /var/cache/zypp %{prefix}/lib/zypp %{prefix}/share/zypp %{prefix}/share/applications/package-manager.desktop Added: trunk/libzypp/mkChangelog URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/mkChangelog?rev=10702&view=auto ============================================================================== --- trunk/libzypp/mkChangelog (added) +++ trunk/libzypp/mkChangelog Wed Jul 30 19:15:36 2008 @@ -0,0 +1,165 @@ +#! /bin/bash +# + +function errexit() { + exec >&2 + echo "Error: $@" + exit 1 +} + +export LC_ALL="" +EDITOR=${EDITOR:-vi} + +TDIR=$(dirname $0) +test -n "$TDIR" && cd $TDIR + +CHANGESFILE="package/libzypp.changes" +test -f "$CHANGESFILE" || errexit "No changes file '$CHANGESFILE'" + +VERSIONFILE="VERSION.cmake" +test -f "$VERSIONFILE" || errexit "No version file '$VERSIONFILE'" + + +function usage() { + exec >&2 +cat <&1- +exec >$TMPFILE +echo "-------------------------------------------------------------------" +echo "$(date) $EMAIL" +echo "" +echo "- " +echo "- revision $(nextrevision)" +echo "$(getversion)" +echo "" +cat $CHANGESFILE +exec >&3 + +RES=e +while [ "$RES" == "e" ]; do + $EDITOR $TMPFILE + echo + NEWREL=$(grep '#---delete-or-release---#' $TMPFILE) + test -n "$NEWREL" && echo "$NEWREL" + read -n 1 -p "(a)bort, (c)ontinue, (e)dit : " RES + echo + case "$RES" in + [eE]*) + RES=e + ;; + [cC]) + test -n "$NEWREL" && { + echo "Remember new release in $VERSIONFILE" + sed -i 's/^.*#---delete-or-release---#.*RELEASE:/- version/' $TMPFILE + NEWREL=$(sed 's/^.*#---delete-or-release---#.*RELEASE:/# LAST RELEASED:/' <<<"$NEWREL") + sed -i "s/^# LAST RELEASED:.*$/$NEWREL/" $VERSIONFILE + } + + echo "Store new $CHANGESFILE" + cp $TMPFILE $CHANGESFILE + + cat $CHANGESFILE \ + | awk '{print}/----------/{n=n+1; if ( n == 2 ) exit 0; }' + ;; + *) + echo "Leave $CHANGESFILE untouched" + ;; + esac +done + +rm -f $TMPFILE Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=10702&r1=10701&r2=10702&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Wed Jul 30 19:15:36 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 30 19:12:00 CEST 2008 ma@suse.de + +- /var/lib/zypp and /var/cache/zypp should be owned by libzypp + (bnc #412094) +- revision 10702 + +------------------------------------------------------------------- Wed Jul 30 12:47:48 CEST 2008 - jkupec@suse.cz - Service renamed to ServiceInfo -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org