Hello community, here is the log from the commit of package liblouis for openSUSE:Factory checked in at 2017-10-06 10:57:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liblouis (Old) and /work/SRC/openSUSE:Factory/.liblouis.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "liblouis" Fri Oct 6 10:57:26 2017 rev:33 rq:531098 version:3.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/liblouis/liblouis.changes 2017-09-13 21:43:39.481723790 +0200 +++ /work/SRC/openSUSE:Factory/.liblouis.new/liblouis.changes 2017-10-06 10:57:27.303733669 +0200 @@ -1,0 +2,12 @@ +Tue Oct 3 13:47:54 UTC 2017 - jeng...@inai.de + +- Redo package summaries, and compact/trim descriptions for size. + +------------------------------------------------------------------- +Mon Oct 2 14:54:04 UTC 2017 - jmate...@suse.com + +- drop separate spec files for python-louis and python3-louis +- completely drop python2 bindings +- build python3-louis as a subpackage of liblouis + +------------------------------------------------------------------- Old: ---- pre_checkin.sh python-louis.changes python-louis.spec python3-louis.changes python3-louis.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liblouis.spec ++++++ --- /var/tmp/diff_new_pack.LliCkZ/_old 2017-10-06 10:57:28.155604890 +0200 +++ /var/tmp/diff_new_pack.LliCkZ/_new 2017-10-06 10:57:28.159604286 +0200 @@ -16,63 +16,34 @@ # -%define build_core_not_python 1 -%define build_py3 0 - -%if %build_py3 -%define py_suffix 3 -%define __python python3 -%define py_requires %{nil} -%else -%define __python python2 -%define py_suffix %{nil} -%endif - -#Configure python_sitelib, based on the used python version -%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())") - Name: liblouis -%define _name liblouis Version: 3.3.0 Release: 0 -Summary: Braille Translator and Back-Translator +Summary: Two-way braille translator License: LGPL-3.0+ Group: Productivity/Other Url: http://liblouis.org/ Source0: https://github.com/liblouis/liblouis/releases/download/v%{version}/liblouis-%{version}.tar.gz -%if %build_core_not_python BuildRequires: pkg-config PreReq: %install_info_prereq BuildRequires: fdupes -%else -BuildRequires: liblouis-devel -BuildRequires: python%{py_suffix} +BuildRequires: python-rpm-macros +BuildRequires: python3 Requires: liblouis14 = %{version} -%py_requires -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Liblouis is an open-source braille translator and back-translator. -It features support for computer and literary braille, supports -contracted and uncontracted translation for many, many languages -and has support for hyphenation. New languages can easily be added -through tables that support a rule- or dictionary based approach. - -Liblouis also supports math braille (Nemeth and Marburg). The -formatting of braille is provided by the companion project -liblouisxml. - -Liblouis is based on the translation routines in the BRLTTY -screenreader for Linux. It has, however, gone far beyond these -routines. It is named in honor of Louis Braille. +liblouis is a translator from and to braille. It features support for +computer and literary braille, supports contracted and uncontracted +translation for many languages and has support for hyphenation. New +languages can be added through tables that support a rule- or +dictionary-based approach. Math braille (Nemeth and Marburg) is +supported. Included are also tools for testing and debugging tables. -%if %build_core_not_python - %package -n liblouis14 -Summary: Braille Translator and Back-Translator +Summary: Two-way braille translator # We used to have a package named liblouis, until 2.4.1. License: LGPL-3.0+ Group: System/Libraries @@ -81,122 +52,87 @@ Obsoletes: %{name} < %{version} %description -n liblouis14 -Liblouis is an open-source braille translator and back-translator. -It features support for computer and literary braille, supports -contracted and uncontracted translation for many, many languages -and has support for hyphenation. New languages can easily be added -through tables that support a rule- or dictionary based approach. - -Liblouis also supports math braille (Nemeth and Marburg). The -formatting of braille is provided by the companion project -liblouisxml. - -Liblouis is based on the translation routines in the BRLTTY -screenreader for Linux. It has, however, gone far beyond these -routines. It is named in honor of Louis Braille. +liblouis is a translator from and to braille. It features support for +computer and literary braille, supports contracted and uncontracted +translation for many languages and has support for hyphenation. New +languages can be added through tables that support a rule- or +dictionary-based approach. Math braille (Nemeth and Marburg) is +supported. %package data -Summary: Data files for Braille Translator and Back-Translator +Summary: Data files for the liblouis two-way braille translator License: LGPL-3.0+ Group: System/Libraries Conflicts: liblouis2 < 3.3.0 %description data -Liblouis is an open-source braille translator and back-translator. -It features support for computer and literary braille, supports -contracted and uncontracted translation for many, many languages -and has support for hyphenation. New languages can easily be added -through tables that support a rule- or dictionary based approach. - -Liblouis also supports math braille (Nemeth and Marburg). The -formatting of braille is provided by the companion project -liblouisxml. - -Liblouis is based on the translation routines in the BRLTTY -screenreader for Linux. It has, however, gone far beyond these -routines. It is named in honor of Louis Braille. +liblouis is a translator from and to braille. It features support for +computer and literary braille, supports contracted and uncontracted +translation for many languages and has support for hyphenation. This package contains data required by main package. - %package tools -Summary: Braille Translator and Back-Translator - Tools +Summary: Tools from the liblouis braille translator package License: GPL-3.0+ Group: Productivity/Other %description tools -Liblouis is an open-source braille translator and back-translator. -It features support for computer and literary braille, supports -contracted and uncontracted translation for many, many languages -and has support for hyphenation. New languages can easily be added -through tables that support a rule- or dictionary based approach. - -Liblouis also supports math braille (Nemeth and Marburg). The -formatting of braille is provided by the companion project -liblouisxml. - -Liblouis is based on the translation routines in the BRLTTY -screenreader for Linux. It has, however, gone far beyond these -routines. It is named in honor of Louis Braille. +liblouis is a translator from and to braille. It features support for +computer and literary braille, supports contracted and uncontracted +translation for many languages and has support for hyphenation. %package doc -Summary: Braille Translator and Back-Translator - Documentation +Summary: Documentation for the liblouis braille translator License: LGPL-3.0+ Group: Documentation/Other %description doc -Liblouis is an open-source braille translator and back-translator. -It features support for computer and literary braille, supports -contracted and uncontracted translation for many, many languages -and has support for hyphenation. New languages can easily be added -through tables that support a rule- or dictionary based approach. - -Liblouis also supports math braille (Nemeth and Marburg). The -formatting of braille is provided by the companion project -liblouisxml. - -Liblouis is based on the translation routines in the BRLTTY -screenreader for Linux. It has, however, gone far beyond these -routines. It is named in honor of Louis Braille. +liblouis is a translator from and to braille. It features support for +computer and literary braille, supports contracted and uncontracted +translation for many languages and has support for hyphenation. %package devel -Summary: Braille Translator and Back-Translator - Development Files +Summary: Development files for the liblouis braille translator License: LGPL-3.0+ Group: Development/Libraries/C and C++ Requires: liblouis14 = %{version} %description devel -Liblouis is an open-source braille translator and back-translator. -It features support for computer and literary braille, supports -contracted and uncontracted translation for many, many languages -and has support for hyphenation. New languages can easily be added -through tables that support a rule- or dictionary based approach. - -Liblouis also supports math braille (Nemeth and Marburg). The -formatting of braille is provided by the companion project -liblouisxml. - -Liblouis is based on the translation routines in the BRLTTY -screenreader for Linux. It has, however, gone far beyond these -routines. It is named in honor of Louis Braille. +liblouis is a translator from and to braille. It features support for +computer and literary braille, supports contracted and uncontracted +translation for many languages and has support for hyphenation. New +languages can be added through tables that support a rule- or +dictionary-based approach. Math braille (Nemeth and Marburg) is +supported. + +%package -n python3-louis +Summary: Python3 bindings for the liblouis braille translator +License: LGPL-3.0+ +Group: Development/Languages/Python +Requires: liblouis14 = %{version} + +%description -n python3-louis +liblouis is a translator from and to braille. It features support for +computer and literary braille, supports contracted and uncontracted +translation for many languages and has support for hyphenation. -%endif +This subpackage contains the Python3 bindings. %prep -%setup -q -n %{_name}-%{version} +%setup %build %configure --disable-static --enable-ucs4 # TODO: fix Makefile so that -j1 isn't needed make -j1 -%if !%build_core_not_python + +# build python binding pushd python -%{__python} setup.py build +%python3_build popd -%endif %install -%if %build_core_not_python %make_install # doc is only auto-installed when makeinfo is present %make_install -C doc @@ -205,13 +141,11 @@ %{__rm} -f %{buildroot}%{_datadir}/doc/liblouis/liblouis.{html,txt} %fdupes %{buildroot}%{_datadir} %fdupes %{buildroot}%{_libdir} -%else + +# install python binding pushd python -%{__python} setup.py install --skip-build --root="%{buildroot}" --prefix="%{_prefix}" +%python3_install popd -%endif - -%if %build_core_not_python %post doc %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -247,12 +181,10 @@ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/liblouis -%else -%files +%files -n python3-louis %defattr(-, root, root) -%{python_sitelib}/louis*.egg-info -%{python_sitelib}/louis -%endif +%{python3_sitelib}/louis*.egg-info +%{python3_sitelib}/louis %changelog