[devel] [SCM] packages/libvirt: heads/master

Пт Дек 25 12:33:19 UTC 2009

On Fri, Dec 25, 2009 at 08:20:27AM +0300, Aleksey Avdeev wrote:
> Update of /people/solo/packages/libvirt.git
> 
> Changes statistics since `0.7.4-alt1-58-g66fa73a' follows:
>  libvirt.spec    |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> Changelog since `0.7.4-alt1-58-g66fa73a' follows:
> commit 5f1e261bf58cfd8331bd1418fb01f0a3f6dd4043
> Merge: 66fa73a86b4506eee0e7d1b1c4c9634c955485c8 752580e94aca4c1fc9824edb337738223d969278
> Author: Aleksey Avdeev <solo на altlinux>
> Date:   Fri Dec 25 08:01:43 2009 +0300
> 
>     Merge tag '0.7.4-alt1.1'
>     
>     Conflicts:
>     	libvirt.spec

One more repository have been ruined. :(

$ git log --pretty=oneline 0.7.4-alt1.1..solo/master
5f1e261bf58cfd8331bd1418fb01f0a3f6dd4043 Merge tag '0.7.4-alt1.1'
66fa73a86b4506eee0e7d1b1c4c9634c955485c8 libvirt.spec: Remove Requires: libgnutls26
97508c7570f6ae05f31cdbe58b09aaad8c4f75e2 configure.in: Fix use AM_SILENT_RULES
5254f57d9ee63412d8cd054b9fb078c49f062fd1 Merge branch 'ALT/libvirt/sample/spec'
0bacdc7ed71cbbadf59a24f874d26f79d17d86d8 Merge branch 'ALT/release/distr/proglib' of git://git.altlinux.org/people/solo/public/specs into ALT/libvirt/sample/spec
99ecd378293da99437c73255d2276703bb8fbf49 renamed: sample.spec -> libvirt.spec (for merging)
4cc61f2d5e70519b6a0d307a7412624960bc2155 Remove %post{,un}_ldconfig using: ldconfig call in post is deprecated
c3d1902dc0b9b820283e1c1219fa8f026aec3c27 Merge branch 'ALT/release/distr/library' into ALT/release/distr/proglib
c94b906cda75e1eb091eeb9e9b8874c2bf37ab50 Merge branch 'ALT/release/distr/program' into ALT/release/distr/proglib
1b54c4f1365ab30287feb7a5e124ca84521f7e2e Fix %post{,un}_ldconfig using
3f2804b99da3a8f44f8d86e0236895d8aa1e6e80 Merge branch 'altlinux.org/SampleSpecs/library' into ALT/proglib
605eb77a83dcc0d37c50f1ced72cc79e97de2dd8 Remove %post{,un}_ldconfig using: ldconfig call in post is deprecated
8079dcb7eab8331a0fb80fd0d8efcc6574bb10d7 Merge branch 'ALT/filetrigger/rpm/empty' into ALT/release/distr/filetrigger/rpm/library
a707cf276caa0dc72a081c627d8c6d4ca1c6956d Add Requires: /usr/lib/rpm(ArgvFileAction), for rpm filetrigger use
69e4cf60f5273c717049a97276a6aa6086e54bdb Merge branch 'ALT/release/auto/program' into ALT/release/distr/program
e474b767d720c2ef4f93a9b82237a1442cacd6bb Merge branch 'ALT/release/auto/empty' into ALT/release/auto/program
e1e972358aa5d62e017865d04ed268ff3eb044da Update spec
737b2387e21ca291db9532a1812bcae8670c9ed4 Merge branch 'ALT/release/auto/empty' into ALT/release/auto/library
ac8bb6364cd7432255b61a64d147c1691635ea7f Release: %branch_release <realese>
e404004558242f9a9925896d186e5571bb0b9c12 Spec clean
a11473408bafcc296820c49cb308979a1cb4f1c4 cleanup_spec sample.spec
9ffb100cc21471ad036cace518d509fbb2a41a41 Merge branch 'ALT/release/distr/empty' into ALT/release/distr/program
9a8575f60fa4bf074200158fa57be7e34a1a1d56 Release: %branch_release <realese>
9a37b039023693d6acabf95989759128b9b15ec9 Spec clean
ff58fef6d28be84c58d03e2407307c5c7fa3973f Merge branch 'ALT/reliase/distr/empty' into ALT/reliase/distr/program
76e354b12f8d2e1dadc440ecdbd28522dabf5000 Add M50 distr
c4140b9148585120a75131e8eefc256695ca9ec6 Merge branch 'ALT/reliase/distr/empty' into ALT/reliase/distr/program
2c7fc545b1d40473284ac6116e636e88ff6e7d38 Merge branch 'ALT/reliase/auto/empty' into ALT/reliase/auto/program
15bdf2bf1b44369190136a20a65d25eb897f3cf3 Add switch for distr selected
feb342300dd3cce1f904b82cd2b9bff1202f7dcb http://www.altlinux.org/index.php?title=SampleSpecs/library&oldid=5166
8283e7672be29f64265f9a9b5313cc064523fd85 http://www.altlinux.org/index.php?title=SampleSpecs/program&oldid=5164
e0d394c7777edab2eb695aa011b43a751e1704a6 Merge branch 'ALT/reliase/auto/empty' into altlinux.org/SampleSpecs/library
fb6f7082521d083165fe85398d2e314bd5210bbd Set Release: %release_pre%release_base_num[.%release_base_num2][%release_suff]
7e2040dfaa902e8c957c9b2fbd65c2a5902d3921 http://www.altlinux.org/index.php?title=SampleSpecs/empty&oldid=3464
b05939db33fe55d6fe915bbf4356644b37d35591 http://www.altlinux.org/index.php?title=SampleSpecs/empty&oldid=3455
ba7403eb71d6ee0bd080e2028025ed15aeb8b2d2 http://www.altlinux.org/index.php?title=SampleSpecs/empty&oldid=3443
fb7b292e129007de4989a1d3e2729420bfedb010 http://www.altlinux.org/index.php?title=SampleSpecs/empty&oldid=500
8f628573ae95f5ae3062f66e6bc5d5b703747441 http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/library/show?time=2008-02-23+09:49:03
8e5fc9015a4497be9f56f57f587f8877b02de71e http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/program/show?time=2008-02-23+09:48:20
4977a0c712418a350686ed2fb2105173731a27e8 http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/program/show?time=2008-02-23+09:46:54
95cf83e76229e92c4ad494602c1560542b6672ed http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/library/show?time=2007-03-13+15:17:32
58c93fb4b79fb8c9e22735a2ca1bb5f750321667 http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/library/show?time=2007-03-13+15:13:30
c7cc5adff4bc193712258893c07dc7ff9b91584d http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/library/show?time=2007-03-13+14:27:18
f67e86c44ca7c1fb39da483d5d4c43e24e8a0fd6 http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/program/show?time=2007-03-14:26:30
c48ab8d476559c54f2f32042028eeae97dd705d3 http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/empty/show?time=2007-03-13+14:25:04
c49dff96a1a30dab7efb3a92ccf3d0e624492cc2 http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/empty/show?time=2005-10-12+10:48:27
ffd2e15259234a7840afdfc1a4b7c0b459ae3c37 http://wiki.sisyphus.ru/devel/SampleSpecs/program/show?time=2005-09-26+11:16:01
3ce613fa0a5ef95e64d71715220a260d4bbec4da http://wiki.sisyphus.ru/devel/SampleSpecs/program/show?time=2005-09-25+22:38:46
1197609f9d2a3ab8fd18c487db7da18b64ba7093 http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/empty/show?time=2005-09-25+13:24:04
d7d7d39e871684ced52e61aabb133c3d53985ae6 http://wiki.sisyphus.ru/devel/SampleSpecs/program/show?time=2005-09-25+12:55:59
41ae892412fe3d636a8ca4a0e276132a402b9db0 http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/empty/show?time=2005-09-25+12:53:25
f006f388a7c1f8044f5a385e757e70aadb2c69f4 http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/empty/show?time=2005-09-25+12:52:26
0b2c5a0c4b12c1f05a385566dbca1c06707ebb61 http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/empty/show?time=2005-09-25+12:49:55
d1a5900fb3787a6105268901e7edb78d7fac77af http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/empty/show?time=2005-09-25+12:23:26
0d53305a81b93ad35f8f91639551adb9d4a42e37 http://wiki.sisyphus.ru/devel/SampleSpecs/program/show?time=2005-09-25+11:11:33
8e193577212a43309d3272428627312d21339f0a http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/library/show?time=2005-09-25+11:11:23
971d90343aeb8ddcfbb5f3e9579d5cf9c3977c05 http://freesource.info/wiki/AltLinux/Sisyphus/devel/SampleSpecs/empty/show?time=2005-09-24+21:29:36
631a99122c49f257f92f23ea387fb5cf00520f4c http://wiki.sisyphus.ru/devel/SampleSpecs/program/show?time=2005-09-24+21:16:46
35f5e943d8f5a14581eca0961462236b35edc3b5 http://wiki.sisyphus.ru/devel/SampleSpecs/program/show?time=2005-09-24+16:38:19

$ git diff 0.7.4-alt1.1..solo/master -- libvirt.spec

diff --git a/libvirt.spec b/libvirt.spec
index e179479..252e72b 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -5,22 +5,23 @@
 
 Name: libvirt
 Version: 0.7.4
-Release: alt1.1
+Release: %branch_release alt1.1
 Summary: Library providing a simple API virtualization
 License: LGPL
 Group: System/Libraries
 Url: http://libvirt.org/
 Packager: Anton Protopopov <aspsk на altlinux.ru>
 Source: %name-%version.tar.gz
+Requires: /usr/lib/rpm(ArgvFileAction)
 Requires: dnsmasq
 Requires: bridge-utils
 Requires: iptables
-Requires: libgnutls26
 %if_with polkit
 Requires: PolicyKit >= 0.6
 %endif
 Requires(post): %post_service
 Requires(preun): %preun_service
+BuildRequires(pre): rpm-macros-branch
 BuildRequires: bridge-utils cvs dnsmasq libavahi-devel libgnutls-devel libreadline-devel libsasl2-devel libxml2-devel python-devel xsltproc parted libparted-devel libcurl-devel libdevmapper-devel
 %if_with polkit
 BuildRequires: PolicyKit-devel >= 0.6


-- 
ldv
----------- следующая часть -----------
Было удалено вложение не в текстовом формате...
Имя     : отсутствует
Тип     : application/pgp-signature
Размер  : 198 байтов
Описание: отсутствует
Url     : <http://lists.altlinux.org/pipermail/devel/attachments/20091225/46b8019f/attachment.bin>
