Hello community, here is the log from the commit of package presage for openSUSE:Factory checked in at 2019-06-27 16:23:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/presage (Old) and /work/SRC/openSUSE:Factory/.presage.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "presage" Thu Jun 27 16:23:04 2019 rev:17 rq:712053 version:0.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/presage/presage.changes 2017-11-14 14:23:19.282269523 +0100 +++ /work/SRC/openSUSE:Factory/.presage.new.4615/presage.changes 2019-06-27 16:23:05.614331142 +0200 @@ -1,0 +2,11 @@ +Tue Jun 25 11:32:39 UTC 2019 - Stefan Brüns <[email protected]> + +- Split out API doc generation using multibuild. graphviz-gd has + become quite heavy as a build dependency. +- Cleanup specfile + * remove defattr, use license macro + * remove conditionals for EOLed distribution versions +- Remove gpresagemate, it depends on the long deprecated XEVIE extension +- Set she-bang for /usr/bin/presage_dbus_* to /usr/bin/python2 + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ presage.spec ++++++ --- /var/tmp/diff_new_pack.1lF7gj/_old 2019-06-27 16:23:06.410332427 +0200 +++ /var/tmp/diff_new_pack.1lF7gj/_new 2019-06-27 16:23:06.414332434 +0200 @@ -1,7 +1,7 @@ # # spec file for package presage # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,16 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%global flavor @BUILD_FLAVOR@%{nil} + %define py_ver %(python -c "import sys; v=sys.version_info[:2]; print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND) Name: presage Version: 0.9.1 Release: 0 Summary: Intelligent predictive text entry platform (tools and demos) -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Text/Utilities Url: http://presage.sourceforge.net Source: http://ncu.dl.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz @@ -39,15 +41,19 @@ # PATCH-FIX-UPSTREAM doxygen no longer ships with the FreeSans font Patch6: presage-0.9.1-doxygen-no-freesans.patch Patch7: presage-buildcycle.diff +BuildRequires: autoconf +BuildRequires: automake BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libtool +%if "%{flavor}" == doc # Documentation Start BuildRequires: doxygen +BuildRequires: ghostscript-fonts-std BuildRequires: graphviz BuildRequires: graphviz-gd -# Helvetica font, smaller than texlive-gnu-freefont-fonts that provides freesans -BuildRequires: ghostscript-fonts-std # Documentation End +%else BuildRequires: help2man BuildRequires: libcmuclmtk-devel BuildRequires: libtool @@ -64,19 +70,14 @@ BuildRequires: libcppunit-devel BuildRequires: sqlite3-devel BuildRequires: update-desktop-files -%if 0%{?suse_version} >= 1220 -BuildRequires: libXevie-devel -%else -BuildRequires: xorg-x11-libXv-devel -%endif %else BuildRequires: cppunit-devel BuildRequires: dbus-glib-devel BuildRequires: dbus-python-devel BuildRequires: desktop-file-utils -BuildRequires: libXevie-devel BuildRequires: sqlite-devel %endif +%endif %description Presage is an intelligent predictive text entry platform. @@ -85,6 +86,7 @@ This package also contains simple demonstration programs and simulator. +%if "%{flavor}" == "" %package -n libpresage-devel Summary: Intelligent predictive text entry platform (development files) Group: Development/Libraries/C and C++ @@ -123,20 +125,6 @@ This package contains the sample statistical data files and abbreviation files needed by presage. -%package -n libpresage-doc -Summary: Intelligent predictive text entry platform (documentation) -Group: Documentation/Other -%if ! 0%{?sles_version} -BuildArch: noarch -%endif - -%description -n libpresage-doc -Presage is an intelligent predictive text entry platform. - -This package contains the documentation for libpresage. - -Documentation is available in HTML and LaTeX format. - %package -n python-presage Summary: Intelligent predictive text entry platform (Python binding) Group: System/Libraries @@ -160,13 +148,6 @@ This package also contains a simple demonstration program that uses the D-Bus service. -%package -n gpresagemate -Summary: Universial predictive text companion -Group: Productivity/Text/Utilities - -%description -n gpresagemate -Presagemate is a universal predictive text companion. Presagemate works alongside any AT-SPI aware application. The Assistive Technology Service Provider Interface (AT-SPI) is a toolkit-neutral way of providing accessibility facilities in applications. Presagemate works in the background by tracking what keystrokes are typed and displaying predictions in its window. When a prediction is selected, text is sent to the active application. - %package -n python-presagemate Summary: Universial predictive text companion Group: Productivity/Text/Utilities @@ -204,17 +185,25 @@ pyprompter displays predictions in a contextual pop-up box as each letter is typed. Predictions can be easily selected and inserted in the document. +%else +%package -n libpresage-doc +Summary: Intelligent predictive text entry platform (documentation) +Group: Documentation/HTML +BuildArch: noarch + +%description -n libpresage-doc +Presage is an intelligent predictive text entry platform. + +This package contains the libpresage API Documentation in HTML format. +%endif + %prep %setup -q find . -type f -exec sed -i 's/\r//g' "{}" \; %patch0 -p1 %patch1 -p1 -%if 0%{?suse_version} >= 1220 %patch2 -p1 -%endif -%if 0%{?suse_version} > 1310 %patch3 -p1 -%endif %patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -225,12 +214,22 @@ echo "User=root" >> apps/dbus/org.gnome.presage.service.in %build -export LIBS+="-lm -lX11 -lgmodule-2.0 -lncurses" autoreconf -fi +%if "%{flavor}" == "doc" +%configure --disable-sqlite +make -C doc %{?_smp_mflags} +%else +export LIBS+="-lm -lgmodule-2.0" %configure make %{?_smp_mflags} +%endif %install +%if "%{flavor}" == "doc" +make -C doc %{?_smp_mflags} DESTDIR=%{buildroot} install +%fdupes %{buildroot}/%{_datadir} + +%else make %{?_smp_mflags} DESTDIR=%{buildroot} install rm -rf %{buildroot}%{_libdir}/*.a @@ -245,6 +244,8 @@ %py_compile . popd +sed -i -e '1 s#/usr/bin/env.*python#/usr/bin/python2#' %{buildroot}%{_bindir}/presage_dbus_* + %suse_update_desktop_file gprompter Utility DesktopUtility %suse_update_desktop_file pyprompter Utility DesktopUtility @@ -260,13 +261,15 @@ fdupes -n -q -r %{buildroot} %endif +%endif +%if "%{flavor}" == "" %post -n libpresage1 -p /sbin/ldconfig %postun -n libpresage1 -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog NEWS README COPYING THANKS TODO +%license COPYING +%doc AUTHORS ChangeLog NEWS README THANKS TODO %{_bindir}/presage_demo %{_bindir}/presage_demo_text %{_mandir}/man1/presage_demo.1%{ext_man} @@ -277,7 +280,6 @@ %{_mandir}/man1/text2ngram.1%{ext_man} %files -n dbus-1-presage -%defattr(-,root,root) %{_bindir}/presage_dbus_python_demo %{_bindir}/presage_dbus_service %{python_sitelib}/presage_dbus_service.py @@ -288,40 +290,27 @@ %{_mandir}/man1/presage_dbus_service.1%{ext_man} %files -n libpresage1 -%defattr(-,root,root) %{_libdir}/libpresage.so.1 %{_libdir}/libpresage.so.1.1.1 %files -n presage-data -%defattr(-,root,root) %config %{_sysconfdir}/presage.xml %{_datadir}/presage %exclude %{_datadir}/presage/html %exclude %{_datadir}/presage/getting_started.txt - -%files -n libpresage-doc -%defattr(-,root,root) -%{_datadir}/presage/html/ -%{_datadir}/presage/getting_started.txt - -%files -n gpresagemate -%defattr(-,root,root) -%{_bindir}/gpresagemate +%exclude %{_datadir}/presage/python_binding.txt %files -n python-presagemate -%defattr(-,root,root) %{_bindir}/pypresagemate %{python_sitelib}/presagemate %files -n libpresage-devel -%defattr(-,root,root) %{_includedir}/presageCallback.h %{_includedir}/presageException.h %{_includedir}/presage.h %{_libdir}/libpresage.so %files -n python-presage -%defattr(-,root,root) %{_bindir}/presage_python_demo %{python_sitearch}/_presage.so %{python_sitearch}/presage.py @@ -333,7 +322,6 @@ %{python_sitearch}/python_presage-0.9.1-py%{py_ver}.egg-info %files -n pyprompter -%defattr(-,root,root) %{_bindir}/pyprompter %{python_sitelib}/prompter %{python_sitelib}/pyprompter-0.9.1-py%{py_ver}.egg-info @@ -343,11 +331,18 @@ %{_datadir}/pixmaps/pyprompter.* %files -n gprompter -%defattr(-,root,root) %{_bindir}/gprompter %{_datadir}/applications/gprompter.desktop %{_datadir}/icons/hicolor/scalable/apps/gprompter.svg %{_mandir}/man1/gprompter.1%{ext_man} %{_datadir}/pixmaps/gprompter.* +%else +%files -n libpresage-doc +%dir %{_datadir}/presage +%{_datadir}/presage/html/ +%{_datadir}/presage/getting_started.txt +%{_datadir}/presage/python_binding.txt +%endif + %changelog ++++++ _multibuild ++++++ <multibuild> <package>doc</package> </multibuild>
