From e1936f8e42f2b4ea140e10dce8dca729581ef085 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Jun 26 2014 16:26:07 +0000
Subject: Revert "fix panorama crasher rhbz#1040922"


This reverts commit ebd338de11ddfee7156e2d31f963ed52d2712959.

---

diff --git a/digikam-3.5.0-panorama-crasher.patch b/digikam-3.5.0-panorama-crasher.patch
deleted file mode 100644
index 1d6901b..0000000
--- a/digikam-3.5.0-panorama-crasher.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp.panorama-crasher digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp
---- digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp.panorama-crasher	2013-10-01 08:23:09.000000000 +0200
-+++ digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp	2013-12-12 11:50:14.199493306 +0100
-@@ -91,11 +91,7 @@ LastPage::LastPage(Manager* const mngr,
- 
-     QLabel *fileTemplateLabel = new QLabel(i18n("File name template:"), d->saveSettingsGroupBox);
-     formatVBox->addWidget(fileTemplateLabel);
--    QString first = d->mngr->itemsList().front().fileName();
--    QString last = d->mngr->itemsList().back().fileName();
--//     QString file = "panorama";
--    QString file = QString("%1-%2").arg(first.left(first.lastIndexOf('.'))).arg(last.left(last.lastIndexOf('.')));
--    d->fileTemplateKLineEdit  = new KLineEdit(file, d->saveSettingsGroupBox);
-+    d->fileTemplateKLineEdit  = new KLineEdit("panorama", d->saveSettingsGroupBox);
-     d->fileTemplateKLineEdit->setToolTip(i18n("Name of the panorama file (without its extension)."));
-     d->fileTemplateKLineEdit->setWhatsThis(i18n("<b>File name template</b>: Set here the base name of the files that "
-                                                 "will be saved. For example, if your template is <i>panorama</i> and if "
-@@ -146,6 +142,11 @@ LastPage::~LastPage()
- 
- void LastPage::resetTitle()
- {
-+    QString first = d->mngr->itemsList().front().fileName();
-+    QString last = d->mngr->itemsList().back().fileName();
-+    QString file = QString("%1-%2").arg(first.left(first.lastIndexOf('.'))).arg(last.left(last.lastIndexOf('.')));
-+    d->fileTemplateKLineEdit->setText(file);
-+
-     slotTemplateChanged(d->fileTemplateKLineEdit->text());
-     checkFiles();
- }
diff --git a/digikam.spec b/digikam.spec
index 0c13b7c..4259159 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 3.5.0
-Release: 2%{?pre}%{?dist}
+Release: 1%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -23,8 +23,6 @@ Source1: digikam-import.desktop
 Patch51:  digikam-3.1.0-opencv20.patch
 
 ## upstream patches
-# git 3d1a27f9
-Patch100: digikam-3.5.0-panorama-crasher.patch
 
 BuildRequires: eigen3-devel
 BuildRequires: desktop-file-utils
@@ -230,8 +228,6 @@ BuildArch: noarch
 %patch51 -p1 -b .opencv20
 %endif
 
-%patch100 -p1 -b .panaroma-crasher
-
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213
 mv cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
@@ -532,9 +528,6 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
-* Thu Dec 12 2013 Jaroslav Reznik <jreznik@redhat.com> - 3.5.0-2
-- fix panorama crasher rhbz#1040922
-
 * Wed Oct  9 2013 Alexey Kurov <nucleo@fedoraproject.org> - 3.5.0-1
 - digikam-3.5.0