diff --git a/.gitignore b/.gitignore index b370e27..73978d7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ kile-translations-20100417.tar.bz2 /kile-2.1.tar.bz2 /kile-2.1.1.tar.bz2 /kile-2.1.2.tar.bz2 +/kile-2.1.3.tar.bz2 diff --git a/kile-2.1.2-kde#299569.patch b/kile-2.1.2-kde#299569.patch deleted file mode 100644 index fb22c72..0000000 --- a/kile-2.1.2-kde#299569.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/kile.cpp b/src/kile.cpp -index 7cd50c5..ee7d420 100644 ---- a/src/kile.cpp -+++ b/src/kile.cpp -@@ -115,9 +115,9 @@ Kile::Kile(bool allowRestore, QWidget *parent, const char *name) - dbus.registerObject("/main", this); - dbus.registerService("net.sourceforge.kile"); // register under a constant names - -- // BUG 220343: Under some circumstances (Qt 4.5.3 or KDE 4.3 issues (?)) Kile doesn't terminate when the -- // main window is closed. So, we force this here. Everything seems to work fine with Qt 4.6. --// connect(m_mainWindow, SIGNAL(destroyed(QObject*)), kapp, SLOT(quit())); -+ // BUG 220343: Under some circumstances (Qt or KDE issues (?)) Kile doesn't terminate when the -+ // main window is closed. So, we force this here. This still seems to happen with Qt 4.8.1 and KDE 4.8.2. -+ connect(m_mainWindow, SIGNAL(destroyed(QObject*)), kapp, SLOT(quit())); - - QSplashScreen splashScreen(QPixmap(KGlobal::dirs()->findResource("appdata", "pics/kile_splash.png")), Qt::WindowStaysOnTopHint); - if(KileConfig::showSplashScreen()) { diff --git a/kile.spec b/kile.spec index 72b9c9b..5b4852b 100644 --- a/kile.spec +++ b/kile.spec @@ -1,17 +1,13 @@ Name: kile Summary: (La)TeX source editor and TeX shell -Version: 2.1.2 -Release: 3%{?dist} +Version: 2.1.3 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://kile.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/kile/kile-%{version}%{?pre}.tar.bz2 -# fix kile process remaining in memory after closing (kde#299569) -# patch attached by upstream (Michel Ludwig) to the bug report -Patch0: kile-2.1.2-kde#299569.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -57,7 +53,6 @@ Kile is a user friendly (La)TeX editor. The main features are: %prep %setup -q -n %{name}-%{version}%{?pre} -%patch0 -p1 -b .kde#299569 %if 0%{?fedora} < 16 && 0%{?rhel} < 7 # remove "incomplete translation" notice, entity not available in old kdelibs sed -i -e 's/&ged\.vertaald\;//g' translations/nl/doc/index.docbook @@ -125,6 +120,10 @@ rm -rf %{buildroot} %changelog +* Wed Sep 26 2012 Kevin Kofler - 2.1.3-1 +- update to 2.1.3 (bugfix release, #860363) +- drop upstreamed kde#299569 patch + * Thu Jul 19 2012 Fedora Release Engineering - 2.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index d5f4db9..0e211d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52c2abbc329609d270a0cbfcaad9378a kile-2.1.2.tar.bz2 +f3129e73eea21890c40781de80b44808 kile-2.1.3.tar.bz2