Hello community,
here is the log from the commit of package python-pymol for openSUSE:Factory
checked in at 2018-08-31 10:42:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pymol (Old)
and /work/SRC/openSUSE:Factory/.python-pymol.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pymol"
Fri Aug 31 10:42:08 2018 rev:3 rq:631103 version:2.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pymol/python-pymol.changes
2018-06-22 13:30:11.594161091 +0200
+++ /work/SRC/openSUSE:Factory/.python-pymol.new/python-pymol.changes
2018-08-31 10:43:31.899137274 +0200
@@ -1,0 +2,14 @@
+Thu Aug 23 11:33:41 UTC 2018 - tchva...@suse.com
+
+- Version update to 2.2.0:
+ * Switch devel links to github
+ * No finegraned news file see ChangeLog for commit info
+- Rebase patch no-o3.patch
+
+-------------------------------------------------------------------
+Thu Aug 23 11:30:41 UTC 2018 - tchva...@suse.com
+
+- Fix fdupes call
+- Install license and docu files
+
+-------------------------------------------------------------------
Old:
----
pymol-v2.1.0.tar.bz2
New:
----
v2.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pymol.spec ++++++
--- /var/tmp/diff_new_pack.EDbnvk/_old 2018-08-31 10:43:33.859139599 +0200
+++ /var/tmp/diff_new_pack.EDbnvk/_new 2018-08-31 10:43:33.859139599 +0200
@@ -19,13 +19,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define oldpython python
Name: python-pymol
-Version: 2.1.0
+Version: 2.2.0
Release: 0
Summary: A Molecular Viewer
License: Python-2.0
Group: Productivity/Scientific/Chemistry
URL: http://pymol.org
-Source:
https://download.sourceforge.net/pymol/pymol/2/pymol-v%{version}.tar.bz2
+Source:
https://github.com/schrodinger/pymol-open-source/archive/v%{version}.tar.gz
# PATCH-FIX-OPENSUSE no-build-date.patch dh...@wustl.edu -- patch eliminates
build date
Patch0: no-build-date.patch
# PATCH-FIX-OPENSUSE no-o3.patch tchva...@suse.com -- do not add O3 to the code
@@ -39,6 +39,7 @@
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: glew-devel
+BuildRequires: glm-devel
BuildRequires: libmsgpack-devel
BuildRequires: libpng-devel
BuildRequires: libxml2-devel
@@ -69,7 +70,7 @@
ChemDraw, CCP4 maps, XPLOR maps and Gaussian cube maps.
%prep
-%setup -q -n pymol
+%setup -q -n pymol-open-source-%{version}
%patch0
%patch1 -p1
sed -i "1d" modules/pmg_tk/startup/apbs_tools.py # Remove she-bang line
@@ -81,7 +82,7 @@
%install
%python_install
%python_clone -a %{buildroot}%{_bindir}/pymol
-%fdupes %{buildroot}%{_prefix}
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
%post
%python_install_alternative pymol
@@ -90,6 +91,8 @@
%python_uninstall_alternative pymol
%files %{python_files}
+%doc README ChangeLog
+%license LICENSE
%python_alternative %{_bindir}/pymol
%{python_sitearch}*
++++++ no-o3.patch ++++++
--- /var/tmp/diff_new_pack.EDbnvk/_old 2018-08-31 10:43:33.875139618 +0200
+++ /var/tmp/diff_new_pack.EDbnvk/_new 2018-08-31 10:43:33.875139618 +0200
@@ -1,16 +1,16 @@
-Index: pymol/setup.py
+Index: pymol-open-source-2.2.0/setup.py
===================================================================
---- pymol.orig/setup.py
-+++ pymol/setup.py
-@@ -394,11 +394,6 @@ else: # unix style (linux, mac, ...)
-
- ext_comp_args += ["-ffast-math", "-funroll-loops", "-fcommon"]
-
-- # optimization currently causes a clang segfault on OS X 10.9 when
-- # compiling layer2/RepCylBond.cpp
-- if sys.platform != 'darwin':
-- ext_comp_args += ["-O3"]
--
- def get_pymol_version():
- return re.findall(r'_PyMOL_VERSION "(.*)"',
open('layer0/Version.h').read())[0]
-
+--- pymol-open-source-2.2.0.orig/setup.py
++++ pymol-open-source-2.2.0/setup.py
+@@ -275,11 +275,6 @@ ext_comp_args = [
+ # legacy stuff
+ '-Wno-unused-function',
+ '-Wno-char-subscripts',
+- # optimizations
+- "-ffast-math",
+- "-funroll-loops",
+- "-O3",
+- "-fcommon",
+ ]
+ ext_link_args = []
+ ext_objects = []
