Hello community, here is the log from the commit of package klatexformula for openSUSE:Factory checked in at 2017-08-24 18:40:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/klatexformula (Old) and /work/SRC/openSUSE:Factory/.klatexformula.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "klatexformula" Thu Aug 24 18:40:24 2017 rev:18 rq:511434 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/klatexformula/klatexformula.changes 2016-12-02 16:43:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.klatexformula.new/klatexformula.changes 2017-08-24 18:40:28.742138845 +0200 @@ -1,0 +2,27 @@ +Wed Jul 19 10:26:24 UTC 2017 - badshah400@gmail.com + +- Update to version 4.0.0: + * Detailed release notes from + https://klatexformula.sourceforge.io/doc/rel-notes-v4_0. +- Drop klatexformula-3.2.5-add-needed.patch: No longer needed. +- Rebase klatexformula-3.2.8-remove-uninstall-target.patch, and + rename to klatexformula-4.0.0-remove-uninstall-target.patch. +- Drop Qt3 bindings, klatexformula only builds with Qt5. +- Ktexteditorplugin is not yet ported to Qt5, turn related + package off (build_ktexteditorplugin -> 0). +- Update BuildRequires: + * Replace Qt4 by appropriate Qt5 packages. + * Introduce hicolor-icon-theme BR to ensure proper permissions + for the %{_datadir}/icons/hicolor directory. + * Drop kdelibs4: KDE libs no longer needed since ktexteditor + no longer builds (not yet ported to Qt5). +- Rename libklftools-devel and libklfbackend-devel to + klftools-devel and klfbackend-devel respectively to make + the devel package names compatible with shared lib packaging + policy. Add appropriate Obsoletes/Provides for smooth upgrade. +- Drop static libraries everywhere, and ensure header files + are installed nevertheless (-DKLF_INSTALL_KLF*_HEADERS=ON). +- klfapp is dead, so drop the klatexformula-devel package, + and Obsolete/Provides it from klftools-devel. + +------------------------------------------------------------------- Old: ---- klatexformula-3.2.5-add-needed.patch klatexformula-3.2.8-remove-uninstall-target.patch klatexformula-3.2.8.tar.gz New: ---- klatexformula-4.0.0-remove-uninstall-target.patch klatexformula-4.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klatexformula.spec ++++++ --- /var/tmp/diff_new_pack.5xF1QL/_old 2017-08-24 18:40:31.301778246 +0200 +++ /var/tmp/diff_new_pack.5xF1QL/_new 2017-08-24 18:40:31.333773739 +0200 @@ -1,7 +1,7 @@ # # spec file for package klatexformula # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,27 +17,16 @@ # * Library version -%define libversion 3.2 -%define libversionpkgsuffix 3_2 +%define libversion 4 +%define libversionpkgsuffix 4 # * Set whether to compile with debug information or not, depending on ability to create debug packages -%if 0%{?suse_version} < 1120 -# # OpenSuse <= 11.1 complains about unpackaged debug files (?), so disable debug information... -# define cmake_build_type "Release" -# define makeinstall_target install/strip %define cmake_build_type "RelWithDebInfo" %define makeinstall_target install -%define want_explicit_debug_package 0 -%define want_explicit_buildarch 1 -%else -%define cmake_build_type "RelWithDebInfo" -%define makeinstall_target install -%define want_explicit_debug_package 0 -%define want_explicit_buildarch 0 -%endif # * Set CMake Common compilation options # Note: KLF_CMAKE_DEBUG only turns on KLF's CMake debugging messages, it has no effect upon the build itself. %define cmake_common_options -DCMAKE_SKIP_RPATH=ON -DKLF_CMAKE_DEBUG=ON -DCMAKE_INSTALL_PREFIX="/usr" -DKLF_INSTALL_LIB_DIR=%{_libdir} -DKLF_INSTALL_BIN_DIR=%{_bindir} -%define build_ktexteditorplugin 0%{?suse_version} > 1110 +# ktexteditor not ported to Qt5 +%define build_ktexteditorplugin 0 %if %build_ktexteditorplugin %define cmake_buildktexteditorplugin -DKLF_BUILD_KTEXTEDITORPLUGIN=ON %else @@ -49,7 +38,7 @@ # -------------- Name: klatexformula -Version: 3.2.8 +Version: 4.0.0 Release: 0 Summary: An easy-to-use graphical application for generating images from LaTeX equations License: GPL-2.0+ @@ -57,10 +46,6 @@ Url: http://klatexformula.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %want_explicit_buildarch -BuildArch: %{_arch} -%endif -# NOTE: kdelibs4 is required for the ktexteditor plugin only, not klatexformula itself BuildRequires: cmake >= 2.6.4 BuildRequires: doxygen BuildRequires: fdupes @@ -68,16 +53,20 @@ BuildRequires: graphviz-gd BuildRequires: gs BuildRequires: help2man -BuildRequires: kdelibs4 -BuildRequires: libkde4-devel -BuildRequires: libqt4 >= 4.4.0 -BuildRequires: libqt4-devel +BuildRequires: hicolor-icon-theme BuildRequires: libstdc++-devel -BuildRequires: qt3 >= 3.3 -BuildRequires: qt3-devel >= 3.3 BuildRequires: shared-mime-info BuildRequires: texlive-latex BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5Xml) Requires: libklfbackend%libversionpkgsuffix = %{version} Requires: libklftools%libversionpkgsuffix = %{version} Requires: shared-mime-info @@ -85,9 +74,8 @@ Obsoletes: klatexformula-plugins < 3.2.2 Provides: KLatexFormula = %{version} Provides: klatexformula-plugins = %{version} -Patch0: klatexformula-3.2.5-add-needed.patch -# PATCH-FIX-UPSTREAM klatexformula-3.2.8-remove-uninstall-target.patch -- fix CMake build error (picked from Debian) -Patch1: klatexformula-3.2.8-remove-uninstall-target.patch +# PATCH-FIX-UPSTREAM klatexformula-4.0.0-remove-uninstall-target.patch -- fix CMake build error (picked from Debian) +Patch1: klatexformula-%{version}-remove-uninstall-target.patch %description KLatexFormula is an easy-to-use graphical user interface for generating images @@ -102,9 +90,6 @@ Summary: KLatexFormula backend library (Qt4) Group: Development/Libraries/C and C++ -%if %want_explicit_buildarch -BuildArch: %{_arch} -%endif Requires: gs Requires: texlive-latex Provides: libklfbackend = %{version} @@ -118,36 +103,14 @@ See also packages klatexformula and libklfbackend-qt3. -%package -n libklfbackend-qt3-%libversionpkgsuffix - -Summary: KLatexFormula backend library (Qt3) -Group: Development/Libraries/C and C++ -%if %want_explicit_buildarch -BuildArch: %{_arch} -%endif -Requires: gs -Requires: qt3 >= 3.3 -Requires: texlive-latex -Provides: libklfbackend-qt3 = %{version} - -%description -n libklfbackend-qt3-%libversionpkgsuffix -A C++/Qt library to generate images (PNG, EPS, PDF, plus all Qt-supported image -formats) from LaTeX equations. - -This library implements the base functionality of KLatexFormula. This library -is compiled for Qt 3. - -See also packages klatexformula and libklfbackend. - -%package -n libklfbackend-devel +%package -n klfbackend-devel Summary: KLatexFormula backend library (development files) Group: Development/Libraries/C and C++ -%if %want_explicit_buildarch -BuildArch: %{_arch} -%endif Requires: libklfbackend = %{version} +Provides: libklfbackend-devel = %{version} +Obsoletes: libklfbackend-devel < 4.0.0 -%description -n libklfbackend-devel +%description -n klfbackend-devel A C++/Qt library to generate images (PNG, EPS, PDF, plus all Qt-supported image formats) from LaTeX equations. @@ -158,34 +121,10 @@ See also packages klatexformula-devel and libklfbackend-qt3-devel -%package -n libklfbackend-qt3-devel -Summary: KLatexFormula backend library (development files) (Qt3) -Group: Development/Libraries/C and C++ -%if %want_explicit_buildarch -BuildArch: %{_arch} -%endif -Requires: libklfbackend-devel = %{version} -Requires: libklfbackend-qt3 = %{version} - -%description -n libklfbackend-qt3-devel -A C++/Qt library to generate images (PNG, EPS, PDF, plus all Qt-supported image -formats) from LaTeX equations. - -This library implements the base functionality of KLatexFormula. This library -is compiled for Qt 3. - -This package contains the needed files for development. Contains: static -library. - -See also packages klatexformula-devel and libklfbackend-devel. - %package -n libklftools%libversionpkgsuffix Summary: KLatexFormula tools library Group: Development/Libraries/C and C++ -%if %want_explicit_buildarch -BuildArch: %{_arch} -%endif Provides: libklftools = %{version} %description -n libklftools%libversionpkgsuffix @@ -194,15 +133,16 @@ These tools were originially written for use by klatexformula, but they have been promoted to a library for use in any application. -%package -n libklftools-devel +%package -n klftools-devel Summary: KLatexFormula tools library (development files) Group: Development/Libraries/C and C++ -%if %want_explicit_buildarch -BuildArch: %{_arch} -%endif Requires: libklftools = %{version} +Obsoletes: %{name}-devel < 4.0.0 +Provides: %{name}-devel = %{version} +Obsoletes: libklftools-devel < 4.0.0 +Provides: libklftools-devel = %{version} -%description -n libklftools-devel +%description -n klftools-devel A C++/Qt4 library containing general-purpose GUI tools. These tools were originially written for use by klatexformula, but they have @@ -211,25 +151,6 @@ This package contains the needed files for development. Contains: headers, static library. -%package devel -Summary: Development files for KLatexFormula -Group: Development/Libraries/C and C++ -%if %want_explicit_buildarch -BuildArch: %{_arch} -%endif -Requires: klatexformula = %{version} -Requires: libklfbackend-devel = %{version} -Requires: libklftools-devel = %{version} - -%description devel -KLatexFormula is an easy-to-use graphical user interface for generating images -from LaTeX equations. These images can be dragged and dropped or copied and -pasted into external applications (presentations, text documents, graphics...), -or can be saved to disk in a variety of formats (PNG, JPG, BMP, EPS, PDF, etc.). - -This package contains the needed files for development. Contains: headers of -the main application library itself, unversioned shared library. - %package apidoc Summary: API documentation for KLatexFormula Group: Documentation/HTML @@ -242,17 +163,14 @@ pasted into external applications (presentations, text documents, graphics...), or can be saved to disk in a variety of formats (PNG, JPG, BMP, EPS, PDF, etc.). -This package contains the API documentation of the libraries libklfbackend, -libklftool and libklfapp which are the different components of klatexformula. +This package contains the API documentation of the libraries libklfbackend and +libklftool which are the different components of klatexformula. %if %build_ktexteditorplugin %package ktexteditor-plugin Summary: KLatexFormula integration into KDE4's text editor Group: Productivity/Publishing/TeX/Frontends -%if %want_explicit_buildarch -BuildArch: %{_arch} -%endif Requires: klatexformula = %{version} %{?kde4_runtime_requires} @@ -268,75 +186,35 @@ %endif -# Explicit debug package for opensuse <= 11.1 -%if 0%{?want_explicit_debug_package} -%endif - %prep %setup -q -%patch0 -p1 %patch1 -p1 %build -# Create a shared version in build-shared/, install runtime -mkdir build-shared -cd build-shared && cmake .. -DCMAKE_BUILD_TYPE=%cmake_build_type \ - -DKLF_LIBKLFBACKEND_STATIC=OFF -DKLF_LIBKLFTOOLS_STATIC=OFF -DKLF_LIBKLFAPP_STATIC=OFF \ - %cmake_common_options %cmake_buildktexteditorplugin \ - -DKLF_INSTALL_RUNTIME=ON -DKLF_INSTALL_DEVEL=OFF \ - -DKLF_INCLUDE_FONTS="" -DKLF_INSTALL_DESKTOP_CATEGORIES="Qt;Office;Utility;Viewer;DesktopUtility;" \ - -DKLF_INSTALL_DESKTOP_ICON="klatexformula" -DKLF_INSTALL_SHARE_PIXMAPS_DIR="" \ - -DKLF_INSTALL_ICON_THEME="share/icons/hicolor" -DKLF_INSTALL_RUN_POST_INSTALL=OFF \ +%cmake -DCMAKE_BUILD_TYPE=%cmake_build_type \ + -DKLF_LIBKLFBACKEND_STATIC=OFF \ + -DKLF_LIBKLFTOOLS_STATIC=OFF \ + %cmake_common_options \ + %cmake_buildktexteditorplugin \ + -DKLF_INSTALL_RUNTIME=ON \ + -DKLF_INSTALL_DEVEL=OFF \ + -DKLF_INSTALL_KLFTOOLS_HEADERS=ON \ + -DKLF_INSTALL_KLFBACKEND_HEADERS=ON \ + -DKLF_INSTALL_KLFBACKEND_AUTO_HEADERS=ON \ + -DKLF_INCLUDE_FONTS="" \ + -DKLF_INSTALL_DESKTOP_CATEGORIES="Qt;Office;Utility;Viewer;DesktopUtility;" \ + -DKLF_INSTALL_DESKTOP_ICON="klatexformula" \ + -DKLF_INSTALL_SHARE_PIXMAPS_DIR="" \ + -DKLF_INSTALL_ICON_THEME="share/icons/hicolor" \ + -DKLF_INSTALL_RUN_POST_INSTALL=OFF \ -DKLF_INSTALL_APIDOC_DIR="share/doc/klatexformula-api" \ -DKLF_INSTALL_SHARE_MAN1_DIR=%{_mandir}/man1 -pwd #debug specfile -make %{?_smp_mflags} VERBOSE=1 -cd .. -pwd #debug specfile - -# Create a static version in build-static/, install devel -mkdir build-static -# Run CMake -# Note: we don't want the binaries, install them somewhere harmless (/tmp) -cd build-static && cmake .. -DCMAKE_BUILD_TYPE=%cmake_build_type \ - -DKLF_LIBKLFBACKEND_STATIC=ON -DKLF_LIBKLFTOOLS_STATIC=ON -DKLF_LIBKLFAPP_STATIC=ON \ - %cmake_common_options -DKLF_BUILD_KTEXTEDITORPLUGIN=OFF \ - -DKLF_INSTALL_RUNTIME=ON -DKLF_INSTALL_DEVEL=ON \ - -DKLF_INSTALL_KLFAPP_STATIC_LIBS=OFF \ - -DKLF_INSTALL_KLATEXFORMULA_BIN=OFF -DKLF_INSTALL_KLATEXFORMULA_CMDL=OFF \ - -DKLF_INSTALL_DESKTOP=OFF -DKLF_INSTALL_RUN_POST_INSTALL=OFF -DKLF_BUILD_PLUGINS=OFF \ - -DKLF_BUILD_KTEXTEDITORPLUGIN=OFF -pwd #debug specfile -make %{?_smp_mflags} VERBOSE=1 -cd .. - -# Create a Qt3 shared version in build-qt3-shared/ -mkdir build-qt3-shared -# Run CMake -cd build-qt3-shared && cmake .. -DCMAKE_BUILD_TYPE=%cmake_build_type \ - -DKLF_QT_VERSION=3 -DKLF_LIBKLFBACKEND_STATIC=OFF %cmake_common_options -make %{?_smp_mflags} VERBOSE=1 -cd .. -# Create a Qt3 static version in build-qt3-static/ -mkdir build-qt3-static -# Run CMake -cd build-qt3-static && cmake .. -DCMAKE_BUILD_TYPE=%cmake_build_type \ - -DKLF_QT_VERSION=3 -DKLF_LIBKLFBACKEND_STATIC=ON %cmake_common_options make %{?_smp_mflags} VERBOSE=1 -cd .. %install -# NOTE: If not creating debuginfo packages, use 'make install/strip' -# Install shared + executables -cd build-shared && make %makeinstall_target DESTDIR=%{buildroot} ; cd .. -# Install static libs -cd build-static && make %makeinstall_target DESTDIR=%{buildroot} ; cd .. -# Install Qt3 klfbackend shared library -cd build-qt3-shared && make %makeinstall_target DESTDIR=%{buildroot} ; cd .. -# Install Qt3 klfbackend static library -cd build-qt3-static && make %makeinstall_target DESTDIR=%{buildroot} ; cd .. +%cmake_install # Doxygen doc generates some duplicate files in the big lot ... %fdupes %{buildroot}%{_datadir}/doc/klatexformula-api @@ -349,23 +227,17 @@ %suse_update_desktop_file %{buildroot}%{_datadir}/kde4/services/ktexteditor_klf_config.desktop %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc AUTHORS COPYING CMUFONTS_COPYING README %{_bindir}/klatexformula %{_bindir}/klatexformula_cmdl -%{_libdir}/libklfapp.so.%libversion %{_datadir}/applications/klatexformula.desktop %{_datadir}/icons/*/*/*/* %{_datadir}/mime/packages/klatexformula-mime.xml %{_mandir}/man1/klatexformula.1.gz %{_mandir}/man1/klatexformula_cmdl.1.gz %{_datadir}/klatexformula/ -#/usr/share/klatexformula/rccresources/ -#/usr/share/klatexformula/rccresources/klfbaseplugins.rcc %post update-mime-database /usr/share/mime @@ -385,76 +257,35 @@ %postun -n libklfbackend%libversionpkgsuffix ldconfig -%files -n libklfbackend-qt3-%libversionpkgsuffix -%defattr(-,root,root,-) -%{_libdir}/libklfbackend-qt3.so.%libversion - -%post -n libklfbackend-qt3-%libversionpkgsuffix -ldconfig - -%postun -n libklfbackend-qt3-%libversionpkgsuffix -ldconfig - -%files -n libklfbackend-qt3-devel -%defattr(-,root,root,-) -%{_libdir}/libklfbackend-qt3.so -%{_libdir}/libklfbackend-qt3.a - -%files -n libklfbackend-devel +%files -n klfbackend-devel %defattr(-,root,root,-) %{_libdir}/libklfbackend.so -%{_libdir}/libklfbackend.a %{_includedir}/klfbackend/ -#/usr/include/klfbackend/*.h -%post -n libklfbackend-devel -ldconfig +%post -n klfbackend-devel -p /sbin/ldconfig -%postun -n libklfbackend-devel -ldconfig +%postun -n klfbackend-devel -p /sbin/ldconfig %files -n libklftools%libversionpkgsuffix %defattr(-,root,root,-) %{_libdir}/libklftools.so.* -%post -n libklftools%libversionpkgsuffix -ldconfig +%post -n libklftools%libversionpkgsuffix -p /sbin/ldconfig -%postun -n libklftools%libversionpkgsuffix -ldconfig +%postun -n libklftools%libversionpkgsuffix -p /sbin/ldconfig -%files -n libklftools-devel +%files -n klftools-devel %defattr(-,root,root,-) %{_libdir}/libklftools.so -%{_libdir}/libklftools.a %{_includedir}/klftools/ -#/usr/include/klftools/*.h -%post -n libklftools-devel -ldconfig - -%postun -n libklftools-devel -ldconfig - -%files devel -%defattr(-,root,root,-) -%{_libdir}/libklfapp.so -%{_includedir}/klfapp/ -#/usr/include/klfapp/*.h - -%post devel -ldconfig +%post -n klftools-devel -p /sbin/ldconfig -%postun devel -ldconfig +%postun -n klftools-devel -p /sbin/ldconfig %files apidoc %defattr(-,root,root,-) %{_datadir}/doc/klatexformula-api -#/usr/share/doc/klatexformula-api/* -#/usr/share/doc/klatexformula-api/*/html -#/usr/share/doc/klatexformula-api/*/html/* -#/usr/share/doc/klatexformula-api/*/html/*/* %if %build_ktexteditorplugin @@ -462,7 +293,6 @@ %defattr(-,root,root,-) %{_libdir}/kde4/ktexteditor_klf.so %{_datadir}/kde4/apps/ktexteditor_klf/ -#/usr/share/kde4/apps/ktexteditor_klf/klfkatepluginui.rc %{_datadir}/kde4/services/ktexteditor_klf.desktop %{_datadir}/kde4/services/ktexteditor_klf_config.desktop %endif ++++++ klatexformula-3.2.8-remove-uninstall-target.patch -> klatexformula-4.0.0-remove-uninstall-target.patch ++++++ --- /work/SRC/openSUSE:Factory/klatexformula/klatexformula-3.2.8-remove-uninstall-target.patch 2016-04-22 16:25:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.klatexformula.new/klatexformula-4.0.0-remove-uninstall-target.patch 2017-08-24 18:40:27.914255476 +0200 @@ -1,9 +1,11 @@ Description: Remove the uninstall target Last-Update: 2015-12-17 ---- a/cmake/klfinstallpaths.cmake -+++ b/cmake/klfinstallpaths.cmake -@@ -544,17 +544,3 @@ +Index: klatexformula-4.0.0/cmake/klfinstallpaths.cmake +=================================================================== +--- klatexformula-4.0.0.orig/cmake/klfinstallpaths.cmake ++++ klatexformula-4.0.0/cmake/klfinstallpaths.cmake +@@ -502,17 +502,3 @@ if(NOT \"\$ENV{DESTDIR}\" STREQUAL \"\" \") endif(NOT \"\$ENV{DESTDIR}\" STREQUAL \"\" AND CMAKE_INSTALL_PREFIX MATCHES \"^[A-Za-z]:\") ") ++++++ klatexformula-3.2.8.tar.gz -> klatexformula-4.0.0.tar.gz ++++++ ++++ 404053 lines of diff (skipped)