rpms/mailman/F-7 mailman-2.1.9-ctypo-new.patch, NONE, 1.1 mailman-2.1.9-ctypefix.patch, 1.1, 1.2 mailman.spec, 1.66, 1.67

Tomas Smetana (tsmetana) fedora-extras-commits at redhat.com
Wed Dec 5 16:16:38 UTC 2007


Author: tsmetana

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

Modified Files:
	mailman-2.1.9-ctypefix.patch mailman.spec 
Added Files:
	mailman-2.1.9-ctypo-new.patch 
Log Message:
* Wed Dec 05 2007 Tomas Smetana <tsmetana at redhat.com> - 3:2.1.9-5.2
- more LC_CTYPE fixes


mailman-2.1.9-ctypo-new.patch:

--- NEW FILE mailman-2.1.9-ctypo-new.patch ---
--- mailman-2.1.9/bin/change_pw.ctypo	2007-08-27 13:27:11.000000000 +0200
+++ mailman-2.1.9/bin/change_pw	2007-08-27 13:27:11.000000000 +0200
@@ -187,8 +187,8 @@
                 adminurl = mlist.GetScriptURL('admin', absolute=1)
                 msg = Message.UserNotification(
                     mlist.owner[:], Utils.get_site_email(),
-                    _('Your new %(listname)s list password'),
-                    _('''\
+                    C_('Your new %(listname)s list password'),
+                    C_('''\
 The site administrator at %(hostname)s has changed the password for your
 mailing list %(listname)s.  It is now
 
--- mailman-2.1.9/bin/reset_pw.py.ctypo	2007-08-27 13:27:38.000000000 +0200
+++ mailman-2.1.9/bin/reset_pw.py	2007-08-27 13:28:02.000000000 +0200
@@ -38,7 +38,7 @@
 
 import paths
 from Mailman import Utils
-from Mailman.i18n import _
+from Mailman.i18n import _C
 
 
 try:
@@ -74,13 +74,13 @@
 
     listname = mlist.internal_name()
     if verbose:
-        print _('Changing passwords for list: %(listname)s')
+        print C_('Changing passwords for list: %(listname)s')
 
     for member in mlist.getMembers():
         randompw = Utils.MakeRandomPassword()
         mlist.setMemberPassword(member, randompw)
         if verbose:
-            print _('New password for member %(member)40s: %(randompw)s')
+            print C_('New password for member %(member)40s: %(randompw)s')
 
     mlist.Save()
 
--- mailman-2.1.9/bin/update.ctypo	2007-08-27 13:27:11.000000000 +0200
+++ mailman-2.1.9/bin/update	2007-08-27 13:27:11.000000000 +0200
@@ -445,7 +445,7 @@
         except EnvironmentError, e:
             if e.errno <> errno.ENOTDIR:
                 raise
-            print _('Warning!  Not a directory: %(dirpath)s')
+            print C_('Warning!  Not a directory: %(dirpath)s')
 
 
 
@@ -528,7 +528,7 @@
                 msg = data = None
         except EOFError:
             # For some reason the pckfile was empty.  Just delete it.
-            print _('Warning!  Deleting empty .pck file: %(pckfile)s')
+            print C_('Warning!  Deleting empty .pck file: %(pckfile)s')
             os.unlink(pckfile)
     finally:
         if msgfp:
--- mailman-2.1.9/bin/withlist.ctypo	2007-08-27 13:27:11.000000000 +0200
+++ mailman-2.1.9/bin/withlist	2007-08-27 13:27:11.000000000 +0200
@@ -127,7 +127,7 @@
 from Mailman import Errors
 from Mailman import MailList
 from Mailman import Utils
-from Mailman.i18n import _
+from Mailman.i18n import C_
 
 try:
     True, False
@@ -286,7 +286,7 @@
         namespace = globals().copy()
         namespace.update(locals())
         if dolist:
-            ban = _("The variable `m' is the %(listname)s MailList instance")
+            ban = C_("The variable `m' is the %(listname)s MailList instance")
         else:
             ban = None
         code.InteractiveConsole(namespace).interact(ban)
--- mailman-2.1.9/bin/newlist.ctypo	2007-08-27 13:27:11.000000000 +0200
+++ mailman-2.1.9/bin/newlist	2007-08-27 13:27:11.000000000 +0200
@@ -243,7 +243,7 @@
         try:
             msg = Message.UserNotification(
                 owner_mail, siteowner,
-                _('Your new mailing list: %(listname)s'),
+                C_('Your new mailing list: %(listname)s'),
                 text, mlist.preferred_language)
             msg.send(mlist)
         finally:
--- mailman-2.1.9/bin/check_perms.ctypo	2007-08-27 13:27:11.000000000 +0200
+++ mailman-2.1.9/bin/check_perms	2007-08-27 13:27:11.000000000 +0200
@@ -213,7 +213,7 @@
     # In addition, on a multiuser system you may want to hide the private
     # archives so other users can't read them.
     if mode & S_IXOTH:
-        print _("""\
+        print C_("""\
 Warning: Private archive directory is other-executable (o+x).
          This could allow other users on your system to read private archives.
          If you're on a shared multiuser system, you should consult the
--- mailman-2.1.9/Mailman/MTA/Postfix.py.ctypo	2007-08-27 13:27:11.000000000 +0200
+++ mailman-2.1.9/Mailman/MTA/Postfix.py	2007-08-27 13:27:11.000000000 +0200
@@ -351,9 +351,9 @@
         if stat and (stat[ST_MODE] & targetmode) <> targetmode:
             state.ERRORS += 1
             octmode = oct(stat[ST_MODE])
-            print _('%(dbfile)s permissions must be 066x (got %(octmode)s)'),
+            print C_('%(dbfile)s permissions must be 066x (got %(octmode)s)'),
             if state.FIX:
-                print _('(fixing)')
+                print C_('(fixing)')
                 os.chmod(dbfile, stat[ST_MODE] | targetmode)
             else:
                 print

mailman-2.1.9-ctypefix.patch:

Index: mailman-2.1.9-ctypefix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mailman/F-7/mailman-2.1.9-ctypefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mailman-2.1.9-ctypefix.patch	16 Oct 2007 09:26:10 -0000	1.1
+++ mailman-2.1.9-ctypefix.patch	5 Dec 2007 16:16:35 -0000	1.2
@@ -1,11 +1,11 @@
---- mailman-2.1.9/bin/withlist.ctypefix	2007-10-16 09:09:47.000000000 +0200
-+++ mailman-2.1.9/bin/withlist	2007-10-16 09:10:25.000000000 +0200
+--- mailman-2.1.9/bin/withlist.ctypefix	2007-10-16 08:42:38.000000000 +0200
++++ mailman-2.1.9/bin/withlist	2007-10-16 08:43:39.000000000 +0200
 @@ -127,7 +127,10 @@
  from Mailman import Errors
  from Mailman import MailList
  from Mailman import Utils
--from Mailman.i18n import _
-+from Mailman import i18n
+-from Mailman.i18n import C_
++from Mailman import i18n 
 +
 +_ = i18n._
 +C_ = i18n.C_


Index: mailman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mailman/F-7/mailman.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- mailman.spec	16 Oct 2007 09:29:33 -0000	1.66
+++ mailman.spec	5 Dec 2007 16:16:35 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access.
 Name: mailman
 Version: 2.1.9
-Release: 5.1
+Release: 5.2
 Epoch: 3
 Group: Applications/Internet
 #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -21,7 +21,8 @@
 Patch7: mailman-init.patch
 Patch8: mailman-archive-reply.patch
 Patch9: mailman-2.1.9-LC_CTYPE.patch
-Patch10: mailman-2.1.9-ctypefix.patch
+Patch10: mailman-2.1.9-ctypo-new.patch
+Patch11: mailman-2.1.9-ctypefix.patch
 
 License: GPL
 URL: http://www.list.org/
@@ -330,6 +331,9 @@
 %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in
 
 %changelog
+* Wed Dec 05 2007 Tomas Smetana <tsmetana at redhat.com> - 3:2.1.9-5.2
+- more LC_CTYPE fixes
+
 * Tue Oct 16 2007 Tomas Smetana <tsmetana at redhat.com> - 3:2.1.9-5.1
 - fix #333011 -- withlist crashes with NameError
 




More information about the fedora-extras-commits mailing list