rpms/virtaal/F-11 virtaal-0.4.0-bug1015-rev11846-nodepcheck.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 virtaal.spec, 1.7, 1.8

[dwayne]

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15900

Modified Files:
	.cvsignore sources virtaal.spec 
Added Files:
	virtaal-0.4.0-bug1015-rev11846-nodepcheck.patch 
Log Message:
* Tue Jun 30 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.1.beta1
- Update to 0.4.0 beta1
- Backport r11846 --nodepcheck


virtaal-0.4.0-bug1015-rev11846-nodepcheck.patch:

--- NEW FILE virtaal-0.4.0-bug1015-rev11846-nodepcheck.patch ---
--- src/trunk/virtaal/setup.py	2009/07/07 15:00:30	11845
+++ src/trunk/virtaal/setup.py	2009/07/07 17:19:29	11846
@@ -457,13 +457,23 @@
 
 import distutils.command.install
 class DepCheckInstall(distutils.command.install.install):
-    def __init__(self, *args, **kwargs):
-        from virtaal.support import depcheck
-        failed = depcheck.check_dependencies()
-        if failed:
-            print 'Failed dependencies: %s' % (', '.join(failed))
-            exit(0)
-        distutils.command.install.install.__init__(self, *args, **kwargs)
+    user_options = distutils.command.install.install.user_options + [
+        ('nodepcheck', None, "don't check dependencies"),
+    ]
+
+    def initialize_options(self):
+        distutils.command.install.install.initialize_options(self)
+        self.nodepcheck = False
+
+    def run(self, *args, **kwargs):
+        if not self.nodepcheck:
+            from virtaal.support import depcheck
+            failed = depcheck.check_dependencies()
+            if failed:
+                print 'Failed dependencies: %s' % (', '.join(failed))
+                print 'Use the --nodepcheck option to ignore dependencies.'
+                exit(0)
+        distutils.command.install.install.run(self, *args, **kwargs)
 
 def main(options):
     options = add_platform_specific_options(options)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	18 Feb 2009 18:22:33 -0000	1.6
+++ .cvsignore	13 Jul 2009 11:06:18 -0000	1.7
@@ -1 +1,2 @@
 virtaal-0.3.1.tar.bz2
+virtaal-0.4.0-beta1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Feb 2009 18:22:33 -0000	1.6
+++ sources	13 Jul 2009 11:06:18 -0000	1.7
@@ -1 +1,2 @@
 eef03a4afa2f8a1e17f94a807268b7e3  virtaal-0.3.1.tar.bz2
+30ce41da361ef9efab109eea8efebf64  virtaal-0.4.0-beta1.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/virtaal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- virtaal.spec	26 Feb 2009 00:37:05 -0000	1.7
+++ virtaal.spec	13 Jul 2009 11:06:18 -0000	1.8
@@ -1,18 +1,20 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           virtaal
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        0.1.beta1%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/virtaal/index
-Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
+Source0:        http://translate.sourceforge.net/snapshots/virtaal-0.4.0-beta1/%{name}-%{version}-beta1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         virtaal-0.3beta1-setup_drop_MO_generation.patch
 Patch1:         virtaal-0.3.0-autocorr_shared_location.patch
+Patch2:         virtaal-0.4.0-bug1015-rev11846-nodepcheck.patch
 
 BuildArch:      noarch
 BuildRequires:  python
@@ -20,7 +22,7 @@ BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
-Requires:       translate-toolkit >= 1.3
+Requires:       translate-toolkit >= 1.4
 Requires:       libtranslate
 Requires:       pygtk2
 Requires:       pygtk2-libglade
@@ -53,9 +55,10 @@ converters allow translators to edit: Op
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-beta1
 %patch0 -p1 -b .setup_drop_MO_generation
 %patch1 -p1 -b .autocorr_shared_location
+%patch2 -p3 -b .nodepcheck
 
 %build
 %{__python} setup.py build
@@ -71,7 +74,7 @@ popd
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --install-data=/usr --root %{buildroot}
+%{__python} setup.py install -O1 --skip-build --install-data=/usr --nodepcheck --root %{buildroot}
 
 desktop-file-install                                     \
    --delete-original                                     \
@@ -140,6 +143,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jun 30 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.1.beta1
+- Update to 0.4.0 beta1
+- Backport r11846 --nodepcheck
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild