diff --git a/.gitignore b/.gitignore index abb86d3..9ef1e7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /COPASI-3bc4e909636d7ec353b683819c5a6bbc209838aa.zip /COPASI-7b0f05cea47a8cc712e78672c325096e3f6c5bd4.zip /COPASI-31a97864d72e40f94cf1230af5f593543d1e23c7.zip +/COPASI-Build-123.tar.gz diff --git a/COPASI.spec b/COPASI.spec index 9957f51..65b2d33 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -1,10 +1,10 @@ -%global checkout 31a97864d72e40f94cf1230af5f593543d1e23c7 -%global date 20160720 +%global checkout 7c2623a5bc0c80aa6d1852ccb5c097e6d46b6ee4 +%global date 20160909 %global with_python2 1 %global with_python3 1 -%ifarch s390 s390x %{arm} aarch64 ppc64 ppc64le +%ifarch s390 s390x %{arm} aarch64 %{power64} %global with_java 0 %else %global with_java 1 @@ -39,7 +39,7 @@ Name: COPASI Summary: Biochemical network simulator Version: 4.17 -Release: 0.7.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} +Release: 0.8.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} ##Artistic 2.0 is main license ##GPLv2+ is related to a Mixed Source Licensing Scenario @@ -51,7 +51,7 @@ Release: 0.7.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} ##Any files with different licenses are not involved License: Artistic 2.0 and GPLv3+ and BSD URL: http://copasi.org/ -Source0: https://github.com/copasi/COPASI/archive/%{checkout}.zip#/%{name}-%{checkout}.zip +Source0: https://github.com/copasi/COPASI/archive/Build-123.tar.gz#/%{name}-Build-123.tar.gz %if 0%{?with_qwt6} BuildRequires: qwt-devel @@ -223,7 +223,7 @@ BuildArch: noarch COPASI HTML documentation and examples. %prep -%setup -q -n %{name}-%{checkout} +%setup -q -n %{name}-Build-123 ##This an old and obsolete license file rm -f license.txt @@ -416,16 +416,12 @@ EOF mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < - %{name}.desktop CC0-1.0 The COPASI graphical user interface COPASI Artistic-2.0 and GPL-3.0+ and BSD - - - Science @@ -453,7 +449,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <https://sagitter.fedorapeople.org/copasi.png - support_at_copasi.org + sagitter_at_fedoraproject.org EOF @@ -540,7 +536,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appda %{_datadir}/copasi/doc/ %changelog -* Tue Aug 17 2016 Antonio Trande 4.17-0.7.20160720git31a978 +* Sun Sep 11 2016 Antonio Trande 4.17-0.8.20160909git7c2623 +- Update to build-123 + +* Wed Aug 17 2016 Antonio Trande 4.17-0.7.20160720git31a978 - Rebuild for Python 3.5.2 * Wed Jul 27 2016 Antonio Trande 4.17-0.6.20160720git31a978 diff --git a/sources b/sources index 2de7926..84539e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -315bb8a803f74e6f253dadc9bcc057da COPASI-31a97864d72e40f94cf1230af5f593543d1e23c7.zip +6dbfdeefda51f10dfb512a6203f9a16f COPASI-Build-123.tar.gz