From 6e60dcc3ea338ef07a1e80c949e24421e7daa481 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Apr 11 2011 13:36:06 +0000
Subject: Merge remote-tracking branch 'origin/master' into f14/master


Conflicts:
	.gitignore
	krename.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index b745d4c..f417970 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
+krename-4.0.1.tar.bz2
+/krename-4.0.4.tar.bz2
+/krename-4.0.5.tar.bz2
 /krename-4.0.6.tar.bz2
+/krename-4.0.7.tar.bz
diff --git a/krename-4.0.7-static-init-crash.patch b/krename-4.0.7-static-init-crash.patch
new file mode 100644
index 0000000..d982009
--- /dev/null
+++ b/krename-4.0.7-static-init-crash.patch
@@ -0,0 +1,12 @@
+diff -up ./src/plugin.cpp.static-init-crash ./src/plugin.cpp
+--- ./src/plugin.cpp.static-init-crash	2011-03-16 16:12:23.000000000 +0100
++++ ./src/plugin.cpp	2011-03-16 16:12:45.000000000 +0100
+@@ -19,7 +19,7 @@
+ 
+ #include "tokenhelpdialog.h"
+ 
+-const QString Plugin::S_TOKEN_SEPARATOR = TokenHelpDialog::S_TOKEN_SEPARATOR;
++const QString Plugin::S_TOKEN_SEPARATOR = ";;";
+ 
+ Plugin::Plugin( PluginLoader* loader )
+     : m_pluginLoader( loader ), m_enabled( false )
diff --git a/krename.spec b/krename.spec
index 6424db2..77828cf 100644
--- a/krename.spec
+++ b/krename.spec
@@ -1,12 +1,13 @@
 Name:           krename
-Version:        4.0.6
-Release:        1%{?dist}
+Version:        4.0.7
+Release:        2%{?dist}
 Summary:        Powerful batch file renamer
 Group:          Applications/File
 License:        GPLv2
 URL:            http://www.krename.net/
-Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         krename-4.0.7-static-init-crash.patch 
 
 BuildRequires:  kdelibs4-devel
 BuildRequires:  taglib-devel
@@ -24,6 +25,7 @@ image.
 
 %prep
 %setup -q
+%patch0 -p1 -b .static-init-crash
 for file in TODO; do
     iconv -f iso8859-1 -t utf8 $file > $file.utf8
     rm -rf $file
@@ -82,10 +84,26 @@ gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
 
 
 %changelog
+* Wed Mar 16 2011 Radek Novacek <rnovacek@redhat.com> - 4.0.7-2
+- Fixed crash on static initialization
+- Resolves: #684908
+
+* Fri Feb 25 2011 Radek Novacek <rnovacek@redhat.com> - 4.0.7-1
+- Update to 4.0.7
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Mon Jan 31 2011 Radek Novacek <rnovacek@redhat.com> - 4.0.6-1
 - Update to 4.0.6
 
-* Wed Sep 29 2010 jkeating - 4.0.4-1.1
+* Sun Jan 02 2011 Rex Dieter <rdieter@fedoraproject.org> - 4.0.5-2
+- rebuild (exiv2)
+
+* Thu Sep 30 2010 Radek Novacek <rnovacek@redhat.com> 4.0.5-1
+- Update to 4.0.5
+
+* Wed Sep 29 2010 jkeating - 4.0.4-2
 - Rebuilt for gcc bug 634757
 
 * Mon Sep 13 2010 Radek Novacek <rnovacek@redhat.com> - 4.0.4-1
diff --git a/sources b/sources
index f844440..94fff23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe6f6b434ec8aeafce0670e2f2924297  krename-4.0.6.tar.bz2
+afcf877b55395b35cd58a254163fb75e  krename-4.0.7.tar.bz