[yum-cvs] yum-utils yum-utils.spec,1.37,1.38

[Tim Lauridsen]

Update of /home/groups/yum/cvs/yum-utils
In directory login1.linux.duke.edu:/tmp/cvs-serv29906

Modified Files:
	yum-utils.spec 
Log Message:
bumped yum-utils version to 1.1.2

Index: yum-utils.spec
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/yum-utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- yum-utils.spec	19 Feb 2007 12:37:59 -0000	1.37
+++ yum-utils.spec	12 Apr 2007 13:33:12 -0000	1.38
@@ -1,6 +1,6 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.1
+Version: 1.1.2
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -141,6 +141,17 @@
 of (for example) zsh available, puplet will almost instantly update itself
 to reflect this.
 
+%package -n yum-merge-conf
+Summary: Yum plugin to merge configuration changes when installing packages
+Group: System Environment/Base
+Requires: yum >= 3.0
+
+%description -n yum-merge-conf
+This yum plugin adds the "--merge-conf" command line option. With this option,
+Yum will ask you what to do with config files which have changed on updating a
+package.
+
+
 %prep
 %setup -q
 
@@ -150,7 +161,7 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities refresh-updatesd"
+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf"
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -256,7 +267,16 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-updatesd.conf
 /usr/lib/yum-plugins/refresh-updatesd.*
 
+%files -n yum-merge-conf
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/merge-conf.conf
+/usr/lib/yum-plugins/merge-conf.*
+
 %changelog
+* Thu Apr 12 2007 Tim Lauridsen <tla at rasmil.dk>
+- mark as 1.1.2
+- Added merge-conf plugin written by Aurelien Bompard <abompard at fedoraproject.org>
+
 * Mon Feb 19 2007 Tim Lauridsen <tla at rasmil.dk>
 - mark it as 1.1.1