rpms/babel/devel babel-0.8-pybabel.patch, NONE, 1.1 babel.spec, 1.1, 1.2

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/pkgs/rpms/babel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26027

Modified Files:
	babel.spec 
Added Files:
	babel-0.8-pybabel.patch 
Log Message:
Rename command line script to avoid conflicts

babel-0.8-pybabel.patch:

--- NEW FILE babel-0.8-pybabel.patch ---
Index: /trunk/doc/cmdline.txt
===================================================================
--- /trunk/doc/cmdline.txt (revision 184)
+++ /trunk/doc/cmdline.txt (revision 192)
@@ -15,8 +15,8 @@
 
 
-When properly installed, Babel provides a script called ``babel``::
+When properly installed, Babel provides a script called ``pybabel``::
 
-    $ babel --help
-    usage: babel subcommand [options] [args]
+    $ pybabel --help
+    usage: pybabel subcommand [options] [args]
 
     options:
@@ -30,6 +30,6 @@
       update      update existing message catalogs from a POT file
 
-The ``babel`` script provides a number of sub-commands that do the actual work.
-Those sub-commands are described below.
+The ``pybabel`` script provides a number of sub-commands that do the actual
+work. Those sub-commands are described below.
 
 
@@ -40,6 +40,6 @@
 binary MO files::
 
-    $ babel compile --help
-    usage: babel compile [options] 
+    $ pybabel compile --help
+    usage: pybabel compile [options] 
     
     compile message catalogs to MO files
@@ -77,6 +77,6 @@
 a collection of source files::
 
-    $ babel extract --help
-    usage: babel extract [options] dir1 <dir2> ...
+    $ pybabel extract --help
+    usage: pybabel extract [options] dir1 <dir2> ...
     
     extract messages from source files and generate a POT file
@@ -119,6 +119,6 @@
 template file::
 
-    $ babel init --help
-    usage: babel init [options] 
+    $ pybabel init --help
+    usage: pybabel init [options] 
     
     create new message catalogs from a POT file
@@ -153,6 +153,6 @@
 a PO template file::
 
-    $ babel update --help
-    usage: babel update [options] 
+    $ pybabel update --help
+    usage: pybabel update [options] 
     
     update existing message catalogs from a POT file
Index: /trunk/ChangeLog
===================================================================
--- /trunk/ChangeLog (revision 190)
+++ /trunk/ChangeLog (revision 192)
@@ -7,4 +7,6 @@
  * Added compilation of message catalogs to MO files.
  * Added updating of message catalogs from POT files.
+ * The name of the command-line script has been changed from just "babel" to
+   "pybabel" to avoid a conflict with the OpenBabel project (ticket #34).
 
 
Index: /trunk/setup.py
===================================================================
--- /trunk/setup.py (revision 184)
+++ /trunk/setup.py (revision 192)
@@ -136,5 +136,5 @@
     entry_points = """
     [console_scripts]
-    babel = babel.messages.frontend:main
+    pybabel = babel.messages.frontend:main
     
     [distutils.commands]


Index: babel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/babel/devel/babel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- babel.spec	22 Jun 2007 22:42:44 -0000	1.1
+++ babel.spec	29 Jun 2007 15:05:43 -0000	1.2
@@ -2,13 +2,16 @@
 
 Name:           babel
 Version:        0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools for internationalizing Python applications
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://babel.edgewall.org/
 Source0:        http://ftp.edgewall.com/pub/babel/Babel-%{version}.tar.bz2
+# Upstream patch:
+# http://babel.edgewall.org/changeset/192?format=diff&new=192
+Patch0:         babel-0.8-pybabel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,7 +42,8 @@
   and date formatting, etc.
 
 %prep
-%setup -q -n Babel-%{version}
+%setup0 -q -n Babel-%{version}
+%path0 -p1
 chmod a-x babel/messages/frontend.py doc/logo.png doc/logo_small.png
 %{__sed} -i -e '/^#!/,1d' babel/messages/frontend.py
 
@@ -55,8 +59,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README.txt
-%{_bindir}/babel
+%doc ChangeLog COPYING README.txt doc/cmdline.txt
+%{_bindir}/pybabel
 
 %files -n python-babel
 %defattr(-,root,root,-)
@@ -64,6 +68,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Fri Jun 29 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-2
+- Apply upstream patch to rename command line script to "pybabel" - BZ#246208
+
 * Thu Jun 21 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
 - First version for Fedora