[kdelibs] drop kate
Rex Dieter
rdieter at fedoraproject.org
Mon Jul 25 13:43:45 UTC 2011
commit cc94c15ab083e66dee061b424e80758c56c350f8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon Jul 25 08:49:09 2011 -0500
drop kate
.gitignore | 1 -
kdelibs.spec | 31 ++++++-------------------------
sources | 1 -
3 files changed, 6 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9099e5e..6508a60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
/kdelibs-4.6.95.tar.bz2
-/kate-4.6.95.tar.bz2
diff --git a/kdelibs.spec b/kdelibs.spec
index af00b3c..1122685 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -7,13 +7,13 @@
%define soprano_ver 2.6.51
%define strigi_ver 0.7.2
# to build/include apidocs or not
-%define apidocs 1
+#define apidocs 1
# to build/include QCH apidocs or not (currently broken)
#define apidocs_qch 1
Summary: KDE Libraries
Version: 4.6.95
-Release: 4%{?dist}
+Release: 10%{?dist}
Name: kdelibs
Epoch: 6
@@ -26,7 +26,6 @@ License: LGPLv2+
URL: http://www.kde.org/
Group: System Environment/Libraries
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}%{?alphatag}.tar.bz2
-Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kate-%{version}%{?alphatag}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kde4-macros(api) >= 2
@@ -114,9 +113,6 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
# make forcefully hal-free build
Patch300: kdelibs-4.6.80-halectomy.patch
-# katepart hack!
-Patch1000: kdelibs-4.6.90-kate.patch
-
%if 0%{?fedora} && 0%{?fedora} < 13
Conflicts: kdebase-workspace-libs < 4.3.80
%endif
@@ -271,17 +267,7 @@ format for use with the Qt 4 Assistant or KDevelop 4.
%prep
-%setup -q -n kdelibs-%{version}%{?alphatag}
-
-# katepart hack!
-# unpack kate
-%setup -q -T -D -a 1
-# extract katepart
-mv kate-%{version}/part ./kate
-# get rid of the rest of kate
-rm -rf kate-%{version}
-# make katepart build within kdelibs
-%patch1000 -p1 -b .kate
+%setup -q -n kdelibs-%{version}
%patch0 -p1 -b .parallel_devel
%patch2 -p1 -b .kde149705
@@ -448,7 +434,6 @@ rm -rf %{buildroot}
%{_kde4_bindir}/nepomuk-rcgen
%{_kde4_bindir}/meinproc4
%{_kde4_bindir}/meinproc4_simple
-%{_kde4_appsdir}/katepart/
%{_kde4_appsdir}/kauth/
%{_kde4_appsdir}/kcharselect/
%{_kde4_appsdir}/kcm_componentchooser/
@@ -458,17 +443,10 @@ rm -rf %{buildroot}
%{_kde4_appsdir}/knewstuff/
%{_kde4_appsdir}/ksgmltools2/
%{_kde4_appsdir}/kssl/
-%{_kde4_appsdir}/ktexteditor_exporter/
-%{_kde4_appsdir}/ktexteditor_iconinserter/
-%{_kde4_appsdir}/ktexteditor_insanehtml_le/
-%{_kde4_appsdir}/ktexteditor_insertfile/
-%{_kde4_appsdir}/ktexteditor_kdatatool/
%{_kde4_appsdir}/LICENSES/
%{_kde4_appsdir}/plasma/
%{_kde4_appsdir}/proxyscout/
%{_kde4_configdir}/accept-languages.codes
-%{_kde4_configdir}/katemoderc
-%{_kde4_configdir}/katepartpluginsrc
%{_kde4_configdir}/khtmlrc
%{_kde4_configdir}/plasmoids.knsrc
%{_datadir}/dbus-1/interfaces/*
@@ -557,6 +535,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Jul 22 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.95-10
+- drop kate
+
* Thu Jul 21 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.95-4
- rebuild (qt48)
diff --git a/sources b/sources
index 9264749..2376df9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
b5bfb4e550b410c8d552ff00fd28ef52 kdelibs-4.6.95.tar.bz2
-6e2c9738995fa1da32aa34c593998d97 kate-4.6.95.tar.bz2
More information about the scm-commits
mailing list