raphgro pushed to jpype-py3 (master). "add GPLv2, remove wrong sitearch macro, make tests work"

[notifications at fedoraproject.org]

>From 2ca4825d7722b57969792b2847a4e7eee539935f Mon Sep 17 00:00:00 2001
From: Raphael Groner <projects.rg at smart.ms>
Date: Thu, 23 Apr 2015 18:34:51 +0200
Subject: add GPLv2, remove wrong sitearch macro, make tests work


diff --git a/jpype-py3.spec b/jpype-py3.spec
index 77fa768..dab5ea9 100644
--- a/jpype-py3.spec
+++ b/jpype-py3.spec
@@ -4,15 +4,13 @@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global module jpype
 
-# define sitearch for EPEL
-%{!?python3_sitearch: %global python3_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
 Name:           %{module}-py3
 Version:        0
-Release:        0.1.%{date}git%{shortcommit}%{?dist}
+Release:        0.2.%{date}git%{shortcommit}%{?dist}
 Summary:        JPype allows Python3 programs full access to Java class libraries
 
-License:        ASL 2.0
+# GPLv2 for files from JDK (jni_md.h) and Python (capsulethunk.h)
+License:        ASL 2.0 and GPLv2
 URL:            https://github.com/tcalmant/%{name}
 Source0:        %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz
 
@@ -55,13 +53,9 @@ find %{buildroot}%{python3_sitearch} -name '*.so' |xargs chmod 0755
 %check
 pushd tests
 ant test
-# FIXME fake a module installation
-mkdir sitearch
-cp -ap %{buildroot}%{python3_sitearch}/%{module} sitearch
-cp -p %{buildroot}%{python3_sitearch}/_%{module}*.so sitearch
-sed -i 's,import %{module},from sitearch \0,' %{module}test/__init__.py
-sed -i 's,import _%{module},from sitearch \0,' sitearch/%{module}/_j*.py
-#%{__python3} testsuite.py
+# fake a module installation
+export PYTHONPATH=%{buildroot}%{python3_sitearch}
+%{__python3} testsuite.py
 popd
 
  
@@ -69,10 +63,15 @@ popd
 %license LICENSE.txt
 %doc README.rst
 %doc examples/
-#%doc tests/
+%doc tests/
 %{python3_sitearch}/*
 
 
 %changelog
+* Thu Apr 23 2015 Raphael Groner <projects.rg at smart.ms> - 0-0.2.20150202gitca6fc96
+- add GPLv2 for bundled source files
+- remove wrong sitearch macro
+- make tests work
+
 * Thu Apr 02 2015 Raphael Groner <projects.rg at smart.ms> - 0-0.1.20150202gitca6fc96
 - initial
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/jpype-py3.git/commit/?h=master&id=2ca4825d7722b57969792b2847a4e7eee539935f