Hello community, here is the log from the commit of package espresso for openSUSE:Factory checked in at 2016-08-05 18:18:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/espresso (Old) and /work/SRC/openSUSE:Factory/.espresso.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "espresso" Changes: -------- --- /work/SRC/openSUSE:Factory/espresso/espresso.changes 2016-07-05 09:51:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.espresso.new/espresso.changes 2016-08-05 18:18:04.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Aug 3 17:54:16 UTC 2016 - jungh...@votca.org + +- switched to cmake build-system +- build python module +- dropped header as they are for internal use only +- dropped pkg-config files as nothing depends on libs yet +- update version 3.3.1+git20160803.6ed0518.tar.gz + * overhaul of buildsystem + * many many small fixes + +------------------------------------------------------------------- Old: ---- _service espresso-3.3.1+git20160622.6aa229c.tar.xz generate_headers.rb New: ---- espresso-3.3.1+git20160803.6ed0518.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ espresso.spec ++++++ --- /var/tmp/diff_new_pack.C9GMFj/_old 2016-08-05 18:18:05.000000000 +0200 +++ /var/tmp/diff_new_pack.C9GMFj/_new 2016-08-05 18:18:05.000000000 +0200 @@ -18,42 +18,66 @@ Name: espresso -Version: 3.3.1+git20160622.6aa229c +Version: 3.3.1+git20160803.6ed0518 Release: 0 Summary: Parallel simulation software for soft matter research License: GPL-3.0 Group: Productivity/Scientific/Chemistry Url: http://espressomd.org -Source: %{name}-%{version}.tar.xz -Source1: generate_headers.rb +Source: %{name}-%{version}.tar.gz BuildRequires: boost-devel +BuildRequires: cmake BuildRequires: fdupes BuildRequires: fftw3-devel BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: openmpi-devel +BuildRequires: python-Cython > 0.22 BuildRequires: python-devel +BuildRequires: python-numpy-devel BuildRequires: tcl-devel BuildRequires: tk-devel # documentation BuildRequires: doxygen BuildRequires: graphviz BuildRequires: ruby +BuildRequires: texlive-adjustbox +BuildRequires: texlive-ae +BuildRequires: texlive-amscls +BuildRequires: texlive-babel-english BuildRequires: texlive-bibtex-bin +BuildRequires: texlive-cleveref BuildRequires: texlive-colortbl +BuildRequires: texlive-courier BuildRequires: texlive-dvips-bin BuildRequires: texlive-enumitem BuildRequires: texlive-fancyvrb +BuildRequires: texlive-framed +BuildRequires: texlive-helvetic +BuildRequires: texlive-jknapltx BuildRequires: texlive-latex-bin-bin +BuildRequires: texlive-mathtools BuildRequires: texlive-makeindex-bin +BuildRequires: texlive-microtype BuildRequires: texlive-natbib +BuildRequires: texlive-rsfs +BuildRequires: texlive-psnfss +BuildRequires: texlive-revtex +BuildRequires: texlive-siunitx +BuildRequires: texlive-stmaryrd +BuildRequires: texlive-subfigure +BuildRequires: texlive-tikz-3dplot +BuildRequires: texlive-times BuildRequires: texlive-tocloft +BuildRequires: texlive-todonotes BuildRequires: texlive-underscore BuildRequires: texlive-units Provides: espresso-common = %{version} -Obsoletes: espresso-common <= %{version} +Obsoletes: espresso-common < %{version} Provides: espresso-openmpi = %{version} -Obsoletes: espresso-openmpi <= %{version} +Obsoletes: espresso-openmpi < %{version} +Obsoletes: espresso-devel < %{version} +Requires: espresso-common-tcl = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -65,7 +89,7 @@ systems, for example DNA and lipid membranes. %package doc -Summary: Architecture independent data files for ESPResSo +Summary: Architecture independent documentation files for ESPResSo Group: Productivity/Scientific/Chemistry BuildArch: noarch @@ -79,115 +103,99 @@ This package contains documentation for ESPResSo. -%package devel -Summary: Development headers and libraries for ESPResSo -Group: Development/Libraries/C and C++ -Requires: libEspresso0 = %{version} -Requires: libEspressoTcl0 = %{version} +%package common-tcl +Summary: Architecture independent data files for ESPResSo +Group: Productivity/Scientific/Chemistry +BuildArch: noarch + +%description common-tcl +ESPResSo is a highly versatile software package for performing and analyzing +scientific Molecular Dynamics many-particle simulations of coarse-grained +atomistic or bead-spring models as they are used in soft-matter research in +physics, chemistry and molecular biology. It can be used to simulate systems +such as polymers, liquid crystals, colloids, ferrofluids and biological +systems, for example DNA and lipid membranes. -%description devel -This package provides development headers and libraries for ESPResSo. +This package contains data file for TCL/TK interface of ESPResSo. -%package -n libEspresso0 +%package -n libEspresso4 Summary: Shared libraries for ESPResSo Group: System/Libraries -%description -n libEspresso0 +%description -n libEspresso4 This package provides shared libraries for ESPResSo. -%package -n libEspressoTcl0 +%package -n libEspressoTcl4 Summary: Tcl/Tk interface libraries for ESPResSo Group: System/Libraries -%description -n libEspressoTcl0 +%description -n libEspressoTcl4 This package provides shared libraries for TCL/TK interface for ESPResSo. +%package -n python-espressomd +Summary: Python module for ESPResSo +Group: Productivity/Scientific/Chemistry + +%description -n python-espressomd +This package provides the python module for ESPResSo. + %prep %setup -q -autoreconf -fiv -# documentation builds only when .git directory exists -mkdir .git - -chmod +x %{SOURCE1} %build -%configure --without-python-interface +# overwrite .so linker flags on SUSE distros: drop --no-undefined +%cmake '-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--as-needed -Wl,-z,now' \ + -DLIBDIR=%{_lib} \ + -DINSTALL_PYPRESSO=OFF make %{?_smp_mflags} make doc %install -make install DESTDIR=%{buildroot} - -# prepare header files -%{_sourcedir}/generate_headers.rb -ls -l %{buildroot}%{_includedir}/Espresso -# create pkgconfig file -cat > Espresso.pc << EOF -prefix=%{_prefix} -exec_prefix=%{_prefix} -libdir=%{_libdir} -includedir=%{_includedir}/Espresso - -Name: libEspresso -Description: Espresso Library -Version: %{version} -Libs: -L%{_libdir} -llibEspresso -Cflags: -I%{_includedir}/Espresso -EOF - -cat > EspressoTcl.pc << EOF -prefix=%{_prefix} -exec_prefix=%{_prefix} -libdir=%{_libdir} -includedir=%{_includedir}/Espresso - -Name: libEspressoTcl -Description: Espresso Tcl/Tk Library -Version: %{version} -Libs: -L%{_libdir} -llibEspresso -llibEspressoTcl -Cflags: -I%{_includedir}/Espresso -EOF - -install -dm 0755 %{buildroot}%{_libdir}/pkgconfig -install -p -m 0644 Espresso.pc %{buildroot}%{_libdir}/pkgconfig -install -p -m 0644 EspressoTcl.pc %{buildroot}%{_libdir}/pkgconfig +make -C build install DESTDIR=%{buildroot} +# no devel package +rm -f %{buildroot}%{_libdir}/lib*.so + +install -dm 0755 %{buildroot}%{_docdir}/python +install -p -m 0644 build/doc/tutorials/python/*/[0-9]*.pdf %{buildroot}%{_docdir}/python +install -dm 0755 %{buildroot}%{_docdir}/tcl +install -p -m 0644 build/doc/tutorials/tcl/*/[0-9]*.pdf %{buildroot}%{_docdir}/tcl -find %{buildroot} -name "*.la" -delete -print %fdupes %{buildroot}%{_prefix} -%post -n libEspresso0 -p /sbin/ldconfig -%post -n libEspressoTcl0 -p /sbin/ldconfig -%postun -n libEspresso0 -p /sbin/ldconfig -%postun -n libEspressoTcl0 -p /sbin/ldconfig +%post -n libEspresso4 -p /sbin/ldconfig +%post -n libEspressoTcl4 -p /sbin/ldconfig +%postun -n libEspresso4 -p /sbin/ldconfig +%postun -n libEspressoTcl4 -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc %attr(0644,root,root) README COPYING AUTHORS NEWS ChangeLog %{_bindir}/Espresso -%dir %{_datadir}/espresso -%{_datadir}/espresso/scripts -%{_datadir}/espresso/tools -%files devel +%files common-tcl +%defattr(-,root,root,-) +%{_datadir}/espresso + +%files -n libEspresso4 %defattr(-,root,root,-) -%{_includedir}/Espresso -%{_libdir}/libEspresso.so -%{_libdir}/libEspressoTcl.so -%{_libdir}/pkgconfig/Espresso.pc -%{_libdir}/pkgconfig/EspressoTcl.pc +%{_libdir}/libEspressoCore.so.4 +%{_libdir}/libActor.so.4 +%{_libdir}/libImmersedBoundary.so.4 +%{_libdir}/libObjectInFluid.so.4 -%files -n libEspresso0 +%files -n libEspressoTcl4 %defattr(-,root,root,-) -%{_libdir}/libEspresso.so.0 -%{_libdir}/libEspresso.so.0.0.0 +%{_libdir}/libEspressoTcl.so.4 -%files -n libEspressoTcl0 +%files -n python-espressomd %defattr(-,root,root,-) -%{_libdir}/libEspressoTcl.so.0 -%{_libdir}/libEspressoTcl.so.0.0.0 +%{python_sitearch}/espressomd %files doc %defattr(-,root,root,-) -%doc doc/ug/ug.pdf +%doc build/doc/ug/ug.pdf +%doc build/doc/dg/dg.pdf +%{_docdir}/python/*.pdf +%{_docdir}/tcl/*.pdf %changelog
