From c12f59a81ad7a4cb2415ae5f87978132c0ff04377c9af3164071f916ebf7c59f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 16 Jul 2014 14:16:54 +0000 Subject: [PATCH] Accepting request 240532 from KDE:Distro:Factory Update to 4.13.80 OBS-URL: https://build.opensuse.org/request/show/240532 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=51 --- kate-4.13.2.tar.xz | 3 -- kate-4.13.80.tar.xz | 3 ++ kate.changes | 16 +++++++++ kate.spec | 87 ++++++++++++++++----------------------------- 4 files changed, 50 insertions(+), 59 deletions(-) delete mode 100644 kate-4.13.2.tar.xz create mode 100644 kate-4.13.80.tar.xz diff --git a/kate-4.13.2.tar.xz b/kate-4.13.2.tar.xz deleted file mode 100644 index 5687990..0000000 --- a/kate-4.13.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a77a923ea58c7f3239beb2e5be847e033f30e20209549578782aae4f3bc0fd5d -size 2739608 diff --git a/kate-4.13.80.tar.xz b/kate-4.13.80.tar.xz new file mode 100644 index 0000000..5c24164 --- /dev/null +++ b/kate-4.13.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fd9d4a18c3b517ab8c2f2679dfc5833e207ad2050dbb1f1e4b54e62e5cba264 +size 2759452 diff --git a/kate.changes b/kate.changes index dccdd8c..df58ece 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Jul 10 22:16:31 UTC 2014 - cgiboudeaux@gmx.com + +- Update to 4.13.80 + * KDE 4.14 Beta 1 release + * See http://www.kde.org/announcements/announce-4.14-beta1.php + +------------------------------------------------------------------- +Sun Jul 6 22:32:20 UTC 2014 - hrvoje.senjan@gmail.com + +- Use create_subdir_filelists macro for putting files where they + belong +- Drop some ancient obsoletes +- Drop fdupes usage: this is dangerous on multiple binary packages + from one source + ------------------------------------------------------------------- Sun Jun 8 18:28:55 UTC 2014 - tittiatcoke@gmail.com diff --git a/kate.spec b/kate.spec index b7a55fa..487301c 100644 --- a/kate.spec +++ b/kate.spec @@ -17,14 +17,13 @@ Name: kate -Version: 4.13.2 +Version: 4.13.80 Release: 0 Summary: Advanced Text Editor License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://www.kde.org/ Source0: %{name}-%{version}.tar.xz -BuildRequires: fdupes BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= %version BuildRequires: libqjson-devel @@ -34,8 +33,6 @@ BuildRequires: python-qt4-devel BuildRequires: python-sip-devel BuildRequires: xz Requires: libktexteditor = %{version} -Provides: kde4-kate = 4.3.0 -Obsoletes: kde4-kate < 4.3.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -55,9 +52,17 @@ RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %install cd build %kde4_makeinstall + %create_subdir_filelist -d addons/kate -f kate -v devel + %create_subdir_filelist -d addons/plasma -f kate -v devel + %create_subdir_filelist -d addons/ktexteditor -f ktexteditor -v devel + %create_subdir_filelist -d kate -v devel + %create_subdir_filelist -d kwrite -v devel + %create_subdir_filelist -d part -f ktexteditor -v devel + %create_subdir_filelist -d doc/kate -f kate -v devel + %create_subdir_filelist -d doc/kwrite -f kwrite-doc -v devel + cd .. %suse_update_desktop_file kate TextEditor %suse_update_desktop_file kwrite TextEditor - %fdupes -s %{buildroot} %kde_post_install %post -p /sbin/ldconfig @@ -73,18 +78,13 @@ Summary: Advanced Text Editor Development Headers Group: Development/Libraries/KDE Requires: kate = %{version} Requires: libkde4-devel -Provides: kde4-kate-devel = 4.3.0 -Obsoletes: kde4-kate-devel < 4.3.0 %description devel Files needed for development of Kate plugins. -%files devel +%files devel -f filelists/devel %defattr(-,root,root) -%{_kde4_includedir}/kate/ -%{_kde4_includedir}/kate_export.h -%{_kde4_libdir}/libkateinterfaces.so -%{_kde4_libdir}/libkatepartinterfaces.so +%dir %{_kde4_includedir}/kate/ %package -n libktexteditor Summary: Advanced Text Editor library @@ -101,46 +101,24 @@ The libraries shared by kwrite and kate editors. %postun -n libktexteditor -p /sbin/ldconfig -%files -n libktexteditor +%files -n libktexteditor -f filelists/ktexteditor %defattr(-,root,root) -%{_kde4_appsdir}/katepart/ -%{_kde4_appsdir}/ktexteditor_exporter/ -%{_kde4_appsdir}/ktexteditor_iconinserter/ -%{_kde4_appsdir}/ktexteditor_insertfile/ -%{_kde4_iconsdir}/hicolor/*/apps/ktexteditorautobrace.svgz -%{_kde4_iconsdir}/hicolor/*/actions/*.png -%{_kde4_libdir}/libkatepartinterfaces.so.* -%{_kde4_modulesdir}/ktexteditor_*.so -%{_kde4_modulesdir}/katepart.so -%{_kde4_modulesdir}/ktexteditor_*.so -%{_kde4_servicesdir}/ktexteditor_*.desktop -%{_kde4_configdir}/ktexteditor_codesnippets_core.knsrc +%dir %{_kde4_appsdir}/katepart/ +%dir %{_kde4_appsdir}/katepart/* +%dir %{_kde4_appsdir}/katepart/*/* +%dir %{_kde4_appsdir}/katepart/*/*/* +%dir %{_kde4_appsdir}/katepart/*/*/*/* +%dir %{_kde4_appsdir}/ktexteditor_* -%files +%files -f filelists/kate %defattr(-,root,root) -%config %{_kde4_configdir}/katemoderc -%config %{_kde4_configdir}/katerc -%exclude %{_kde4_modulesdir}/katepart.so -%{_kde4_applicationsdir}/kate.desktop -%{_kde4_appsdir}/kate/ -%{_kde4_appsdir}/katexmltools/ -%{_kde4_appsdir}/kconf_update/kate-2.4.upd -%{_kde4_bindir}/kate -%{_kde4_htmldir}/en/kate/ -%{_kde4_iconsdir}/hicolor/*/apps/kate.* -%{_kde4_libdir}/libkateinterfaces.so.* -%{_kde4_libdir}/libkdeinit4_kate.so -%{_kde4_mandir}/man?/* -%{_kde4_modulesdir}/kate*.so -%{_kde4_modulesdir}/plasma_applet_katesession.so -%{_kde4_servicesdir}/kate*.desktop -%{_kde4_servicesdir}/plasma-applet-katesession.desktop -%{_kde4_servicetypesdir}/kateplugin.desktop -%{_kde4_servicetypesdir}/katepythonplugin.desktop -%{_kde4_libdir}/python*/site-packages/PyKate4/ -%{_kde4_servicesdir}/pate.desktop -%{_kde4_configdir}/kateschemarc -%{_kde4_configdir}/katesyntaxhighlightingrc +%dir %{_kde4_libdir}/python*/site-packages/PyKate4/ +%dir %{_kde4_appsdir}/kate/ +%dir %{_kde4_appsdir}/kate/* +%dir %{_kde4_appsdir}/kate/*/* +%dir %{_kde4_appsdir}/kate/*/*/* +%dir %{_kde4_appsdir}/kate/*/*/*/* +%dir %{_kde4_appsdir}/katexmltools/ %package -n kwrite Summary: KDE Text Editor @@ -168,15 +146,12 @@ This package contains the documentation for KWrite %postun -n kwrite -p /sbin/ldconfig -%files -n kwrite +%files -n kwrite -f filelists/kwrite %defattr(-,root,root) -%{_kde4_applicationsdir}/kwrite.desktop -%{_kde4_appsdir}/kwrite/ -%{_kde4_bindir}/kwrite -%{_kde4_libdir}/libkdeinit4_kwrite.so +%exclude %{_kde4_htmldir}/en/kwrite/ -%files -n kwrite-doc +%files -n kwrite-doc -f filelists/kwrite-doc %defattr(-,root,root,-) -%doc %lang(en) %{_kde4_htmldir}/en/kwrite/ +%dir %{_kde4_htmldir}/en/kwrite/ %changelog