14 changed files with 193 additions and 256 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,14 @@
-/coot-0.8.7.tar.gz
+coot-0.6.1-20100127svn2740.tar.gz
+coot-reference-structures.tar.gz
+/coot-reference-structures.tar.gz
+/coot-0.6.2-20101012svn3213.tar.gz
+/coot-0.6.2-20110225svn3399.tar.gz
+/coot-0.6.2-20110328svn3442.tar.gz
+/coot-0.6.2-20110421svn3461.tar.gz
+/coot-0.6.2-20110715svn3566.tar.gz
+/coot-0.7-20120929svn4458.tar.gz
+/coot-0.7-20120929svn4458.tar.xz
+/coot-0.7.2.tar.gz
 /reference-structures.tar.gz
-/coot-0.8.8.tar.gz
+/coot-0.8.1.tar.gz
+/coot-0.8.2.tar.gz
--- a/coot-appdata.patch
+++ b/coot-appdata.patch
@ -0,0 +1,24 @@
+--- coot.appdata.xml_orig	2015-06-28 23:45:07.527132520 -0400
+++ coot.appdata.xml	2015-06-29 23:44:38.374147150 -0400
+@@ -1,10 +1,11 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2014 Paul Emsley <pemsley at mrc dash lmb dot cam dot ac dot uk> -->
+-<application>
+- <id type="desktop">Coot.desktop</id>
+<component type="desktop">
+ <id>coot.desktop</id>
+  <metadata_license>GFDL-1.3</metadata_license>
+- <project_license>GPL-2.0+ and GPL-3.0+ and LGPL-3.0+</project_license>
+- <summary>Macromolecular model builder</summary>
+ <project_license>GPLv3+ and LGPLv2+</project_license>
+ <name>Coot</name>
+ <summary>Protein model building and validation for X-ray crystallographic data</summary>
+  <description>
+   <p>
+      Coot is a powerful macromolecular model-building tool for
+@@ -26,4 +27,4 @@
+  </screenshots>
+  <url type="homepage">http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/</url>
+  <updatecontact>pemsley _at_ mrc dash lmb.cam.ac.uk</updatecontact>
+-</application>
+</component>
--- a/coot-configure.ac.patch
+++ b/coot-configure.ac.patch
@ -1,23 +1,6 @@
--- configure.ac.orig	2016-12-30 12:57:26.843081999 -0500
-+++ configure.ac	2016-12-30 12:58:11.963460565 -0500
-@@ -45,11 +45,11 @@
- 
- # AC_PROG_INTLTOOL, no, not today.  Mac compilation problems, no perl/ XML or something.
- # BL says Lets do some testing and use old style if needed
-AC_MSG_CHECKING([which libtool initialization strategy to adopt])
-AC_MSG_RESULT([m4_ifset([LT_INIT],[LT-INIT],[AC-PROG-LIBTOOL])])
-m4_ifset([LT_INIT],
-[LT_INIT],
-[AC_PROG_LIBTOOL])
-+# AC_MSG_CHECKING([which libtool initialization strategy to adopt])
-+# AC_MSG_RESULT([m4_ifset([LT_INIT],[LT-INIT],[AC-PROG-LIBTOOL])])
-+# m4_ifset([LT_INIT],
-+# [LT_INIT],
-+# [AC_PROG_LIBTOOL])
- 
- GNOME_COMPILE_WARNINGS
- GNOME_CXX_WARNINGS
-@@ -148,7 +148,7 @@
+--- configure.ac_orig	2015-01-31 15:55:07.102736249 -0500
+++ configure.ac	2015-02-01 13:23:47.715379636 -0500
+@@ -135,7 +135,7 @@
 AM_WITH_GUILE(, [echo optional guile\?],,)
 if test x$coot_guile = xtrue ; then
    GUILE_FLAGS
