rpms/straw/F-7 straw.spec,1.10,1.11

[Alex Lancaster (alexlan)]

Author: alexlan

Update of /cvs/pkgs/rpms/straw/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8269/F-7

Modified Files:
	straw.spec 
Log Message:
* Wed Nov 21 2007 Alex Lancaster <alexlan at fedoraproject.org> - 0.27-12
- Resolve Conflict with python-adns



Index: straw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/straw/F-7/straw.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- straw.spec	9 Oct 2007 17:30:54 -0000	1.10
+++ straw.spec	21 Nov 2007 08:00:36 -0000	1.11
@@ -5,7 +5,7 @@
 Summary:        Desktop news aggregator
 Name:           straw
 Version:        0.27
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://www.gnome.org/projects/straw/
@@ -23,8 +23,7 @@
 Requires: gnome-python2-gconf
 Requires: pygtk2-libglade
 Requires: mx
-# Current python-adns makes double free problem (bug 292821)
-Conflicts:python-adns
+Requires: python-adns >= 1.2.1
 Requires: dbus-python
 
 Requires(pre): GConf2
@@ -103,24 +102,36 @@
 
 
 %changelog
+* Wed Nov 21 2007 Alex Lancaster <alexlan at fedoraproject.org> - 0.27-12
+- Resolve Conflict with python-adns
+
 * Tue Oct 09 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-11
 - Bumped up the release to prevent tag conflict in cvs
+
 * Sun Sep 23 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-9
 - Fixed dependecies related to pygtk
+
 * Fri Sep 21 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-8
 - Fixed dependencies related to gnome-python2
+
 * Mon Sep 17 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-7
 - Fixed redundant dependencies 
+
 * Sun Sep 16 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-6
 - Fixed usage Gconf.Straw does not support python-adns anymore.
 - So removed it. Fixed Spec file indentation warning.
+
 * Thu Sep 14 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-5
 - Fixed few major errors and dependencies
+
 * Tue Sep 11 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-4
 - Fixed failed dependencies
+
 * Mon Sep 10 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-3
 - Fixed few errors 
+
 * Sun Sep 9  2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-2
 - Some dependencies fixed 
+
 * Tue Aug 27 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-1
 - Updated to 0.27