From a0ade439aaa5b0076e5080d084aeeaf4942239de0fc7b1cc02bf6c37c38252b2 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Wed, 10 Jun 2020 18:14:38 +0000 Subject: [PATCH] Accepting request 813142 from home:favogt:branches:devel:libraries:c_c++ This avoids depending on docbook and texlive during newt build. - Split doc build into separate spec file - As the example scripts are "pointless", just don't install them OBS-URL: https://build.opensuse.org/request/show/813142 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/newt?expand=0&rev=51 --- newt-doc.changes | 4 ++++ newt-doc.spec | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ newt.changes | 6 +++++ newt.spec | 57 ++-------------------------------------------- 4 files changed, 71 insertions(+), 55 deletions(-) create mode 100644 newt-doc.changes create mode 100644 newt-doc.spec diff --git a/newt-doc.changes b/newt-doc.changes new file mode 100644 index 0000000..1a82d8b --- /dev/null +++ b/newt-doc.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Wed Jun 10 07:39:31 UTC 2020 - Fabian Vogt + +- Initial commit of split doc package diff --git a/newt-doc.spec b/newt-doc.spec new file mode 100644 index 0000000..0caec03 --- /dev/null +++ b/newt-doc.spec @@ -0,0 +1,59 @@ +# +# spec file for package newt-doc +# +# Copyright (c) 2020 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: newt-doc +Version: 0.52.21 +Release: 0 +Summary: Tutorial for Nifty Erik's Windowing Toolkit +License: LGPL-2.1-or-later +Group: Documentation/Howto +URL: https://pagure.io/newt +Source: https://fedorahosted.org/releases/n/e/newt/newt-%{version}.tar.gz +# needed for tutorial.pdf +BuildRequires: docbook-toys +BuildRequires: texlive-courier +BuildRequires: texlive-dvips +BuildRequires: texlive-ec +BuildRequires: texlive-helvetic +BuildRequires: texlive-jadetex +BuildRequires: texlive-times +Recommends: newt = %{version} +BuildArch: noarch + +%description +This package contains a tutorial about the Newt windowing toolkit. + +Newt is a programming library for color text-mode, widget-based user +interfaces. Newt can be used to add stacked windows, entry widgets, +check boxes, radio buttons, labels, plain text fields, scrollbars, +etc., to text mode user interfaces. Newt is based on the slang library. + +%prep +%autosetup -p1 -n newt-%{version} + +%build +# create tutorial.pdf documentation +db2pdf tutorial.sgml + +%install + +%files +%defattr(-,root,root) +%doc tutorial.{sgml,pdf,tex} + +%changelog diff --git a/newt.changes b/newt.changes index 7673dc6..78c7f69 100644 --- a/newt.changes +++ b/newt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 10 07:39:52 UTC 2020 - Fabian Vogt + +- Split doc build into separate spec file +- As the example scripts are "pointless", just don't install them + ------------------------------------------------------------------- Thu Apr 23 08:18:18 UTC 2020 - Martin Pluskal diff --git a/newt.spec b/newt.spec index eff046b..6901969 100644 --- a/newt.spec +++ b/newt.spec @@ -31,19 +31,11 @@ Source: https://fedorahosted.org/releases/n/e/newt/%{name}-%{version}.ta Source2: baselibs.conf Source10: %{name}-rpmlintrc Patch0: newt-0.52.20-implicit-pointer-decl.patch -# needed for tutorial.pdf -BuildRequires: docbook-toys BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: python3-devel BuildRequires: slang-devel -BuildRequires: texlive-courier -BuildRequires: texlive-dvips -BuildRequires: texlive-ec -BuildRequires: texlive-helvetic -BuildRequires: texlive-jadetex -BuildRequires: texlive-times %if %{with python2} BuildRequires: python-devel %endif @@ -90,22 +82,6 @@ Newt is a development library for text mode user interfaces. Install newt-devel if you want to develop applications which depend on newt. -%package doc -Summary: Tutorial for Nifty Erik's Windowing Toolkit -# the examples need the main package: -License: LGPL-2.1-or-later -Group: Documentation/Howto -Recommends: %{name} = %{version} -BuildArch: noarch - -%description doc -This package contains a tutorial about the Newt windowing toolkit. - -Newt is a programming library for color text-mode, widget-based user -interfaces. Newt can be used to add stacked windows, entry widgets, -check boxes, radio buttons, labels, plain text fields, scrollbars, -etc., to text mode user interfaces. Newt is based on the slang library. - %package static # Please keep the static package as this is requested by another # vendor for his tool. It shouldn't be a problem to keep this @@ -150,8 +126,7 @@ The python3-newt package contains the Python 3 bindings for the newt library providing a python API for creating text mode interfaces. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects @@ -160,7 +135,6 @@ providing a python API for creating text mode interfaces. %configure --without-tcl ## make depend make CPPFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all -#docbook2txt tutorial.sgml chmod 0644 peanuts.py popcorn.py %install @@ -176,22 +150,6 @@ for lang in ast bal sr@latin wo; do rm -rf %{buildroot}%{_datadir}/locale/$lang done -# prepare defaultdocdir with examples and scripts -# -install -d -m 755 %{buildroot}%{_defaultdocdir}/%{name}/examples -# install COPYING file -install -m 644 COPYING %{buildroot}%{_defaultdocdir}/%{name}/ -# install example scripts -install -m 755 peanuts.py %{buildroot}%{_defaultdocdir}/%{name}/examples/ -install -m 755 popcorn.py %{buildroot}%{_defaultdocdir}/%{name}/examples/ -# -# create tutorial.pdf documentation -# -install -m 644 tutorial.sgml %{buildroot}%{_defaultdocdir}/%{name}/ -pushd %{buildroot}%{_defaultdocdir}/%{name}/ 1>/dev/null -db2pdf tutorial.sgml -rm tutorial.{aux,log,out} CATALOG.* *.dsl -popd 1>/dev/null %find_lang %{name} %if %{with python2} @@ -201,20 +159,13 @@ popd 1>/dev/null %py3_compile %{buildroot}/%{python3_sitearch} %py3_compile -O %{buildroot}/%{python3_sitearch} %fdupes %{buildroot}/%{python3_sitearch} -# pointless examples -rm %{buildroot}%{_defaultdocdir}/%{name}/examples/*.py %post -n %{libsoname} -p /sbin/ldconfig %postun -n %{libsoname} -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root) -%dir %{_defaultdocdir}/%{name} -%if 0%{?suse_version} >= 01500 -%license %{_defaultdocdir}/%{name}/COPYING -%else -%license %{_defaultdocdir}/%{name}/COPYING -%endif +%license COPYING %{_bindir}/whiptail %{_mandir}/man1/whiptail.1%{?ext_man} @@ -228,10 +179,6 @@ rm %{buildroot}%{_defaultdocdir}/%{name}/examples/*.py %{_libdir}/%{libname}.so %{_libdir}/pkgconfig/*.pc -%files doc -%defattr(-,root,root) -%doc %{_defaultdocdir}/%{name}/tutorial.* - %files static %defattr(-,root,root) %{_libdir}/%{libname}.a