On Mon, Mar 28, 2011 at 05:41:11PM +0400, Valery Inozemtsev wrote: > Update of /people/shrek/packages/cairo.git [...] > Changelog since `1.10.2-alt2' follows: > commit d9aede9c11c461b1bfce8a5642ee95119d3200f7 > Author: Valery Inozemtsev > Date: Mon Mar 28 17:40:19 2011 +0400 > > 1:1.10.2-alt4 > > - enabled Tee backend > > commit e569331c0a26f8a4d87fb4fb2e3cc4d34b0dc465 > Merge: 68d9d35 894d1f9 > Author: Valery Inozemtsev > Date: Mon Mar 28 17:39:53 2011 +0400 > > Merge commit '1.10.2-alt3' into cairo-1.10 > > Conflicts: > libcairo.spec > > commit 894d1f91a5c537996250f30aebbd9e1c23104bfe > Author: Alexey Tourbin > Date: Wed Mar 2 23:43:50 2011 +0300 > > 1:1.10.2-alt3 > > - rebuilt for pkgconfig > - cairo-png.pc: disabled dependency on libpng-devel > - cairo-drm.pc: disabled dependency on libudev-devel > - cairo-{pdf,ps,xml}.pc: disabled dependency on zlib-devel Валера, если ты решил откатить изменения, сделанные в 1.10.2-alt3, то об этом обязательно надо было написать в %changelog'е. -- ldv