[virtaal/f15] Update to 0.7.0 final Patches: remove no_depcheck, no_profiling. Add packaged

[dwayne]

commit 24f48ff44e986f1acd3b65a228e932182a3471fa
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Fri Jun 3 09:12:06 2011 +0200

    Update to 0.7.0 final
    Patches: remove no_depcheck, no_profiling. Add packaged

 .gitignore                         |    1 +
 sources                            |    5 +----
 virtaal-0.7.0-packaged.patch       |   16 ++++++++++++++++
 virtaal-0.7.0b4-no_depcheck.patch  |   12 ------------
 virtaal-0.7.0b5-no_profiling.patch |   21 ---------------------
 virtaal.spec                       |   22 ++++++++++++----------
 6 files changed, 30 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f4c9f0b..6e8eaad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ virtaal-0.6.1.tar.bz2
 /virtaal-0.7.0-beta5.tar.bz2
 /virtaal-0.7.0-rc1.tar.bz2
 /virtaal-0.7.0-rc2.tar.bz2
+/virtaal-0.7.0.tar.bz2
diff --git a/sources b/sources
index 3b91f25..633f39c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-5a636e1b6302cba4244a017367953227  virtaal-0.6.1.tar.bz2
-74d15c924adbb436525afe405542579e  virtaal-0.7.0-beta5.tar.bz2
-2923a342b0d8e29a6f570f18cd4f7844  virtaal-0.7.0-rc1.tar.bz2
-2a969ebdd27a4f98de7dd4c33c15dd58  virtaal-0.7.0-rc2.tar.bz2
+f1da3f8677b1c70b30564c889fd62652  virtaal-0.7.0.tar.bz2
diff --git a/virtaal-0.7.0-packaged.patch b/virtaal-0.7.0-packaged.patch
new file mode 100644
index 0000000..113c023
--- /dev/null
+++ b/virtaal-0.7.0-packaged.patch
@@ -0,0 +1,16 @@
+diff -up virtaal-0.7.0/bin/virtaal.no_depcheck virtaal-0.7.0/bin/virtaal
+--- virtaal-0.7.0/bin/virtaal.no_depcheck	2011-05-28 12:08:39.000000000 +0200
++++ virtaal-0.7.0/bin/virtaal	2011-06-03 09:01:58.394348022 +0200
+@@ -28,10 +28,10 @@ if os_name == 'nt':
+     sys.stderr = open(filename_template % ('stderr'), 'w')
+ 
+ # Some behaviour should vary, depending on whether Virtaal is packaged or not
+-packaged = getattr(sys, 'frozen', False)
++#packaged = getattr(sys, 'frozen', False)
+ # Distributions can just set this value to True, if dependencies are taken care
+ # of elsewhere:
+-#packaged = True
++packaged = True
+ 
+ # Let's check for dependencies before we do anything else
+ if not packaged:
diff --git a/virtaal.spec b/virtaal.spec
index fc4e57b..debd937 100644
--- a/virtaal.spec
+++ b/virtaal.spec
@@ -4,23 +4,22 @@
 
 Name:           virtaal
 Version:        0.7.0
-#Release:        1%{?dist}
-Release:        0.9.%{subrelease}%{?dist}
+Release:        1%{?dist}
+#Release:        0.9.%{subrelease}%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/virtaal/index
 # Final releases are found at this URL
-#Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}.tar.bz2
+Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}.tar.bz2
 # Snapshot releases are found at this URL
-Source0:        http://translate.sourceforge.net/snapshots/%{name}-%{version}-%{subrelease}/%{name}-%{version}-%{subrelease}.tar.bz2
+#Source0:        http://translate.sourceforge.net/snapshots/%{name}-%{version}-%{subrelease}/%{name}-%{version}-%{subrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         virtaal-0.5.0-setup_drop_MO_generation.patch
 Patch1:         virtaal-0.3.0-autocorr_shared_location.patch
-Patch2:         virtaal-0.7.0b4-no_depcheck.patch
-Patch3:         virtaal-0.7.0b5-no_profiling.patch
+Patch2:         virtaal-0.7.0-packaged.patch
 
 BuildArch:      noarch
 BuildRequires:  python
@@ -85,13 +84,12 @@ DTD files, subtitles, and other formats.
 
 %prep
 # Final release setup
-#%setup -q
+%setup -q
 # Snapshot setup
-%setup -q -n %{name}-%{version}-%{subrelease}
+#%setup -q -n %{name}-%{version}-%{subrelease}
 %patch0 -p1 -b .setup_drop_MO_generation
 %patch1 -p1 -b .autocorr_shared_location
-%patch2 -p1 -b .no_depcheck
-%patch3 -p1 -b .no_profiling
+%patch2 -p1 -b .packaged
 
 %build
 %{__python} setup.py build
@@ -180,6 +178,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun 3 2011 Dwayne Bailey <dwayne at translate.org.za> - 0.7.0-1
+- Update to 0.7.0 final
+- Patches: remove no_depcheck, no_profiling. Add packaged
+
 * Sat May 28 2011 Dwayne Bailey <dwayne at translate.org.za> - 0.7.0-0.9.rc2
 - Update to 0.7.0 rc2
    - Virtaal hanging when inserting placeable - Virtaal bug 1930