rpms/rhn-client-tools/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rhn-client-tools.spec, 1.1, 1.2 sources, 1.2, 1.3

[Miroslav Suchý]

Author: msuchy

Update of /cvs/pkgs/rpms/rhn-client-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5337/devel

Modified Files:
	.cvsignore import.log rhn-client-tools.spec sources 
Log Message:
Import of new version of rhn-client-tools-0.7.4-1 to devel branch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Sep 2009 14:48:09 -0000	1.2
+++ .cvsignore	5 Oct 2009 07:36:27 -0000	1.3
@@ -1 +1 @@
-rhn-client-tools-0.7.3.tar.gz
+rhn-client-tools-0.7.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Sep 2009 14:48:09 -0000	1.1
+++ import.log	5 Oct 2009 07:36:27 -0000	1.2
@@ -1 +1,2 @@
 rhn-client-tools-0_7_3-1:HEAD:rhn-client-tools-0.7.3-1.src.rpm:1253630821
+rhn-client-tools-0_7_4-1:HEAD:rhn-client-tools-0.7.4-1.src.rpm:1254727705


Index: rhn-client-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/devel/rhn-client-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rhn-client-tools.spec	22 Sep 2009 14:48:09 -0000	1.1
+++ rhn-client-tools.spec	5 Oct 2009 07:36:27 -0000	1.2
@@ -4,7 +4,7 @@ Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
 URL:     https://fedorahosted.org/spacewalk
 Name: rhn-client-tools
-Version: 0.7.3
+Version: 0.7.4
 Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -19,7 +19,7 @@ Requires: dbus-python
 Requires: hal
 Requires: newt
 
-Conflicts: up2date
+Conflicts: up2date < 5.0.0
 
 BuildRequires: python-devel
 BuildRequires: gettext
@@ -215,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/rhn_register.desktop
 
 %changelog
+* Mon Oct  5 2009 Miroslav Suchý <msuchy at redhat.com> 0.7.4-1
+- add versioned conflict to up2date
+
 * Tue Sep 22 2009 Miroslav Suchý <msuchy at redhat.com> 0.7.3-1
 - comment out hosted url, so spacewalk users do not ping theirs machines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Sep 2009 14:48:09 -0000	1.2
+++ sources	5 Oct 2009 07:36:27 -0000	1.3
@@ -1 +1 @@
-1568ecee102c4387c61a6b9f141f0396  rhn-client-tools-0.7.3.tar.gz
+7e4f869be175bb7ee4b82761c43ac723  rhn-client-tools-0.7.4.tar.gz