--- a/coot-lbg.patch
+++ b/coot-lbg.patch
@ -1,11 +0,0 @@
--- lbg/lbg.cc_orig	2016-11-09 21:27:32.074363190 -0500
-+++ lbg/lbg.cc	2016-11-09 21:27:47.836327788 -0500
-@@ -4873,7 +4873,7 @@
-       } 
-    } else {
- 
-      PyObject *pName = PyString_FromString("lidia.fetch");
-+      PyObject *pName = PyString_FromString("coot.lidia.fetch");
-       PyObject *pModule = PyImport_Import(pName);
-       if (pModule == NULL) {
- 	 std::cout << "NULL pModule" << std::endl;
--- a/coot-makefile.patch
+++ b/coot-makefile.patch
@ -1,19 +1,36 @@
--- src/Makefile.am_orig	2016-11-09 16:13:53.942706012 -0500
-+++ src/Makefile.am	2016-11-09 16:15:08.263956290 -0500
-@@ -457,7 +457,9 @@
-    EXTRA_DIST += coot_wrap_python_pre.cc 
- endif
- if COOT_USE_PYTHON
-   dist_python_PYTHON = coot.py coot.pth
-+   # dist_python_PYTHON = coot.py coot.pth
-+   pythondir = $(pkgdatadir)/python
-+   dist_pkgpython_SCRIPTS = coot.py
+--- src/Makefile.am_orig	2015-06-29 23:10:49.500572880 -0400
+++ src/Makefile.am	2015-06-29 23:11:33.041822617 -0400
+@@ -27,9 +27,8 @@
+ #__init__.py: coot.py
+ #	cp coot.py __init__.py
+ 
+-
+-dist_python_SCRIPTS = coot.py coot.pth
+-
+pythondir = $(pkgdatadir)/python
+dist_pkgpython_SCRIPTS = coot.py
+ 
 endif
 
+--- pixmaps/icons/Makefile.am_orig	2015-06-29 23:11:55.713911249 -0400
+++ pixmaps/icons/Makefile.am	2015-06-29 23:26:22.902239461 -0400
+@@ -11,6 +11,6 @@
+ 		CONTEXT=` echo $$icon | cut -d_ -f2`; \
+ 		SIZE=`    echo $$icon | cut -d_ -f3`; \
+ 		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+-		mkdir -p $(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+-		$(INSTALL_DATA) $(srcdir)/$$icon $(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ 	done;
+--- lbg/Makefile.am_orig	2015-09-24 23:04:49.843200580 -0400
+++ lbg/Makefile.am	2015-09-24 23:10:03.355713678 -0400
+@@ -1,4 +1,3 @@
+-
+ lib_LTLIBRARIES=libcoot-lidia.la
 
--- lbg/Makefile.am_orig	2016-11-09 16:46:09.161705178 -0500
-+++ lbg/Makefile.am	2016-11-09 21:51:45.630944576 -0500
-@@ -73,8 +73,8 @@
+ AM_CPPFLAGS = \
+@@ -53,8 +52,8 @@
 # I don't understand.  Maybe the setting of wl should be done in configure?  But then
 # I have to force the output of libtool.  Bleugh.  Hmm...
 # Anyway, thankyou Gary Vaughan.
@ -24,12 +41,3 @@
 
 # res spec output operator means we include libcoot-coord-utils
 # (if that is annoying, then remove it and expand it by hand)
-@@ -106,7 +106,7 @@
- test_srs_standalone_SOURCES = test-srs-standalone.cc
- test_srs_standalone_LDADD = $(CCP4SRS_LIBS) $(MMDB_LIBS)
- 
-pkgpythondir=$(pythondir)/lidia
-+pkgpythondir=$(pythondir)/coot/lidia
- 
- dist_pkgpython_PYTHON = \
-     __init__.py fetch.py
--- a/coot-rdkit.patch
+++ b/coot-rdkit.patch
@ -1,11 +0,0 @@
--- lbg/lbg-search.cc_orig	2016-11-09 18:29:44.870809951 -0500
-+++ lbg/lbg-search.cc	2016-11-09 18:42:43.549933656 -0500
-@@ -34,7 +34,7 @@
- #include "geometry/srs-interface.hh"
- #ifdef RDKIT_HAS_CAIRO_SUPPORT
- #include <cairo.h>
-#include <MolDraw2DCairo.h>
-+#include <GraphMol/MolDraw2D/MolDraw2DCairo.h>
- #include "lidia-core/rdkit-interface.hh"
- #else
- #include "lidia-core/rdkit-interface.hh"
--- a/coot-unistd.patch
+++ b/coot-unistd.patch
@ -0,0 +1,12 @@
+--- utils/coot-utils.cc_orig	2012-09-29 19:16:39.050470149 -0700
+++ utils/coot-utils.cc	2012-09-29 19:18:01.609169266 -0700
+@@ -48,9 +48,7 @@
+ 
+ #include <sys/stat.h>   // for mkdir
+ #include <sys/types.h>
+-#if defined WINDOWS_MINGW
+ #include <unistd.h>   // BL says: in windows needed for mkdir
+-#endif // MINGW
+ 
+ // #include "clipper/core/hkl_compute.h"
+ 
--- a/coot-user-manual.texi.patch
+++ b/coot-user-manual.texi.patch
@ -0,0 +1,33 @@
+--- doc/coot-user-manual.texi_orig	2013-12-27 15:59:56.897931023 -0800
+++ doc/coot-user-manual.texi	2013-12-27 16:22:22.207559590 -0800
+@@ -47,7 +47,7 @@
+ 
+ @vskip 10mm
+ 
+-@image{coot-plain-2,127mm}
+@c @image{coot-plain-2,127mm}
+ 
+      
+ @c The following two commands start the copyright page. 
+@@ -4951,10 +4951,10 @@
+ @c note that texi2html (and makeinfo) requires that this c-interface texi file be in the 
+ @c same directory as this file (user-manual.texi) NOT the directory that 
+ @c texi2html is run in.
+-@include c-interface.h.texi
+@c @include c-interface.h.texi
+ @node    More Scripting Functions
+ @chapter More Scripting Functions
+-@include cc-interface.hh.texi
+@c @include cc-interface.hh.texi
+ 
+ 
+ 
+@@ -4972,7 +4972,7 @@
+ @c nodes (mutate, povray) and (e.g.) `tips-gui', but has no menu entry for this node
+ @c
+ 
+-@include coot-scheme-functions.texi
+@c @include coot-scheme-functions.texi
+ 
+ 
+ 
--- a/coot-utils.patch
+++ b/coot-utils.patch
@ -1,5 +1,16 @@
--- coot-utils/coot-shelx.hh_orig	2016-04-07 22:05:10.753625059 -0400
-+++ coot-utils/coot-shelx.hh	2016-04-07 22:05:43.366973568 -0400
+--- coot-utils/Makefile.am_orig	2015-09-24 22:00:00.826912149 -0400
+++ coot-utils/Makefile.am	2015-09-24 22:02:42.329117367 -0400
+@@ -116,7 +116,7 @@
+ 
+ 
+ # test-agg-clust
+-check_PROGRAMS = test-h-bonds testshelxreader testcootutils test-hole test-elastic test-spherical glyco-torsions test-tt-morph
+check_PROGRAMS = test-h-bonds testshelxreader testcootutils test-hole test-elastic test-spherical glyco-torsions
+ 
+ # testshelxreader fails to link for some reason! coot::protein_geometry::get_h_bond_type 
+ # testcootutils also.  20100812 Fixed now - added libcoot-geometry.la
+--- coot-utils/coot-shelx.hh_orig	2015-09-24 22:00:31.889296059 -0400
+++ coot-utils/coot-shelx.hh	2015-09-24 22:01:54.006864161 -0400
@@ -33,6 +33,7 @@
 
 #include <mmdb2/mmdb_manager.h>
@ -8,10 +19,10 @@
 
 namespace coot {
 
--- coot-utils/coot-hole.hh_orig	2016-04-07 22:05:55.561054355 -0400
-+++ coot-utils/coot-hole.hh	2016-04-07 22:06:16.954432665 -0400
-@@ -4,6 +4,7 @@
- #include "clipper/core/xmap.h"
+--- coot-utils/coot-hole.hh_orig	2015-09-24 22:00:39.574533094 -0400
+++ coot-utils/coot-hole.hh	2015-09-24 22:02:06.645417847 -0400
+@@ -3,6 +3,7 @@
+ #include "clipper/core/coords.h"
 #include "clipper/core/nxmap.h"
 
 +#include "coot-map-utils.hh"
--- a/coot.desktop
+++ b/coot.desktop
@ -7,4 +7,4 @@ Exec=coot
 Icon=coot
 Terminal=false
 Type=Application
-Categories=Graphics;Science;Chemistry;
+Categories=Graphics;Science
--- a/coot.png
+++ b/coot.png
--- a/coot.spec
+++ b/coot.spec
@ -1,35 +1,28 @@
-%global refmac_dictionary %(rpm -q --queryformat '%%{name}-%%{version}' refmac-dictionary)
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define refmac_dictionary %(rpm -q --queryformat '%%{name}-%%{version}' refmac-dictionary)
 Name: coot
 Summary: The crystallographic object-oriented toolkit
 URL: http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/
-Version: 0.8.8
-Release: 5%{?dist}
-# source code is mixed GPLv3+ and LGPLv2+ (see files for breakdown)
-License: GPLv3+
+Version: 0.8.2
+Release: 1%{?dist}
+# source code is mixed GPLv3+ and LGPLv2+ (see %files for breakdown)
+License: GPLv3+ and LGPLv2+
 Group: Applications/Engineering
 Source0: http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/releases/%{name}-%{version}.tar.gz
-# additional files for reference/libraries used in main binary
 Source1: http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/dependencies/reference-structures.tar.gz
 Source2: coot.in
 Source3: %{name}.desktop
 Source4: __init__.py
-# don't use broken guile_lib autoconf macro
 Patch0: coot-configure.ac.patch
-# fix location of python files and remove hard coding of -Wl
-Patch1: coot-makefile.patch
-# fix to use guile1.8 config in autoconf script
-Patch2: coot-guile.patch
-# fix to includes so build completes
-Patch3: coot-utils.patch
-# proper include for rdkit
-Patch4: coot-rdkit.patch
-# Fix for moving python files to coot/lidia
-Patch5: coot-lbg.patch
+Patch1: coot-user-manual.texi.patch
+Patch2: coot-makefile.patch
+Patch3: coot-guile.patch
+Patch4: coot-appdata.patch
+Patch5: coot-utils.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: clipper-devel >= 2.1-7
 BuildRequires: desktop-file-utils
-BuildRequires: doxygen
 BuildRequires: libappstream-glib
 BuildRequires: freeglut-devel
 BuildRequires: goocanvas-devel
@ -43,22 +36,20 @@ BuildRequires: libcurl-devel
 BuildRequires: libgnomecanvas-devel
 BuildRequires: libtool
 BuildRequires: mmdb2-devel
-BuildRequires: python2-devel
-BuildRequires: python2-rdkit
+BuildRequires: python-devel
 BuildRequires: pygtk2-devel
-BuildRequires: rdkit-devel
 BuildRequires: refmac-dictionary
 BuildRequires: ssm-devel
 BuildRequires: swig
+%if 0%{?rhel}
+BuildRequires: tetex-latex
+%else
 BuildRequires: tex(latex)
+%endif
 BuildRequires: texinfo-tex
 BuildRequires: ghostscript
 Requires: compat-guile18
-Requires: hicolor-icon-theme
 Requires: refmac-dictionary
-Requires: %{name}-data = %{version}-%{release}
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
-Requires: python2-%{name}%{?_isa} = %{version}-%{release}

 %description

@ -68,49 +59,20 @@ GUI builder glade), mmdb, clipper, and OpenGL, together with a new
 approach to map contouring and importing/creation and other modeling
 and building operations.

-%package data
-Summary: Data files for coot
-Group: Applications/Engineering
-BuildArch: noarch
-
-%description data
-
-The coot-data package contains all the support files for coot, such
-as reference structures, rotamer libraries, etc.
-
-%package -n libcoot
-Summary: Library files for coot
-Group: Development/Libraries
-
-%description -n libcoot
-
-This package contains library files needed for program development
-using the coot macromolecular model building package.
-
-%package -n libcoot-devel
+%package devel
 Summary: Header files and library for developing programs with coot
-Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
-
-%description -n libcoot-devel
-
-This package contains header files needed for program development
-using the coot macromolecular model building package.
-
-%package -n python2-%{name}
-%{?python_provide:%python_provide python2-%{name}}
-Summary: Python support for coot
+Requires: %{name} = %{version}-%{release}
 Group: Development/Libraries

-%description -n python2-%{name}
+%description devel

-This package contains python specific library files needed for
-coot to provide support for and interface with the python shell
+This package contains libraries and header files needed for program
+development using the coot macromolecular model building package.

 %package doc
 Summary: documentation PDF files for coot
+Requires: %{name} = %{version}-%{release}
 Group: Applications/Engineering
-BuildArch: noarch

 %description doc

@ -133,7 +95,6 @@ cp %{SOURCE3} .
 # various cleanups
 iconv -f iso8859-1 -t utf-8 README > README.conv && mv -f README.conv README

-rm macros/libtool.m4
 aclocal -I macros
 libtoolize --automake --copy
 autoconf
@ -141,177 +102,96 @@ automake --copy --add-missing --gnu

 %build
 mkdir guile
-%configure --with-guile --with-python --with-pygtk --disable-static CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" --with-enhanced-ligand-tools RDKIT_LIBS="-lMolDraw2D -lForceFieldHelpers -lDescriptors -lForceField -lSubstructMatch -lOptimizer -lDistGeomHelpers -lDistGeometry -lAlignment -lEigenSolvers -lDepictor -lMolChemicalFeatures -lFileParsers  -lRDGeometryLib -lGraphMol -lSmilesParse -lDataStructs -lRDGeneral -lboost_python -lpython2.7" RDKIT_CXXFLAGS="-I%{_includedir}/rdkit -DRDKIT_HAS_CAIRO_SUPPORT"
-
-# remove rpath, direct-shlib-dep
+# -D_GLIBCXX_USE_CXX11_ABI=0 ? -std=c++11
+%configure --with-guile --with-python --with-pygtk --with-goocanvas-prefix=/usr --disable-static CPPFLAGS="-I/usr/include/mmdb2 -I/usr/include/ssm" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" GUILE_LOAD_PATH="$GUILE_LOAD_PATH:/tmp/guile"
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
-# sed -i "s|ofile='libtool'|ofile='libtool.foo'|" config.status
-sed -i 's|$(SHELL) ./config.status;; \\|echo "skipping";; \\|' Makefile
-cp libtool libtool.tdf

 make %{?_smp_mflags}
-pushd src
-doxygen coot-dox.cfg
-popd
 pushd doc
-make coot-user-manual.pdf
+texi2pdf coot-user-manual.texi
 make coot-keys-and-buttons.pdf
 popd

 %install
+rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL='install -p'

 mv reference-structures %{buildroot}%{_datadir}/coot/

-sed -i 's|COOT_PYTHON_DIR=|COOT_PYTHON_DIR=%{python2_sitelib}/coot|' src/coot
+sed -i 's|COOT_PYTHON_DIR=|COOT_PYTHON_DIR=%{python_sitelib}/coot|' src/coot
 sed -i 's|COOT_REFMAC_LIB_DIR=|COOT_REFMAC_LIB_DIR=%{_datadir}/%{refmac_dictionary}|' src/coot
 install -p -m 755 src/coot %{buildroot}%{_bindir}/

 # remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_libdir}/*.la
-rm -f %{buildroot}%{python2_sitearch}/*.la
+
+# headers
+# mkdir %{buildroot}%{_includedir}/coot
+# mv %{buildroot}%{_includedir}/*.h %{buildroot}%{_includedir}/coot/
+# mv %{buildroot}%{_includedir}/*.hh %{buildroot}%{_includedir}/coot/

 # python stuff
-for lib in $(find %{buildroot}%{python2_sitelib}/coot/ -name "*.py"); do
+# mkdir -p %{buildroot}%{python_sitelib}/coot
+# mv %{buildroot}%{_datadir}/coot/python/* %{buildroot}%{python_sitelib}/coot/
+for lib in $(find %{buildroot}%{python_sitelib}/coot/ -name "*.py"); do
 sed '/\/usr\/bin\/env/d' $lib > $lib.new &&
 touch -r $lib $lib.new &&
 mv $lib.new $lib
 done
-cp %{SOURCE4} %{buildroot}%{python2_sitelib}/coot/
-chmod 644 %{buildroot}%{python2_sitelib}/coot/coot.py
+cp %{SOURCE4} %{buildroot}%{python_sitelib}/coot/
+chmod 644 %{buildroot}%{python_sitelib}/coot/coot.py

 # desktop file
 desktop-file-install --vendor='' --dir=%{buildroot}%{_datadir}/applications coot.desktop
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml

+%clean
+rm -rf %{buildroot}
+
+%check
+make check
+# %{buildroot}%{_bindir}/coot-real --no-graphics --script python-tests/coot_unittest.py
+
 %post
+/sbin/ldconfig
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

-%post -n libcoot -p /sbin/ldconfig
-
 %postun
+/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi

-%postun -n libcoot -p /sbin/ldconfig
-
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

 %files
+%defattr(-,root,root,-)
+%doc AUTHORS README COPYING
 %{_bindir}/*
 %{_libexecdir}/*
+# libccp4mg-utils.so* is LGPLv2+
+# libcoot-surface.so* is a mix of LGPLv2+ and GPLv3+
+# all others are GPLv3+ 
+%{_libdir}/*.so.*
+%{_datadir}/coot/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/appdata/%{name}.appdata.xml
-%{_datadir}/icons/hicolor/48x48/apps/coot.png
-%{_datadir}/icons/hicolor/64x64/apps/coot.png
-%{_datadir}/icons/hicolor/96x96/apps/coot.png
-%{_datadir}/icons/hicolor/256x256/apps/coot.png
-%{_datadir}/icons/hicolor/scalable/apps/coot.svg
-%{_mandir}/man1/*
+%{_datadir}/icons/hicolor/
+%{python_sitelib}/coot/

-%files data
-%{_datadir}/coot/
-
-%files -n libcoot
-%doc AUTHORS README
-%license COPYING
-# GPLv3+ 
-%{_libdir}/*.so.*
-
-%files -n python2-%{name}
-%{python2_sitelib}/coot/
-%{python2_sitearch}/*.so.*
-%{python2_sitearch}/*.so
-
-%files -n libcoot-devel
+%files devel
+%defattr(-,root,root,-)
 %{_libdir}/*.so
 %{_includedir}/coot/

 %files doc
-%license COPYING
+%defattr(-,root,root,-)
 %doc doc/coot-keys-and-buttons.pdf doc/coot-user-manual.pdf

 %changelog
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jul 24 2017 Björn Esser <besser82@fedoraproject.org> - 0.8.8-3
- Rebuilt for Boost 1.64
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Sat Mar 18 2017 Tim Fenn <tim.fenn@gmail.com> - 0.8.8-1
- update to 0.8.8
-
-* Thu Feb 09 2017 Tim Fenn <tim.fenn@gmail.com> - 0.8.7-6
- Fix to requires
-
-* Wed Feb 08 2017 Kalev Lember <klember@redhat.com> - 0.8.7-5
- Rebuilt for Boost 1.63
-
-* Sun Feb 05 2017 Tim Fenn <tim.fenn@gmail.com> - 0.8.7-4
- add missing patch
-
-* Thu Jan 26 2017 Tim Fenn <tim.fenn@gmail.com> - 0.8.7-3
- rename python2 package
- add python_provide macro
- remove hardcoded library path include
-
-* Sat Nov 12 2016 Tim Fenn <tim.fenn@gmail.com> - 0.8.7-2
- test build for fixing unused-shlib and weak-sybmol
-
-* Sun Nov 06 2016 Tim Fenn <tim.fenn@gmail.com> - 0.8.7-1
- update to 0.8.7
- fix requires in devel packages
- make coot-data noarch
- remove macros and lingering ldconfig calls
-
-* Tue Nov 01 2016 Tim Fenn <tim.fenn@gmail.com> - 0.8.6.2-2
- move license and doc files to libcoot
- remove spurious ldconfig
- split out python files and data to separate packages and add requires
-
-* Sat Oct 22 2016 Tim Fenn <tim.fenn@gmail.com> - 0.8.6.2-1
- update to 0.8.6.2
- add rdkit support (and patch to fix it)
- change define to global
- fix hicolor requires and png files
- fix shlib dep
- remove outdated autoconf macro
-
-* Fri Oct 14 2016 Tim Fenn <tim.fenn@gmail.com> - 0.8.6.1-3
- remove unecessary rhel only macros
- put doc in noarch
-
-* Fri Oct 07 2016 Tim Fenn <tim.fenn@gmail.com> - 0.8.6.1-2
- include description of patches
- python-devel to python2-devel BR
- remove python-sitelib macro (use system defined version)
-
-* Fri Aug 26 2016 Tim Fenn <tim.fenn@gmail.com> - 0.8.6.1-1
- update to 0.8.6.1
-
-* Sat Jul 30 2016 Tim Fenn <tim.fenn@gmail.com> - 0.8.5-1
- update to 0.8.5
-
-* Thu Apr 07 2016 Tim Fenn <tim.fenn@gmail.com> - 0.8.3-1
- Update to 0.8.3
-
-* Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 0.8.2-3
- Rebuild for gsl 2.1
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
 * Mon Sep 7 2015 Tim Fenn <tim.fenn@gmail.com> - 0.8.2-1
 - update to 0.8.2
 - add patch for coot-utils
--- a/dead.package
+++ b/dead.package
@ -1,3 +0,0 @@
-2016-05-31: Retired because of broken deps in preparation of Fedora 24
-Reference: https://fedorahosted.org/rel-eng/ticket/6416
-
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (coot-0.8.8.tar.gz) = 6d99e4bc0a5cd17b46bd52741b934e98e98eec9fe5a9fd108e891834256e17cc03eb12327aa6756beff4ce552456ae5e8a0ee459ecf3894a99809be218481b83
-SHA512 (reference-structures.tar.gz) = 7ebe28a619a577b18fc66e714f0bc8347121ebb12f372ac29c1d2d96013e608632921ea26caea3b62744252ae356949de8e04a6513f1a1e0ba30865708c26ffe
+71a6653bedff7c764dea38289ef0e65c  coot-0.8.2.tar.gz
+257ab90d44f1c877ada96720dbb87c13  reference-structures.tar.gz