Hello community, here is the log from the commit of package glucat for openSUSE:Factory checked in at 2016-05-10 09:27:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glucat (Old) and /work/SRC/openSUSE:Factory/.glucat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glucat" Changes: -------- --- /work/SRC/openSUSE:Factory/glucat/glucat.changes 2015-10-20 00:08:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glucat.new/glucat.changes 2016-05-10 09:27:28.000000000 +0200 @@ -1,0 +2,41 @@ +Thu May 5 15:54:55 UTC 2016 - [email protected] + +- Update to version 0.8.1: + + The configuration option --with-tuning=arg controls test + tuning via preprocessor macros and the header files + test/tuning.h and test/undefine.h. + + The configuration option --enable-check-isnan controls checks + for NaN values, and the configuration option --with-pool-alloc + controls the use of the Boost pool allocator. + + The scripts test/test-all-config-options.sh, + test/diff-all-config-outputs.sh and + test/copy-all-config-outputs.sh enable comprehensive tesing of + configuation options. + + The use of Autotools has again been improved, with + enhancements to make, make clean, make dist and make install, + and the introduction of make check, make doc and make + install-doc. +- Use make check for the %check section. +- Add glucat-pyclical-demos-dir.patch to add a configure option + "--with-demo-dir" to set a custom path to install the + pyclical demos (defaults to %%{_datadir}/pyclical/demos); + patch submitted upstream. We use this option to install the + demos to %{_docdir}/%{name}/demos. +- Add glucat-doxygen-build-workaround.patch: required to + circumvent a known doxygen 1.8.11 regression (bgo#762982); only + required for openSUSE > 13.2. This patch should be dropped when + the upstream doxygen bug is fixed and the fixed version is made + available for openSUSE:Factory. +- Add glucat-pyclical-pythonpath.patch to include the correct dir + for the Pycilcal module before building the pyclical notebooks; + patch sent upstream. +- Add BuildRequires: automake, autoconf; new patches modify + autotool build files. +- Package pyclical demos. +- Pyclical module does not build for openSUSE <= 13.2 or Leap + 42.1. +- Build HTML and PDF documentation, package them in a separate + sub-package; add BuildRequires on texlive packages required for + building the PDF documentation. + +------------------------------------------------------------------- Old: ---- glucat-0.8.0.tar.gz New: ---- glucat-0.8.1.tar.gz glucat-doxygen-build-workaround.patch glucat-pyclical-demos-dir.patch glucat-pyclical-pythonpath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glucat.spec ++++++ --- /var/tmp/diff_new_pack.g10ebA/_old 2016-05-10 09:27:29.000000000 +0200 +++ /var/tmp/diff_new_pack.g10ebA/_new 2016-05-10 09:27:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package glucat # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,18 +16,55 @@ # +# GCC >= 4.9 IS REQUIRED FOR THE PYCLICAL MODULE, AVAILABLE FOR openSUSE > 1320, +# FOR OLDER VERSIONS, DISABLE PYCLICAL MOD BUT BUILD REST +%if 0%{?suse_version} > 1320 +%define pyclical_enable 1 +%else +%define pyclical_enable 0 +%endif Name: glucat -Version: 0.8.0 +Version: 0.8.1 Release: 0 Summary: Library of C++ templates implementing universal Clifford algebras License: LGPL-3.0 Group: Development/Libraries/C and C++ Url: http://glucat.sourceforge.net/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# PATCH-FEATURE-OPENSUSE glucat-pyclical-demos-dir.patch [email protected] -- Allow a configure option "--with-demo-dir" to set a custom path to install the pyclical demos (defaults to %%{_datadir}/pyclical/demos); patch submitted upstream +Patch0: glucat-pyclical-demos-dir.patch +# PATCH-FIX-UPSTREAM glucat-doxygen-build-workaround.patch bgo#762982 [email protected] -- Required to circumvent a known doxygen 1.8.11 regression; only required for openSUSE > 13.2; patch submitted upstream +# FIXME: PATCH1 SHOULD BE DROPPED WHEN UPSTREAM doxygen BUG IS FIXED AND THE FIXED VERSION IS MADE AVAILABLE FOR openSUSE:Factory +Patch1: glucat-doxygen-build-workaround.patch +# PATCH-FIX-UPSTREAM glucat-pyclical-pythonpath.patch [email protected] -- Add the dir where pyclical module is located to PYTHONPATH to make the module visible, build fails otherwise; patch submitted upstream +Patch2: glucat-pyclical-pythonpath.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: boost-devel +BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: graphviz-gd +BuildRequires: graphviz-gnome BuildRequires: python-Cython BuildRequires: python-devel +BuildRequires: python-numpy +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-latex-bin +BuildRequires: texlive-metafont-bin +BuildRequires: tex(adjustbox.sty) +BuildRequires: tex(caption.sty) +BuildRequires: tex(colortbl.sty) +BuildRequires: tex(fancyhdr.sty) +BuildRequires: tex(float.sty) +BuildRequires: tex(helvet.sty) +BuildRequires: tex(multirow.sty) +BuildRequires: tex(natbib.sty) +BuildRequires: tex(sectsty.sty) +BuildRequires: tex(tabu.sty) +BuildRequires: tex(tocloft.sty) +BuildRequires: tex(wasysym.sty) +BuildRequires: tex(xtab.sty) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,10 +74,10 @@ Clifford algebra corresponding to each non-degenerate quadratic form up to a maximum number of dimensions. - %package devel Summary: Library of C++ templates implementing universal Clifford algebras Group: Development/Libraries/C and C++ +Recommends: %{name}-doc = %{version} %description devel GluCat is a library of template classes which model the universal @@ -52,10 +89,24 @@ This package contains the header files required for developing applications using the glucat library. +%package doc +Summary: Documentation for %{name} +Group: Documentation/HTML + +%description doc +GluCat is a library of template classes which model the universal +Clifford algebras over the field of real numbers, with arbitrary +dimension and arbitrary signature. GluCat implements a model of each +Clifford algebra corresponding to each non-degenerate quadratic form +up to a maximum number of dimensions. + +This package provides the documentation for %{name}. + %package -n python-glucat Summary: Library of C++ templates implementing universal Clifford algebras Group: Development/Libraries/C and C++ Requires: python-base = %{py_ver} +Recommends: %{name}-doc = %{version} %description -n python-glucat GluCat is a library of template classes which model the universal @@ -67,30 +118,53 @@ This package contains the python-bindings for the package. %prep -%setup -q -n %{name}-%{version} +%setup -q +%patch0 -p1 +%if 0%{?suse_version} > 1320 +%patch1 -p1 +%endif +%patch2 -p1 %build -%configure --prefix=%{buildroot}%{_prefix} +# PATCH0 AND PATCH1 TOUCH MAKEFILE.am FILES +autoreconf -i +%configure --prefix=%{_prefix} --docdir=%{_docdir}/%{name} --with-demo-dir=%{_docdir}/%{name}/demos + +# FIX A NON-UNIX EOF ENCODING +sed -i 's/\r$//' ./pyclical/demos/plotting_demo_mayavi.py make %{?_smp_mflags} clean all +make %{?_smp_mflags} doc %install %make_install +make DESTDIR=%{buildroot} install-doc -# INSTALLATION OF PYCLICAL MODULE IS BOTCHED, WORKAROUND UNTIL FIXED -mkdir -p %{buildroot}/%{python_sitearch}/ -mv %{buildroot}/%{buildroot}/%{python_sitearch}/* %{buildroot}/%{python_sitearch}/ +# REMOVE FILES PKGED USING %%doc ANYWAY OR OTHERWISE NOT NEEDED +rm -fr %{buildroot}%{_docdir}/%{name}/{AUTHORS,COPYING,ChangeLog,glucat.lsm,INSTALL,NEWS,README,TODO} %check -./test/test.sh +make %{?_smp_mflags} check + +%fdupes %{buildroot}%{_docdir}/%{name}/html/ %files devel %defattr(-,root,root) +%doc AUTHORS ChangeLog README COPYING TODO NEWS %{_includedir}/%{name}/ -%doc AUTHORS ChangeLog README COPYING TODO +%files doc +%defattr(-,root,root) +%dir %{_docdir}/%{name} +%{_docdir}/%{name}/html/ +%{_docdir}/%{name}/pdf/ + +%if 0%{?pyclical_enable} %files -n python-glucat %defattr(-,root,root) %{python_sitearch}/* +%dir %{_docdir}/%{name} +%{_docdir}/%{name}/demos/ +%endif %changelog ++++++ glucat-0.8.0.tar.gz -> glucat-0.8.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/glucat/glucat-0.8.0.tar.gz /work/SRC/openSUSE:Factory/.glucat.new/glucat-0.8.1.tar.gz differ: char 5, line 1 ++++++ glucat-doxygen-build-workaround.patch ++++++ Index: glucat-0.8.1/doc/Makefile.am =================================================================== --- glucat-0.8.1.orig/doc/Makefile.am +++ glucat-0.8.1/doc/Makefile.am @@ -28,6 +28,7 @@ $(nodist_html_DATA): .doxygen.out pdf: $(nodist_pdf_DATA) $(nodist_pdf_DATA): .doxygen.out + sed -i "s/operator\%/operator\\\%/g" api/latex/*.tex $(MAKE) -C api/latex > api/latex/make.out cp api/latex/refman.pdf $@ rm -rf api/latex ++++++ glucat-pyclical-demos-dir.patch ++++++ Index: glucat-0.8.1/configure.ac =================================================================== --- glucat-0.8.1.orig/configure.ac +++ glucat-0.8.1/configure.ac @@ -520,6 +520,12 @@ LIBS="$all_libraries" AC_SUBST([LIBS]) AC_SUBST([AUTODIRS]) +AC_ARG_WITH([demo-dir], + AS_HELP_STRING([--with-demo-dir=PATH], [path to installed pyclical demos [DATAROOTDIR/pyclical/demos]]),, + [with_demo_dir='${datarootdir}/pyclical/demos']) +demodir="$with_demo_dir" +AC_SUBST([demodir]) + AM_CONDITIONAL([make_pyclical],[test "$glucat_use_pyclical" = "yes"]) AM_CONDITIONAL([use_cython],[test "$glucat_use_cython" = "yes"]) GLUCAT_CREATE_SUBDIRSLIST Index: glucat-0.8.1/pyclical/demos/Makefile.am =================================================================== --- glucat-0.8.1.orig/pyclical/demos/Makefile.am +++ glucat-0.8.1/pyclical/demos/Makefile.am @@ -2,8 +2,6 @@ AUTOMAKE_OPTIONS = foreign if make_pyclical -demodir = $(datarootdir)/pyclical/demos - DEMOS = pyclical_demo.py pyclical_tutorial_0_4_transcendental.py pyclical_tutorial_1_5_conformal.py \ build_pyclical_notebooks.py pyclical_notebook_utils.py pyclical_tutorial_1_0_plane.py pyclical_tutorial_2_0_wedge_product.py \ clifford_demo.py pyclical_tutorial_0_0_notation.py pyclical_tutorial_1_1_complex.py pyclical_tutorials.py \ ++++++ glucat-pyclical-pythonpath.patch ++++++ Index: glucat-0.8.1/pyclical/demos/Makefile.am =================================================================== --- glucat-0.8.1.orig/pyclical/demos/Makefile.am +++ glucat-0.8.1/pyclical/demos/Makefile.am @@ -23,7 +23,7 @@ pyclical_tutorial_1_3_lorentz.ipynb nodist_demo_DATA = $(NOTEBOOKS) $(NOTEBOOKS): - python build_pyclical_notebooks.py + PYTHONPATH=..:$(PYTHONPATH) python build_pyclical_notebooks.py clean-local: rm -f *.pyc *.ipynb
