fedora-rpmdevtools rpmdev-rmdevelrpms, 1.9, 1.10 rpmdevtools.spec, 1.46, 1.47

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12778

Modified Files:
	rpmdev-rmdevelrpms rpmdevtools.spec 
Log Message:
Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in rmdevelrpms.


Index: rpmdev-rmdevelrpms
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-rmdevelrpms,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmdev-rmdevelrpms	6 Aug 2007 15:09:03 -0000	1.9
+++ rpmdev-rmdevelrpms	8 Dec 2007 18:54:55 -0000	1.10
@@ -25,7 +25,7 @@
 import getopt, os, re, rpm, stat, sys, types
 
 
-__version__ = "1.8"
+__version__ = "1.9"
 
 
 dev_re  = re.compile("-(?:de(?:buginfo|vel)|sdk|static)\\b", re.IGNORECASE)
@@ -130,7 +130,8 @@
 
 The system wide configuration file is /etc/rpmdevtools/rmdevelrpms.conf, and
 per user settings (which override system ones) can be specified in
-~/.rmdevelrpmsrc.  These files are written in Python.
+~/.config/rpmdevtools/rmdevelrpms.conf or ~/.rmdevelrpmsrc (deprecated).
+These files are written in Python.
 '''
     usage(None)
     print '''
@@ -262,7 +263,9 @@
 
 
 for conf in ("/etc/rpmdevtools/rmdevelrpms.conf",
-             os.path.join(os.environ["HOME"], ".rmdevelrpmsrc")):
+             os.path.join(os.environ["HOME"], ".rmdevelrpmsrc"), # deprecated
+             os.path.join(os.environ["HOME"],
+                          ".config/rpmdevtools/rmdevelrpms.conf")):
     try:
         execfile(conf)
     except IOError:


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- rpmdevtools.spec	8 Dec 2007 18:44:09 -0000	1.46
+++ rpmdevtools.spec	8 Dec 2007 18:54:55 -0000	1.47
@@ -126,6 +126,8 @@
 * Sat Dec  8 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Add fonts spec template from the Fedora Fonts SIG (#407781).
 - Add option to use macro style instead of shell style variables to newspec.
+- Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in
+  rmdevelrpms.
 
 * Fri Oct 12 2007 Lubomir Kundrak <lkundrak at redhat.com> - 6.4-1
 - Import the previous fix into CVS to resync, bump version