[freemedforms] * Thu Jun 28 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org> - add new patch in attempt to co

[Ankur Sinha]

commit 5fd35fb315d3db87965e5a9f410c5e5c97bac673
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur at gmail.com>
Date:   Thu Jun 28 10:15:29 2012 +0530

    * Thu Jun 28 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org>
    - add new patch in attempt to correct segfault
    
    This patch has been suggested by upstream
    
    - Added obsoletes to maintain upgrade path
    
    Since the new split scheme has been used, obseletes will ensure a smooth
    upgrade experience for users.

 freemedforms-0.7.5-commandline-parser.patch |   11 +++++++++++
 freemedforms.spec                           |   16 ++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/freemedforms-0.7.5-commandline-parser.patch b/freemedforms-0.7.5-commandline-parser.patch
new file mode 100644
index 0000000..999f47b
--- /dev/null
+++ b/freemedforms-0.7.5-commandline-parser.patch
@@ -0,0 +1,11 @@
+--- ../freemedforms-0.7.5.orig/plugins/fmfcoreplugin/commandlineparser.cpp	2012-06-20 04:58:07.000000000 +0530
++++ plugins/fmfcoreplugin/commandlineparser.cpp	2012-06-28 08:48:31.752170931 +0530
+@@ -54,7 +54,7 @@
+     params.insert(UserClearPassword, QVariant());
+ 
+     // read command line params
+-    const QStringList &args = qApp->arguments();
++    const QStringList args = qApp->arguments();
+     foreach(const QString &a, args) {
+         QString k = a;
+         if (k.contains(" "))
diff --git a/freemedforms.spec b/freemedforms.spec
index 305bc42..d728b30 100644
--- a/freemedforms.spec
+++ b/freemedforms.spec
@@ -2,7 +2,7 @@
 
 Name:           freemedforms
 Version:        0.7.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The freemedforms application suite metapackage
 
 License:        GPLv3+ and LGPLv2
@@ -13,6 +13,8 @@ Source1:        %{name}.1
 
 # remove quazip from the project files
 Patch0:         %{name}-%{version}-remove-quazip.patch
+# patch command line parser to try fix segfault
+Patch1:        %{name}-%{version}-commandline-parser.patch
 
 BuildRequires:  qt-devel libXext-devel qt-mysql 
 BuildRequires:  desktop-file-utils
@@ -52,7 +54,8 @@ FreeMedForms and Derivatives are available for :
 - FreeBSD : need compilation of SVN trunk (please contact author)
 - Windows
 
-This is a meta package that pulls in the emr freediams and freeaccounts
+This is a meta package that pulls in the EMR freediams and freeaccounts
+
 
 %package emr
 Summary:    The freemedforms EMR
@@ -61,6 +64,10 @@ Requires:   %{name}-emr-data >= %{version}-%{release}
 
 Requires:   %{name}-common-libs%{?_isa} >= %{version}-%{release}
 
+# Obsolete previous packages since we've split into new subpackage scheme
+Obsoletes:      %{name} < 0.5.9-0.7.alpha1
+Obsoletes:      %{name}-devel < 0.5.9-0.7.alpha1
+
 %description emr
 The freemedforms main EMR
 
@@ -112,6 +119,7 @@ package for hints on how to do this.
 %prep
 %setup -q
 %patch0 -p0 -b .removes_quazip_from_qmake_project_files
+%patch1 -p0 -b .patches_command_line
 
 # contrib/quazip is the location of the bundled quazip library
 # delete everything other than the modified global.h and global.cpp files
@@ -196,6 +204,10 @@ rm -fvr $RPM_BUILD_ROOT/%{_datadir}/%{name}/package_helpers/
 %{_libdir}/%{name}-common/*so
 
 %changelog
+* Thu Jun 28 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.7.5-3
+- Try patch upstream suggested
+- Add obsoletes to maintain upgrade path
+
 * Wed Jun 27 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.7.5-2
 - Split to subpackages to make it easier to install suite applications
 - Split arch indep packages