rpms/initscripts/devel .cvsignore, 1.178, 1.179 initscripts.spec, 1.210, 1.211 sources, 1.197, 1.198

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26113/devel

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
9.13-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- .cvsignore	3 May 2010 19:06:56 -0000	1.178
+++ .cvsignore	5 May 2010 16:24:27 -0000	1.179
@@ -1 +1 @@
-initscripts-9.11.tar.bz2
+initscripts-9.12.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- initscripts.spec	3 May 2010 19:06:57 -0000	1.210
+++ initscripts.spec	5 May 2010 16:24:28 -0000	1.211
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.11
+Version: 9.12
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -40,7 +40,7 @@ Conflicts: dmraid < 1.0.0.rc16-7
 Conflicts: e2fsprogs < 1.15
 # http://bugzilla.redhat.com/show_bug.cgi?id=252973
 Conflicts: nut < 2.2.0
-Conflicts: NetworkManager < 1:0.8.0
+Conflicts: NetworkManager < 1:0.8.0-12.git20100504
 Obsoletes: hotplug <= 3:2004_09_23-10.1
 Requires(pre): /usr/sbin/groupadd
 Requires(post): /sbin/chkconfig, coreutils
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Wed May  5 2010 Bill Nottingham <notting at redhat.com> - 9.12-1
+- update for final nmcli syntax
+
 * Mon May  3 2010 Bill Nottingham <notting at redhat.com> - 9.11-1
 - init/plymouth-shutdown.conf: add 'task' here as well
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- sources	3 May 2010 19:06:57 -0000	1.197
+++ sources	5 May 2010 16:24:28 -0000	1.198
@@ -1 +1 @@
-b576406455fa87bf5d329bd161df4b09  initscripts-9.11.tar.bz2
+c73218ac6ae1e5ea3a24bd10669e8a61  initscripts-9.12.tar.bz2