[kate] kf5 kate-14.12.3, grow -plugins subpkg
Rex Dieter
rdieter at fedoraproject.org
Mon Mar 9 13:26:18 UTC 2015
commit 2e89c592f878a1fb144dc46c4c40dd370c134f7a
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Mar 9 08:26:17 2015 -0500
kf5 kate-14.12.3, grow -plugins subpkg
.gitignore | 1 +
kate-4.12.90-python_library_realpath.patch | 21 ---
kate.spec | 287 ++++++++++++-----------------
sources | 2 +-
4 files changed, 115 insertions(+), 196 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d6643c9..9388c33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/kate-4.14.1.tar.xz
/kate-4.14.2.tar.xz
/kate-4.14.3.tar.xz
+/kate-14.12.3.tar.xz
diff --git a/kate.spec b/kate.spec
index 01874e4..0c9c905 100644
--- a/kate.spec
+++ b/kate.spec
@@ -1,116 +1,85 @@
-# enable pate (kate python plugin), disable to bootstrap pykde4
-%if 0%{?fedora} || 0%{?rhel} > 6
-%define pate 1
-%endif
+# trim changelog included in binary rpms
+%global _changelog_trimtime %(date +%s -d "1 year ago")
Name: kate
-Summary: Advanced Text Editor
-Version: 4.14.3
-Release: 4%{?dist}
+Summary: Advanced Text Editor
+Version: 14.12.3
+Release: 1%{?dist}
# kwrite LGPLv2+
# kate: app LGPLv2, plugins, LGPLv2 and LGPLv2+ and GPLv2+
# ktexteditor: LGPLv2
-# katepart: LGPLv2
License: LGPLv2 and LGPLv2+ and GPLv2+
-URL: https://projects.kde.org/projects/kde/kdebase/kate
+URL: https://projects.kde.org/projects/kde/applications/kate
%global revision %(echo %{version} | cut -d. -f3)
%if %{revision} >= 50
%global stable unstable
%else
%global stable stable
%endif
-Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
-
-## upstreamable patches
-# https://bugzilla.redhat.com/show_bug.cgi?id=1050944
-Patch50: kate-4.12.90-python_library_realpath.patch
-
-## upstream patches
+Source0: http://download.kde.org/%{stable}/applications/%{version}/src/kate-%{version}.tar.xz
+BuildRequires: cmake
+BuildRequires: extra-cmake-modules
BuildRequires: desktop-file-utils
-BuildRequires: kactivities-devel
-BuildRequires: kdelibs4-devel >= 4.14
-BuildRequires: pkgconfig(QJson)
-BuildRequires: pkgconfig(QtWebKit)
-
-Requires: %{name}-part%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%{?kde_runtime_requires}
+BuildRequires: gettext
+BuildRequires: pkgconfig(libgit2)
+BuildRequires: pkgconfig(x11)
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-kconfig-devel
+BuildRequires: kf5-kdoctools-devel
+BuildRequires: kf5-kguiaddons-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kinit-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kitemmodels-devel
+BuildRequires: kf5-kjobwidgets-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-knotifications-devel
+BuildRequires: kf5-kparts-devel
+BuildRequires: kf5-ktexteditor-devel
+BuildRequires: kf5-kwindowsystem-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: kf5-kservice-devel
+BuildRequires: kf5-plasma-devel
+BuildRequires: kf5-threadweaver-devel
+BuildRequires: kf5-kwallet-devel
+
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qtscript-devel
+
+# not sure if we want -plugins by default, let's play it safe
+# and go with no initially -- rex
+#Requires: %{name}-plugins%{?_isa} = %{version}-%{release}
%description
%{summary}.
-%package devel
-Summary: Development files for %{name}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: kdelibs4-devel
-%description devel
-%{summary}.
-
-%package libs
-Summary: Runtime files for %{name}
-# when split occurred
-Obsoletes: kdesdk-libs < 4.6.95-10
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
-
-%if 0%{?pate}
-%package pate
-Summary: Kate python plugin
-BuildRequires: pykde4-devel
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: pykde4
-## use python_library_realpath patch instead
-#define python_library_path -DPYTHON_LIBRARY:PATH=%{_libdir}/libpython%{python_version}.so.1.0
-## python_autocomplete: review pending, https://bugzilla.redhat.com/1028818
-#Requires: python-pyplete
-## python_console_ipython:
-Requires: python-ipython
-## python_utils:
-Requires: python-pep8
-Requires: pyflakes
-## js_utils: not packaged (yet) by policy, see https://fedorahosted.org/fpc/ticket/362
-#Requires: python-jslint
-%description pate
-%{summary}.
-%endif
-
-%package part
-Summary: Kate kpart plugin
+%package plugins
+Summary: Kate plugins
License: LGPLv2
-# when split occurred
-Conflicts: kdelibs < 6:4.6.95-10
-# katesyntaxhighlightingrc conflicts with kdelibs3, see http://bugzilla.redhat.com/883529
-Conflicts: kdelibs3 < 3.5.10-40
-Provides: kate4-part = %{version}-%{release}
-%description part
+# upgrade path, when -plugins were split
+Obsoletes: kate < 14.12.1
+Requires: %{name} = %{version}-%{release}
+%description plugins
%{summary}.
%package -n kwrite
Summary: Text Editor
License: LGPLv2+
-# when split occurred
-Conflicts: kdebase < 6:4.6.95-10
-Requires: %{name}-part%{?_isa} = %{version}-%{release}
-%{?kde_runtime_requires}
%description -n kwrite
%{summary}.
%prep
-%setup -q
-
-%patch50 -p1 -b .python_library_realpath
+%setup -q -n kate-%{version}
%build
mkdir %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} .. \
- %{?python_library_path}
+%{cmake_kf5} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -119,103 +88,79 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang kate --with-kde --without-mo
-%find_lang kwrite --with-kde --without-mo
-
-# move devel symlinks (that would otherwise conflict with kdelibs3-devel)
-mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
-pushd %{buildroot}%{_kde4_libdir}
-for i in lib*.so
-do
- case "$i" in
- libkate*interfaces.so)
- linktarget=`readlink "$i"`
- rm -f "$i"
- ln -sf "../../$linktarget" "kde4/devel/$i"
- ;;
- esac
-done
-popd
-
-# fix documentation multilib conflict in index.cache
-for f in kate kwrite ; do
- bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache.bz2
- sed -i -e 's!name="id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
- sed -i -e 's!#id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
- bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
-done
%check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kate.desktop
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.kate.desktop
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.kwrite.desktop
%post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null || :
fi
-%files -f kate.lang
+%files
%doc COPYING.LIB
-%doc AUTHORS README
-%{_kde4_bindir}/kate
-%{_kde4_libdir}/libkdeinit4_kate.so
-%{_kde4_datadir}/applications/kde4/kate.desktop
-%{_kde4_appsdir}/kate/
-%{_kde4_appsdir}/katexmltools/
-%{_kde4_appsdir}/kconf_update/kate*.upd
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_mandir}/man1/kate.1.gz
-%{_kde4_configdir}/katerc
-%{_kde4_datadir}/kde4/services/kate*.desktop
-%{_kde4_libdir}/kde4/kate*plugin.so
-%if 0%{?pate}
-%exclude %{_kde4_appsdir}/kate/pate/
-%exclude %{_kde4_appsdir}/kate/plugins/pate/
-%exclude %{_kde4_libdir}/kde4/katepateplugin.so
-%endif
-%{_kde4_libdir}/kde4/katefiletemplates.so
-%{_kde4_appsdir}/ktexteditor_*/
-%{_kde4_datadir}/kde4/services/ktexteditor_*.desktop
-%{_kde4_libdir}/kde4/ktexteditor_*.so
-%{_kde4_datadir}/kde4/services/plasma-applet-katesession.desktop
-%{_kde4_datadir}/kde4/servicetypes/kateplugin.desktop
-%{_kde4_libdir}/kde4/plasma_applet_katesession.so
-%{_kde4_libdir}/kde4/kate_kttsd.so
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%files libs
-%{_kde4_libdir}/libkateinterfaces.so.4*
-
-%files devel
-%{_kde4_libdir}/kde4/devel/libkateinterfaces.so
-%{_kde4_libdir}/kde4/devel/libkatepartinterfaces.so
-%{_kde4_includedir}/kate_export.h
-%{_kde4_includedir}/kate/
-
-%post part -p /sbin/ldconfig
-%postun part -p /sbin/ldconfig
-
-%files part
-%doc part/INDENTATION part/README* part/TODO*
-%{_kde4_libdir}/kde4/katepart.so
-%{_kde4_libdir}/libkatepartinterfaces.so.4*
-%{_kde4_appsdir}/katepart/
-%{_kde4_configdir}/katemoderc
-%{_kde4_configdir}/kateschemarc
-%{_kde4_configdir}/katesyntaxhighlightingrc
-%{_kde4_configdir}/ktexteditor_codesnippets_core.knsrc
-%{_kde4_datadir}/kde4/services/katepart.desktop
+%doc AUTHORS
+%config(noreplace) %{_sysconfdir}/xdg/katerc
+%{_kf5_bindir}/kate
+%{_kf5_libdir}/libkdeinit5_kate.so
+%{_kf5_datadir}/applications/org.kde.kate.desktop
+%{_kf5_datadir}/icons/hicolor/*/*
+%{_mandir}/man1/kate.1*
+%{_kf5_docdir}/HTML/en/kate/
+%{_kf5_docdir}/HTML/en/katepart/
+%{_kf5_datadir}/kxmlgui5/kate/
++%{_kf5_datadir}/plasma/plasmoids/org.kde.plasma.katesessions/
++%{_kf5_datadir}/kservices5/plasma-applet-org.kde.plasma.katesessions.desktop
++%{_kf5_datadir}/kservices5/plasma-dataengine-katesessions.desktop
++%{_kf5_datadir}/plasma/services/org.kde.plasma.katesessions.operations
+
+%files plugins
+%config(noreplace) %{_sysconfdir}/xdg/ktexteditor_codesnippets_core.knsrc
+%{_kf5_qtplugindir}/ktexteditor/katebacktracebrowserplugin.so
+%{_kf5_qtplugindir}/ktexteditor/katebuildplugin.so
+%{_kf5_qtplugindir}/ktexteditor/katecloseexceptplugin.so
+%{_kf5_qtplugindir}/ktexteditor/katectagsplugin.so
+%{_kf5_qtplugindir}/ktexteditor/katefilebrowserplugin.so
+%{_kf5_qtplugindir}/ktexteditor/katefiletreeplugin.so
+%{_kf5_qtplugindir}/ktexteditor/kategdbplugin.so
+%{_kf5_qtplugindir}/ktexteditor/katekonsoleplugin.so
+%{_kf5_qtplugindir}/ktexteditor/kateopenheaderplugin.so
+%{_kf5_qtplugindir}/ktexteditor/kateprojectplugin.so
+%{_kf5_qtplugindir}/ktexteditor/katesearchplugin.so
+%{_kf5_qtplugindir}/ktexteditor/katesnippetsplugin.so
+%{_kf5_qtplugindir}/ktexteditor/katesqlplugin.so
+%{_kf5_qtplugindir}/ktexteditor/katesymbolviewerplugin.so
+%{_kf5_qtplugindir}/ktexteditor/katexmltoolsplugin.so
+%{_kf5_qtplugindir}/ktexteditor/tabswitcherplugin.so
+%{_kf5_qtplugindir}/plasma/dataengine/plasma_engine_katesessions.so
+%{_kf5_datadir}/kateproject/
+%{_kf5_datadir}/katexmltools/
+%{_kf5_datadir}/kservices5/katesymbolviewerplugin.desktop
+%{_kf5_datadir}/kxmlgui5/katebuild/
+%{_kf5_datadir}/kxmlgui5/katecloseexceptplugin/
+%{_kf5_datadir}/kxmlgui5/katectags/
+%{_kf5_datadir}/kxmlgui5/katefiletree/
+%{_kf5_datadir}/kxmlgui5/kategdb/
+%{_kf5_datadir}/kxmlgui5/katekonsole/
+%{_kf5_datadir}/kxmlgui5/kateopenheaderplugin/
+%{_kf5_datadir}/kxmlgui5/kateproject/
+%{_kf5_datadir}/kxmlgui5/katesearch/
+%{_kf5_datadir}/kxmlgui5/katesnippets/
+%{_kf5_datadir}/kxmlgui5/katesql/
+%{_kf5_datadir}/kxmlgui5/katesymbolviewer/
+%{_kf5_datadir}/kxmlgui5/katexmltools/
+%{_kf5_datadir}/kxmlgui5/tabswitcher/
%posttrans -n kwrite
update-desktop-database -q &> /dev/null || :
@@ -225,24 +170,18 @@ if [ $1 -eq 0 ] ; then
update-desktop-database -q &> /dev/null || :
fi
-%files -n kwrite -f kwrite.lang
-%{_kde4_bindir}/kwrite
-%{_kde4_appsdir}/kwrite
-%{_kde4_libdir}/libkdeinit4_kwrite.so
-%{_kde4_datadir}/applications/kde4/kwrite.desktop
-
-%if 0%{?pate}
-%files pate
-%{python_sitearch}/PyKate4/
-%{_kde4_appsdir}/kate/pate/
-%{_kde4_appsdir}/kate/plugins/pate/
-%{_kde4_libdir}/kde4/katepateplugin.so
-%{_kde4_datadir}/kde4/services/pate.desktop
-%{_kde4_datadir}/kde4/servicetypes/katepythonplugin.desktop
-%endif
+%files -n kwrite
+%{_kf5_bindir}/kwrite
+%{_kf5_libdir}/libkdeinit5_kwrite.so
+%{_kf5_datadir}/applications/org.kde.kwrite.desktop
+%{_kf5_datadir}/kxmlgui5/kwrite/
+%{_kf5_docdir}/HTML/en/kwrite/
%changelog
+* Mon Mar 09 2015 Rex Dieter <rdieter at fedoraproject.org> 14.12.3-1
+- kf5 kate-14.12.3, grow -plugins subpkg
+
* Thu Feb 19 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-4
- kwrite: use %%{?kde_runtime_requires}
diff --git a/sources b/sources
index 0074836..c94cb37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14da162cc650075cfb364fd39e64924d kate-4.14.3.tar.xz
+bb369e7c51df44949ffee6a3ef883206 kate-14.12.3.tar.xz
More information about the scm-commits
mailing list