diff --git a/.cvsignore b/.cvsignore index 0ad67f3..fa1fc52 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ kile-2.1b3.tar.bz2 kile-translations-r1055480.tar.bz2 +kile-2.1b4.tar.bz2 diff --git a/kile-2.1b3-gcc_no_var_tracking_assignments.patch b/kile-2.1b3-gcc_no_var_tracking_assignments.patch deleted file mode 100644 index 8ec883f..0000000 --- a/kile-2.1b3-gcc_no_var_tracking_assignments.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up kile-2.1b3/CMakeLists.txt.gcc kile-2.1b3/CMakeLists.txt -diff -up kile-2.1b3/src/CMakeLists.txt.gcc kile-2.1b3/src/CMakeLists.txt ---- kile-2.1b3/src/CMakeLists.txt.gcc 2009-11-22 03:39:56.000000000 -0600 -+++ kile-2.1b3/src/CMakeLists.txt 2009-11-30 12:42:35.945120551 -0600 -@@ -157,6 +157,8 @@ QT4_ADD_DBUS_ADAPTOR(kile_SRCS net.sourc - - SET( kile_KCFG_SRCS kileconfig.kcfgc) - -+set_source_files_properties(kileconfig.cpp PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments ) -+ - KDE4_ADD_KCFG_FILES(kile_SRCS ${kile_KCFG_SRCS}) - - KDE4_ADD_APP_ICON(kile_SRCS "data/icons/hi*-app-kile.png") diff --git a/kile-2.1b3-kde#220343.patch b/kile-2.1b3-kde#220343.patch deleted file mode 100644 index 8720e0c..0000000 --- a/kile-2.1b3-kde#220343.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: src/kile.cpp -=================================================================== ---- src/kile.cpp (revision 1068703) -+++ src/kile.cpp (working copy) -@@ -114,6 +114,7 @@ - dbus.registerService("net.sourceforge.kile"); // register under a constant names - - m_mainWindow = new KileMainWindow(this); -+ connect(m_mainWindow, SIGNAL(destroyed(QObject*)), kapp, SLOT(quit())); - - QSplashScreen splashScreen(QPixmap(KGlobal::dirs()->findResource("appdata", "pics/kile_splash.png")), Qt::WindowStaysOnTopHint); - splashScreen.show(); diff --git a/kile.spec b/kile.spec index 733c8fc..2be6caf 100644 --- a/kile.spec +++ b/kile.spec @@ -1,10 +1,10 @@ -%define pre b3 +%define pre b4 Name: kile Summary: (La)TeX source editor and TeX shell Version: 2.1 -Release: 0.6.%{pre}%{?dist} +Release: 0.7.%{pre}%{?dist} License: GPLv2+ Group: Applications/Publishing @@ -15,16 +15,11 @@ Source0: http://downloads.sourceforge.net/sourceforge/kile/kile-%{version}%{?pre Source1: kile-translations-r1055480.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: kile-2.1b3-gcc_no_var_tracking_assignments.patch -# Force termination of Kile when the main window is closed (Michel Ludwig) -# (#557436) From: https://bugs.kde.org/show_bug.cgi?id=220343#c17 -Patch2: kile-2.1b3-kde#220343.patch - BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: kdelibs4-devel -%if 0%{?fedora} > 8 +%if 0%{?fedora} > 8 || 0%{?rhel} > 5 Requires: tex(latex) %else Requires: tetex-latex @@ -35,6 +30,8 @@ Requires: tetex-latex # okular #Requires(hint): kdegraphics +%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}} + %description Kile is a user friendly (La)TeX editor. The main features are: * Compile, convert and view your document with one click. @@ -61,11 +58,6 @@ rm -f kile-translations-r1055480/CMakeLists.txt mv -f kile-translations-r1055480/po po rmdir kile-translations-r1055480 -%if 0%{?fedora} > 11 -%patch1 -p1 -b .gcc_no_var_tracking_assignments -%endif -%patch2 -p0 -b .kde#220343 - %build @@ -126,6 +118,9 @@ rm -rf %{buildroot} %changelog +* Mon Apr 12 2010 Rex Dieter - 2.1-0.7.b4 +- kile-2.1b4 + * Tue Feb 02 2010 Kevin Kofler - 2.1-0.6.b3 - force termination when the main window is closed (#557436, kde#220343) diff --git a/sources b/sources index 4f1318a..0ab61b1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5de96712686e82fa17732c0d0cf0cc3f kile-2.1b3.tar.bz2 f30c1f7f3b0c7eaa0d73635761648c4f kile-translations-r1055480.tar.bz2 +8585c196b7bff68c5cffb924a98b8783 kile-2.1b4.tar.bz2