rpms/kdesdk/devel kdesdk-4.1.2-quit.patch, NONE, 1.1 .cvsignore, 1.50, 1.51 kdesdk.spec, 1.118, 1.119 sources, 1.52, 1.53 kdesdk-4.1.1-quit.patch, 1.1, NONE kdesdk-4.1.2-kdecore.patch, 1.1, NONE
Than Ngo
than at fedoraproject.org
Thu Nov 20 16:53:38 UTC 2008
Author: than
Update of /cvs/extras/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21858
Modified Files:
.cvsignore kdesdk.spec sources
Added Files:
kdesdk-4.1.2-quit.patch
Removed Files:
kdesdk-4.1.1-quit.patch kdesdk-4.1.2-kdecore.patch
Log Message:
4.2 beta1
kdesdk-4.1.2-quit.patch:
--- NEW FILE kdesdk-4.1.2-quit.patch ---
diff -up kdesdk-4.1.2/lokalize/src/kaider.cpp.quit kdesdk-4.1.2/lokalize/src/kaider.cpp
--- kdesdk-4.1.2/lokalize/src/kaider.cpp.quit 2008-08-28 10:07:29.000000000 +0200
+++ kdesdk-4.1.2/lokalize/src/kaider.cpp 2008-10-22 23:13:27.000000000 +0200
@@ -225,7 +225,7 @@ void KAider::setupActions()
//action->setText(i18nc("@action:inmenu","Close all Lokalize windows"));
//KStandardAction::quit(kapp, SLOT(quit()), ac);
- //KStandardAction::quit(this, SLOT(deleteLater()), ac);
+ KStandardAction::quit(this, SLOT(slotFileQuit()), ac);
//Settings
@@ -820,6 +820,11 @@ bool KAider::queryClose()
}
}
+void KAider::slotFileQuit()
+{
+ if (queryClose())
+ qApp->quit();
+}
void KAider::undo()
{
diff -up kdesdk-4.1.2/lokalize/src/kaider.h.quit kdesdk-4.1.2/lokalize/src/kaider.h
--- kdesdk-4.1.2/lokalize/src/kaider.h.quit 2008-10-22 22:50:18.000000000 +0200
+++ kdesdk-4.1.2/lokalize/src/kaider.h 2008-10-22 22:51:48.000000000 +0200
@@ -115,6 +115,7 @@ private slots:
bool fileSave(const KUrl& url = KUrl());
bool fileSaveAs();
+ void slotFileQuit();
void undo();
void redo();
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 27 Sep 2008 02:25:02 -0000 1.50
+++ .cvsignore 20 Nov 2008 16:53:07 -0000 1.51
@@ -1 +1,2 @@
kdesdk-4.1.2.tar.bz2
+kdesdk-4.1.80.tar.bz2
Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- kdesdk.spec 22 Oct 2008 16:03:49 -0000 1.118
+++ kdesdk.spec 20 Nov 2008 16:53:08 -0000 1.119
@@ -1,7 +1,6 @@
-
Name: kdesdk
-Version: 4.1.2
-Release: 3%{?dist}
+Version: 4.1.80
+Release: 2%{?dist}
Summary: The KDE Software Development Kit (SDK)
Group: User Interface/Desktops
@@ -9,20 +8,12 @@
License: GPLv2
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0: kdesdk-4.1.2-quit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-## upstream patches
-Patch100: kdesdk-4.1.1-quit.patch
-# http://bugzilla.redhat.com/467984
-Patch101: kdesdk-4.1.2-kdecore.patch
-
-BuildRequires: kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: kdebase-workspace-devel >= %{version}
BuildRequires: strigi-devel
-BuildRequires: cmake
BuildRequires: flex
BuildRequires: giflib-devel
BuildRequires: apr-devel
@@ -41,7 +32,6 @@
Requires(post): xdg-utils
Requires(postun): xdg-utils
-Requires: kdelibs4 >= %{version}
Requires: kdepimlibs >= %{version}
Requires: kdebase-workspace >= %{version}
Requires: %{name}-libs = %{version}-%{release}
@@ -73,7 +63,7 @@
Summary: Developer files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: kdelibs4-devel kdepimlibs-devel
+Requires: kdepimlibs-devel
%description devel
Files for developing applications using %{name}.
@@ -90,10 +80,8 @@
%prep
%setup -q
+%patch0 -p1 -b .quit
-# upstream patches
-%patch100 -p1 -b .quit
-%patch101 -p1 -b .kdecore
%build
mkdir -p %{_target_platform}
@@ -107,7 +95,7 @@
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
# unpackaged files
rm -f %{buildroot}%{_kde4_libdir}/libantlr.so
@@ -164,9 +152,11 @@
%{_kde4_appsdir}/kbugbuster/
%{_kde4_appsdir}/kcachegrind/*
%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/kio_perldoc/
%{_kde4_appsdir}/kdevappwizard/
%{_kde4_appsdir}/kmtrace/
%{_kde4_appsdir}/kompare/
+%{_kde4_appsdir}/kpartloader/
%{_kde4_appsdir}/kuiviewer/*
%{_kde4_appsdir}/kuiviewerpart/*
%{_kde4_appsdir}/lokalize/
@@ -223,6 +213,23 @@
%changelog
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+- rebase lokalize quit menu patch
+- kdesdk-4.1.2-kdecore.patch upstreamed, dropped
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
+* Wed Oct 22 2008 Than Ngo <than at redhat.com> 4.1.2-4
+- check if the document has been saved, if not ask the user
+ to save the change or close without saving
+
* Wed Oct 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
- -utils should not depend on kdelibs etc (#467984)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources 27 Sep 2008 02:25:02 -0000 1.52
+++ sources 20 Nov 2008 16:53:08 -0000 1.53
@@ -1 +1 @@
-29b29ed131db84a9abb2b4bf4d81c56e kdesdk-4.1.2.tar.bz2
+9d2bdeb07fb54287b1cc47ec0a7ecf69 kdesdk-4.1.80.tar.bz2
--- kdesdk-4.1.1-quit.patch DELETED ---
--- kdesdk-4.1.2-kdecore.patch DELETED ---
More information about the fedora-extras-commits
mailing list