Author: glen Date: Wed Mar 26 15:43:09 2008 GMT Module: SPECS Tag: AC-branch ---- Log message: - migrate old pld-souce.conf; rel 3
---- Files affected: SPECS: util-vserver.spec (1.138.2.33 -> 1.138.2.34) ---- Diffs: ================================================================ Index: SPECS/util-vserver.spec diff -u SPECS/util-vserver.spec:1.138.2.33 SPECS/util-vserver.spec:1.138.2.34 --- SPECS/util-vserver.spec:1.138.2.33 Wed Mar 26 07:14:32 2008 +++ SPECS/util-vserver.spec Wed Mar 26 16:43:04 2008 @@ -22,7 +22,7 @@ Summary(pl.UTF-8): Narzędzia dla linuksowych serwerów wirtualnych Name: util-vserver Version: 0.30.214 -Release: 2 +Release: 3 License: GPL Group: Applications/System Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2 @@ -180,6 +180,7 @@ Summary(pl.UTF-8): Narzędzia do budowania vserverów Group: Applications/System Requires: %{name} = %{version}-%{release} +Requires: vserver-distro-pld = %{version}-%{release} Conflicts: poldek < 0.18.8-10 %description build @@ -336,7 +337,7 @@ Group: Applications/System Requires: %{name}-build = %{version}-%{release} Requires: /etc/pld-release -Requires: poldek +Requires: poldek >= 0.21-0.20070703.00.16 %description -n vserver-distro-pld VServer build templates for PLD Linux. @@ -636,6 +637,17 @@ /sbin/chkconfig --del vservers-legacy fi +%triggerpostun -n vserver-distro-pld -- util-vserver-build < 0.30.214-2.3 +D=%{_sysconfdir}/vservers/.distributions/pld-ac/poldek + +if [ -f $D/pld-source.conf.rpmsave ]; then + cp -f $D/repos.d/pld.conf{,.rpmnew} + mv -f $D/pld-source.conf.rpmsave $D/repos.d/pld.conf + %{__sed} -i -e 's,_pld_arch,_arch,g;s,_ac_idxtype,_type,g;s,_pld_prefix,_prefix,g' \ + $D/repos.d/pld.conf +fi +exit 0 + %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS THANKS doc/intro.txt @@ -885,6 +897,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.138.2.34 2008-03-26 15:43:04 glen +- migrate old pld-souce.conf; rel 3 + Revision 1.138.2.33 2008-03-26 06:14:32 qboosh - cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/util-vserver.spec?r1=1.138.2.33&r2=1.138.2.34&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
