[packages/vigra] - new URLs, updated to 1.11.1 (note: new soname) - updated python-install patch

qboosh qboosh at pld-linux.org
Sun Jun 25 18:47:33 CEST 2017


commit f3ba2ea66ca59a2beafedb89bc0a46ebbfc265de
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 25 18:48:56 2017 +0200

    - new URLs, updated to 1.11.1 (note: new soname)
    - updated python-install patch

 python-install.patch | 10 +++++-----
 vigra.spec           | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/vigra.spec b/vigra.spec
index 24e57ac..4022e50 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -1,16 +1,16 @@
-# TODO: [lib]lemon, WITH_LEMON
+# TODO: lemon support, WITH_LEMON
 Summary:	Generic Programming for Computer Vision
 Summary(pl.UTF-8):	Ogólne programowanie obrazu komputerowego
 Name:		vigra
-Version:	1.10.0
-Release:	13
+Version:	1.11.1
+Release:	1
 License:	MIT
 Group:		Libraries
 #Source0Download: http://ukoethe.github.io/vigra/#download
-Source0:	https://github.com/ukoethe/vigra/releases/download/Version-1-10-0/%{name}-%{version}-src-with-docu.tar.gz
-# Source0-md5:	85e2968e4ee5f9541b5dd8b3fb9cc433
+Source0:	https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/%{name}-%{version}-src.tar.gz
+# Source0-md5:	e72faf9fb82fa71fa63ba064bb63b703
 Patch0:		python-install.patch
-URL:		http://hci.iwr.uni-heidelberg.de/vigra/
+URL:		http://ukoethe.github.io/vigra/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	boost-python-devel >= 1.40.0
 BuildRequires:	cmake >= 2.6.0
@@ -19,7 +19,7 @@ BuildRequires:	fftw3-single-devel
 BuildRequires:	hdf5-devel >= 1.8
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 2:1.4.0
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 6:4.4
 BuildRequires:	libtiff-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python
@@ -140,7 +140,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc LICENSE.txt README.md
 %attr(755,root,root) %{_libdir}/libvigraimpex.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvigraimpex.so.5
+%attr(755,root,root) %ghost %{_libdir}/libvigraimpex.so.11
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/python-install.patch b/python-install.patch
index 58e0a87..26f15d2 100644
--- a/python-install.patch
+++ b/python-install.patch
@@ -1,11 +1,11 @@
---- vigra-1.10.0/config/FindVIGRANUMPY_DEPENDENCIES.cmake~	2013-11-18 17:48:16.000000000 +0100
-+++ vigra-1.10.0/config/FindVIGRANUMPY_DEPENDENCIES.cmake	2015-12-13 12:02:56.897894584 +0100
-@@ -70,7 +70,7 @@
+--- vigra-1.11.0/config/FindVIGRANUMPY_DEPENDENCIES.cmake.orig	2016-09-15 20:53:44.195804019 +0200
++++ vigra-1.11.0/config/FindVIGRANUMPY_DEPENDENCIES.cmake	2016-09-15 21:04:01.755796967 +0200
+@@ -138,7 +138,7 @@
      ######################################################################
      IF(NOT DEFINED VIGRANUMPY_INSTALL_DIR OR VIGRANUMPY_INSTALL_DIR MATCHES "^$")
          execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
--                         "from distutils.sysconfig import *; print get_python_lib(1)"
-+                         "from distutils.sysconfig import *; print get_python_lib(plat_specific=True, prefix='/usr')"
+-                         "from distutils.sysconfig import *; print(get_python_lib(1))"
++                         "from distutils.sysconfig import *; print(get_python_lib(plat_specific=True, prefix='/usr'))"
                            OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
          FILE(TO_CMAKE_PATH ${PYTHON_SITE_PACKAGES} VIGRANUMPY_INSTALL_DIR)
      ENDIF()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vigra.git/commitdiff/f3ba2ea66ca59a2beafedb89bc0a46ebbfc265de



More information about the pld-cvs-commit mailing list