- updated to 0.3.3

- removed obsolete Various-CMake-patches-from-the-mailing-list patch
- added python3 binding

diff --git a/0060-Various-CMake-patches-from-the-mailing-list.patch b/0060-Various-CMake-patches-from-the-mailing-list.patch
deleted file mode 100644 (file)
index 312b540..0000000
--- a/0060-Various-CMake-patches-from-the-mailing-list.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From bba9aa37c899999fca01101a8ed271a3aa9d82b7 Mon Sep 17 00:00:00 2001
-From: Sebastian Kraft <mail@sebastiankraft.net>
-Date: Sat, 16 Jan 2016 15:42:57 +0100
-Subject: [PATCH 060/113] Various CMake patches from the mailing list
-
-- Add GLIB2 libray path to link directories
-- Enable -msseX compiler switch for Clang
-- Set -mseeX switch only for files with SSE code
-- Do not enable SSE optimizations on non-x86 hardware by default
----
- CMakeLists.txt              | 19 +++++++++++++------
- libs/lensfun/CMakeLists.txt |  5 +++++
- 2 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 21f082b..b85656c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,12 +31,18 @@ IF(NOT HAVE_REGEX_H)
-   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libs/regex)
- ENDIF()
- 
-+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "[XxIi][0-9]?86|[Aa][Mm][Dd]64")
-+  SET(X86_ON ON)
-+else()
-+  SET(X86_ON OFF)
-+ENDIF()
-+
- # options controlling the build process
- OPTION(BUILD_STATIC "Build static library" OFF)
- OPTION(BUILD_TESTS "Build test suite" OFF)
- OPTION(BUILD_LENSTOOL "Build the lenstool (requires libpng)" OFF)
--OPTION(BUILD_FOR_SSE "Build with support for SSE" ON)
--OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" ON)
-+OPTION(BUILD_FOR_SSE "Build with support for SSE" ${X86_ON})
-+OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" ${X86_ON})
- OPTION(BUILD_DOC "Build documentation with doxygen" OFF)
- OPTION(INSTALL_HELPER_SCRIPTS "Install various helper scripts" ON)
- 
-@@ -62,14 +68,14 @@ ENDIF()
- 
- IF(BUILD_FOR_SSE)
-   SET(VECTORIZATION_SSE 1)
--  IF(CMAKE_COMPILER_IS_GNUCXX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
-+  IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-+    SET(VECTORIZATION_SSE_FLAGS "-msse")
-   ENDIF()
- ENDIF()
- IF(BUILD_FOR_SSE2)
-   SET(VECTORIZATION_SSE2 1)
--  IF(CMAKE_COMPILER_IS_GNUCXX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
-+  IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-+    SET(VECTORIZATION_SSE2_FLAGS "-msse2")
-   ENDIF()
- ENDIF()
- 
-@@ -97,6 +103,7 @@ ELSE()
- ENDIF()
- 
- INCLUDE_DIRECTORIES(SYSTEM ${GLIB2_INCLUDE_DIRS})
-+LINK_DIRECTORIES(${GLIB2_LIBRARY_DIRS})
- 
- 
- IF(BUILD_STATIC)
-diff --git a/libs/lensfun/CMakeLists.txt b/libs/lensfun/CMakeLists.txt
-index 6beadec..b0ca638 100644
---- a/libs/lensfun/CMakeLists.txt
-+++ b/libs/lensfun/CMakeLists.txt
-@@ -9,6 +9,11 @@ IF(WIN32)
-   LIST(APPEND LENSFUN_SRC windows/auxfun.cpp)
- ENDIF()
- 
-+SET_SOURCE_FILES_PROPERTIES(mod-color-sse.cpp mod-coord-sse.cpp
-+  PROPERTIES COMPILE_FLAGS "${VECTORIZATION_SSE_FLAGS}")
-+SET_SOURCE_FILES_PROPERTIES(mod-color-sse2.cpp
-+  PROPERTIES COMPILE_FLAGS "${VECTORIZATION_SSE2_FLAGS}")
-+
- IF(BUILD_STATIC)
-   ADD_LIBRARY(lensfun STATIC ${LENSFUN_SRC})
- ELSE()
--- 
-2.7.4
-

diff --git a/lensfun.spec b/lensfun.spec
index db1f8d13472a0f35818d61f009e2f916f7507b7d..89e9968c97aa62e04b51a236f185ba59f9de4e87 100644 (file)
--- a/lensfun.spec
+++ b/lensfun.spec
@@ -13,13 +13,13 @@
 Summary:       Camera lens database with image correction support
 Summary(pl.UTF-8):     Baza danych obiektywów z funkcją korekcji zdjęć
 Name:          lensfun
-Version:       0.3.2
-Release:       2
+Version:       0.3.3
+Release:       1
 License:       LGPL v3 (library), CC-BY-SA v3.0 (lens database)
 Group:         Libraries
-Source0:       http://downloads.sourceforge.net/lensfun/%{name}-%{version}.tar.gz
-# Source0-md5: 247e59a0812ec451f6cd0d20b3379cb5
-Patch0:                0060-Various-CMake-patches-from-the-mailing-list.patch
+#Source0Download: https://github.com/lensfun/lensfun/releases
+Source0:       https://github.com/lensfun/lensfun/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 04e0b58fd685ee680b0d70d61f0a5c17
 URL:           http://lensfun.sourceforge.net/
 BuildRequires: cmake >= 2.8
 BuildRequires: docutils
@@ -29,7 +29,9 @@ BuildRequires:        libpng-devel >= 1.0
 BuildRequires: libstdc++-devel
 BuildRequires: make >= 3.81
 BuildRequires: pkgconfig
-BuildRequires: python
+BuildRequires: python3
+BuildRequires: python3-modules >= 1:3.2
+BuildRequires: python3-setuptools
 BuildRequires: rpmbuild(macros) >= 1.605
 BuildRequires: zlib-devel >= 1.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,13 +72,27 @@ lensfun API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki lensfun.
 
+%package -n python3-lensfun
+Summary:       Python 3 interface to lensfun
+Summary(pl.UTF-8):     Interfejs Pythoan 3 do lensfun
+Group:         Libraries/Python
+Requires:      %{name} = %{version}-%{release}
+
+%description -n python3-lensfun
+Python 3 interface to lensfun.
+
+%description -n python3-lensfun -l pl.UTF-8
+Interfejs Pythoan 3 do lensfun.
+
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' apps/lensfun-{add-adapter,update-data}
 %{__sed} -i -e '1s,/usr/bin/env sh,%{__sh},' apps/g-lensfun-update-data
 
+# disable, will run manually with our args
+%{__sed} -i -e '/INSTALL(.*SETUP_PY.*install/d' apps/CMakeLists.txt
+
 %build
 install -d build
 cd build
@@ -92,9 +108,14 @@ cd build
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} -C build install/fast \
        DESTDIR=$RPM_BUILD_ROOT
 
+cd build/apps
+%py3_install
+cd ../..
+
 # packaged as %doc in -apidocs
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
@@ -126,3 +147,8 @@ rm -rf $RPM_BUILD_ROOT
 %files apidocs
 %defattr(644,root,root,755)
 %doc build/doc_doxygen/*
+
+%files -n python3-lensfun
+%defattr(644,root,root,755)
+%{py3_sitescriptdir}/lensfun
+%{py3_sitescriptdir}/lensfun-%{version}-py*.egg-info