The package rpms/libsedml.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libsedml.git/commit/?id=830ff9096....
Change:
-%ifarch %{ix86} x86_64 sparc sparcv9 ia64 %{arm} aarch64 alpha s390x ppc
Thanks.
Full change:
============
commit 940c4a23aeb5524f353847047d953e041d2280c4
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Tue May 25 18:47:58 2021 +0200
Pre-Release 2.0.20
diff --git a/.gitignore b/.gitignore
index cd86e52..2317906 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/libSEDML-0.4.3.tar.gz
/libSEDML-0.4.4.tar.gz
/libSEDML-2.0.19.tar.gz
+/libSEDML-2.0.20.tar.gz
diff --git a/libsedml.spec b/libsedml.spec
index 65ef4fc..c42d511 100644
--- a/libsedml.spec
+++ b/libsedml.spec
@@ -21,8 +21,8 @@
Name: libsedml
Summary: Library that fully supports SED-ML for SBML
-Version: 2.0.19
-Release: 0.2%{?dist}
+Version: 2.0.20
+Release: 0.1%{?dist}
Epoch: 2
URL:
https://github.com/fbergmann/libSEDML
Source0:
https://github.com/fbergmann/libSEDML/archive/v%{version}/libSEDML-%{vers...
@@ -44,13 +44,13 @@ BuildRequires: minizip-devel
BuildRequires: check-devel
%endif
-Obsoletes: python2-libsedml < 2:2.0.19-1
-Obsoletes: java-%{octpkg} < 2:2.0.19-1
-Obsoletes: libsedml-sharp < 2:2.0.19-1
-Obsoletes: octave-%{octpkg} < 2:2.0.19-1
-Obsoletes: perl-%{octpkg} < 2:2.0.19-1
-Obsoletes: ruby-%{octpkg} < 2:2.0.19-1
-Obsoletes: R-%{octpkg} < 2:2.0.19-1
+Obsoletes: python2-libsedml < 2:%{version}-1
+Obsoletes: java-%{octpkg} < 2:%{version}-1
+Obsoletes: libsedml-sharp < 2:%{version}-1
+Obsoletes: octave-%{octpkg} < 2:%{version}-1
+Obsoletes: perl-%{octpkg} < 2:%{version}-1
+Obsoletes: ruby-%{octpkg} < 2:%{version}-1
+Obsoletes: R-%{octpkg} < 2:%{version}-1
##This patch sets libraries' installation paths
Patch0: %{name}-2.0-fix_install_libpaths.patch
@@ -372,6 +372,9 @@ make test -C build
%endif
%changelog
+* Tue May 25 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 2:2.0.20-0.1
+- Pre-Release 2.0.20
+
* Sat May 22 2021 Jitka Plesnikova <jplesnik(a)redhat.com> - 2:2.0.19-0.2
- Perl 5.34 rebuild
diff --git a/sources b/sources
index 4816286..b512132 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libSEDML-2.0.19.tar.gz) =
640547d3ce37a9b4a65fc000285acd94d0a7ed5c1aa7c9a0baff38e393d2cde97d29e541b43899543589b9a915b597d920f844516da3f563a9eba1d6e72a6750
+SHA512 (libSEDML-2.0.20.tar.gz) =
4b1b5941569656c6170369d12b95c46f60e2bd65110aed51b3edde61e7c26b2791a13457050233938b7a2557730150d9adc5fcd0f43fa4e0f7b09760c602dd4c
commit 75b17437e3c87abff5c98d9c95da01a639edfa75
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Sun May 23 01:50:38 2021 +0200
Perl 5.34 rebuild
diff --git a/libsedml.spec b/libsedml.spec
index b3fcbd2..65ef4fc 100644
--- a/libsedml.spec
+++ b/libsedml.spec
@@ -22,7 +22,7 @@
Name: libsedml
Summary: Library that fully supports SED-ML for SBML
Version: 2.0.19
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
Epoch: 2
URL:
https://github.com/fbergmann/libSEDML
Source0:
https://github.com/fbergmann/libSEDML/archive/v%{version}/libSEDML-%{vers...
@@ -372,6 +372,9 @@ make test -C build
%endif
%changelog
+* Sat May 22 2021 Jitka Plesnikova <jplesnik(a)redhat.com> - 2:2.0.19-0.2
+- Perl 5.34 rebuild
+
* Thu May 13 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 2:2.0.19-0.1
- Pre-Release 2.0.19
commit 830ff90965feeca94dc25e202bd5585be1510158
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Fri May 14 20:05:59 2021 +0200
Pre-Release 2.0.19
diff --git a/.gitignore b/.gitignore
index 8854d1b..cd86e52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/libSEDML-v.0.3.1.tar.gz
/libSEDML-0.4.3.tar.gz
/libSEDML-0.4.4.tar.gz
+/libSEDML-2.0.19.tar.gz
diff --git a/libsedml-fix_install_libpaths.patch
b/libsedml-2.0-fix_install_libpaths.patch
similarity index 64%
rename from libsedml-fix_install_libpaths.patch
rename to libsedml-2.0-fix_install_libpaths.patch
index 27c3d3f..89d2da1 100644
--- a/libsedml-fix_install_libpaths.patch
+++ b/libsedml-2.0-fix_install_libpaths.patch
@@ -1,6 +1,6 @@
##This patch sets libraries' installation paths according to the Fedora packaging
guidelines
---- CMakeLists.orig.txt 2015-04-22 12:43:26.000000000 +0200
-+++ CMakeLists.txt 2015-05-29 20:09:17.911895225 +0200
+--- a/CMakeLists.orig.txt 2015-04-22 12:43:26.000000000 +0200
++++ b/CMakeLists.txt 2015-05-29 20:09:17.911895225 +0200
@@ -765,7 +765,7 @@
VERSION.txt
)
@@ -10,8 +10,8 @@
###############################################################################
---- bindings/ruby/CMakeLists.orig.txt 2014-11-26 13:31:14.000000000 +0100
-+++ bindings/ruby/CMakeLists.txt 2014-12-28 23:25:47.035666311 +0100
+--- a/src/bindings/ruby/CMakeLists.orig.txt 2014-11-26 13:31:14.000000000 +0100
++++ b/src/bindings/ruby/CMakeLists.txt 2014-12-28 23:25:47.035666311 +0100
@@ -116,7 +116,7 @@
if (UNIX OR CYGWIN)
execute_process(COMMAND "${RUBY_EXECUTABLE}" -e "print
RUBY_PLATFORM"
@@ -21,8 +21,8 @@
else()
set(RUBY_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/ruby)
endif()
---- bindings/csharp/CMakeLists.orig.txt 2014-11-26 13:31:17.000000000 +0100
-+++ bindings/csharp/CMakeLists.txt 2014-12-29 11:37:43.839593422 +0100
+--- a/src/bindings/csharp/CMakeLists.orig.txt 2014-11-26 13:31:17.000000000 +0100
++++ b/src/bindings/csharp/CMakeLists.txt 2014-12-29 11:37:43.839593422 +0100
@@ -126,7 +126,7 @@
#
set(CSHAPR_PACKAGE_INSTALL_DIR)
@@ -32,8 +32,8 @@
else()
set(CSHAPR_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/csharp)
endif()
---- bindings/perl/CMakeLists.orig.txt 2014-11-26 13:31:13.000000000 +0100
-+++ bindings/perl/CMakeLists.txt 2014-12-29 11:48:53.705649453 +0100
+--- a/src/bindings/perl/CMakeLists.orig.txt 2014-11-26 13:31:13.000000000 +0100
++++ b/src/bindings/perl/CMakeLists.txt 2014-12-29 11:48:53.705649453 +0100
@@ -113,7 +113,7 @@
string(REPLACE "'" "" PERL_PLATFORM ${PERL_PLATFORM})
string(REPLACE ";" "" PERL_PLATFORM ${PERL_PLATFORM})
@@ -43,8 +43,8 @@
set(PERL_PACKAGE_INSTALL_BIN_DIR ${PERL_PACKAGE_INSTALL_DIR}/auto/libSEDML)
else()
set(PERL_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/perl)
---- bindings/java/CMakeLists.orig.txt 2014-12-30 21:03:28.000000000 +0100
-+++ bindings/java/CMakeLists.txt 2015-02-02 17:21:05.270016625 +0100
+--- a/src/bindings/java/CMakeLists.orig.txt 2014-12-30 21:03:28.000000000 +0100
++++ b/src/bindings/java/CMakeLists.txt 2015-02-02 17:21:05.270016625 +0100
@@ -84,7 +84,7 @@
set(JAVA_PACKAGE_BIN_INSTALL_DIR)
set(JAVA_PACKAGE_JAR_INSTALL_DIR)
@@ -54,14 +54,3 @@
set(JAVA_PACKAGE_JAR_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/java)
else()
set(JAVA_PACKAGE_BIN_INSTALL_DIR ${MISC_PREFIX}bindings/java)
---- bindings/r/CMakeLists.orig.txt 2015-04-22 12:43:26.000000000 +0200
-+++ bindings/r/CMakeLists.txt 2015-05-29 17:54:55.586024496 +0200
-@@ -208,7 +208,7 @@
- else()
- target_link_libraries(binding_r_lib ${LIBSEDML_LIBRARY}-static ${R_LIB})
- endif()
--install(TARGETS binding_r_lib DESTINATION lib )
-+install(TARGETS binding_r_lib DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ####################################################################
- #
diff --git a/libsedml-porting_to_python310.patch
b/libsedml-2.0-porting_to_python310.patch
similarity index 69%
rename from libsedml-porting_to_python310.patch
rename to libsedml-2.0-porting_to_python310.patch
index 59ee645..e97b19f 100644
--- a/libsedml-porting_to_python310.patch
+++ b/libsedml-2.0-porting_to_python310.patch
@@ -1,5 +1,5 @@
---- a/bindings/python/CMakeLists.orig.txt 2019-03-21 11:17:24.000000000 +0100
-+++ b/bindings/python/CMakeLists.txt 2020-11-13 19:47:28.116185053 +0100
+--- a/src/bindings/python/CMakeLists.orig.txt 2019-03-21 11:17:24.000000000 +0100
++++ b/src/bindings/python/CMakeLists.txt 2020-11-13 19:47:28.116185053 +0100
@@ -170,3 +170,3 @@
if (UNIX OR CYGWIN)
- execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys;import
platform; sys.stdout.write(platform.python_version()[:3])"
diff --git a/libsedml-fix_string_format.patch b/libsedml-fix_string_format.patch
deleted file mode 100644
index e930554..0000000
--- a/libsedml-fix_string_format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- bindings/ruby/local.orig.i 2019-03-21 11:17:24.000000000 +0100
-+++ bindings/ruby/local.i 2019-03-23 22:57:51.316062718 +0100
-@@ -283,7 +283,7 @@
- }
- catch (const SedConstructorException &e){
- static VALUE cpperror = rb_define_class("SedConstructorException",
rb_eArgError);
-- rb_raise(cpperror, e.what());
-+ rb_raise(cpperror, "%s", e.what());
- }
- }
- %enddef
-@@ -362,7 +362,7 @@
- }
- catch (const XMLConstructorException &e){
- static VALUE cpperror = rb_define_class("XMLConstructorException",
rb_eArgError);
-- rb_raise(cpperror, e.what());
-+ rb_raise(cpperror, "%s", e.what());
- }
- }
- %enddef
diff --git a/libsedml.spec b/libsedml.spec
index 050a707..b3fcbd2 100644
--- a/libsedml.spec
+++ b/libsedml.spec
@@ -1,26 +1,11 @@
# Documents generation and Octave binding look not available yet
%global with_python 1
-%global with_ruby 1
-
-%ifarch s390x %{arm} aarch64 %{power64}
-%global with_java 0
-%else
+%global with_ruby 0
%global with_java 0
-%endif
-
%global with_octave 0
-%global with_perl 1
-%global with_r 1
-
-%if 0%{?fedora} && 0%{?fedora} >= 30
-%ifarch %{ix86} x86_64 sparc sparcv9 ia64 %{arm} aarch64 alpha s390x ppc
-%global with_mono 1
-%else
+%global with_perl 0
+%global with_r 0
%global with_mono 0
-
-Obsoletes: libsedml-sharp < 1:0.4.4-1
-%endif
-%endif
#
%global with_doc 0
@@ -36,9 +21,9 @@ Obsoletes: libsedml-sharp < 1:0.4.4-1
Name: libsedml
Summary: Library that fully supports SED-ML for SBML
-Version: 0.4.4
-Release: 17%{?dist}
-Epoch: 1
+Version: 2.0.19
+Release: 0.1%{?dist}
+Epoch: 2
URL:
https://github.com/fbergmann/libSEDML
Source0:
https://github.com/fbergmann/libSEDML/archive/v%{version}/libSEDML-%{vers...
License: BSD
@@ -46,29 +31,31 @@ License: BSD
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
+BuildRequires: zlib-devel
+BuildRequires: swig
BuildRequires: libsbml-devel
BuildRequires: libnuml-devel
BuildRequires: libxml2-devel
BuildRequires: bzip2-devel
BuildRequires: xerces-c-devel
BuildRequires: minizip-devel
-BuildRequires: swig
-BuildRequires: zlib-devel
%if 0%{?with_check}
BuildRequires: check-devel
%endif
-Obsoletes: python2-libsedml < 1:0.4.4-2
-Obsoletes: java-SEDML < 1:0.4.4-12
+Obsoletes: python2-libsedml < 2:2.0.19-1
+Obsoletes: java-%{octpkg} < 2:2.0.19-1
+Obsoletes: libsedml-sharp < 2:2.0.19-1
+Obsoletes: octave-%{octpkg} < 2:2.0.19-1
+Obsoletes: perl-%{octpkg} < 2:2.0.19-1
+Obsoletes: ruby-%{octpkg} < 2:2.0.19-1
+Obsoletes: R-%{octpkg} < 2:2.0.19-1
##This patch sets libraries' installation paths
-Patch0: %{name}-fix_install_libpaths.patch
-
-# See
https://github.com/fbergmann/libSEDML/issues/55
-Patch1: %{name}-fix_string_format.patch
+Patch0: %{name}-2.0-fix_install_libpaths.patch
-Patch2: %{name}-porting_to_python310.patch
+Patch1: %{name}-2.0-porting_to_python310.patch
%description
C++ library that fully supports SED-ML
@@ -81,13 +68,13 @@ This package provides header and library files of libsedml.
%package devel
Summary: Library that fully supports SED-ML for SBML
-Requires: %{name}%{?_isa} = 1:%{version}-%{release}
+Requires: %{name}%{?_isa} = 2:%{version}-%{release}
%description devel
This package provides header and library files of libsedml.
%package static
Summary: Library that fully supports SED-ML for SBML
-Provides: %{name}-static = 1:%{version}-%{release}
+Provides: %{name}-static = 2:%{version}-%{release}
%description static
This package provides static library of libsedml.
@@ -190,12 +177,12 @@ sed -e 's| lib/cmake | %{_lib}/cmake |g' -i CMakeLists.txt
sed -e 's| /usr/lib/cmake | %{_libdir}/cmake |g' -i
CMakeModules/FindLIBNUML.cmake
sed -e 's| /usr/lib/cmake | %{_libdir}/cmake |g' -i
CMakeModules/FindLIBSBML.cmake
-%patch0 -p0 -b .fix_install_libpaths
-%patch1 -p0 -b .fix_string_format
+# Needed by bindings
+%patch0 -p1 -b .fix_install_libpaths
%if %{with python}
%if 0%{?python3_version_nodots} > 39
-%patch2 -p1 -b .porting_to_python310
+%patch1 -p1 -b .porting_to_python310
%endif
%endif
@@ -240,7 +227,7 @@ export LDFLAGS="$RPM_LD_FLAGS -lpthread"
%endif
%if 0%{?with_check}
-DWITH_CHECK:BOOL=ON \
- -DWITH_EXAMPLES:BOOL=ON \
+ -DWITH_EXAMPLES:BOOL=OFF \
%endif
-DLIBSBML_LIBRARY:FILEPATH=%{_libdir}/libsbml.so
-DLIBSBML_INCLUDE_DIR:PATH=%{_includedir} \
-DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
@@ -288,8 +275,6 @@ install -pm 644 LICENSE.txt *.md $RPM_BUILD_ROOT%{octpkgdir}/packinfo
## Remove libtool archives
find $RPM_BUILD_ROOT -name '*.la' -delete
-%ldconfig_scriptlets
-
%if 0%{?with_r}
%ldconfig_scriptlets -n R-%{octpkg}
%endif
@@ -307,27 +292,22 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%if 0%{?with_check}
%check
-pushd build
-ctest -V --force-new-ctest-process --stop-time 2000
+make test -C build
%endif
%files
%doc *.md
%license LICENSE.txt
%{_libdir}/libsedml.so.*
-##This directory provides just some txt documentation files
-%exclude %{_datadir}/libsedml
%files devel
%{_libdir}/libsedml.so
-%{_libdir}/cmake/sedml-config*.cmake
%{_includedir}/sedml/
%files static
%doc *.md
%license LICENSE.txt
%{_libdir}/%{name}-static.a
-%{_libdir}/cmake/sedml-static-config*.cmake
%if 0%{?with_python}
%files -n python3-libsedml
@@ -392,6 +372,9 @@ ctest -V --force-new-ctest-process --stop-time 2000
%endif
%changelog
+* Thu May 13 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 2:2.0.19-0.1
+- Pre-Release 2.0.19
+
* Wed Mar 31 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1:0.4.4-17
- Add gcc BR
diff --git a/sources b/sources
index 6857dd0..4816286 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libSEDML-0.4.4.tar.gz) =
313892623bcfe188872686dbdc7a9fc946c010b5d6579991d0553386a22994c3fd3efae6fea7aad052aaff91d67c46c5acc5373a474dd7c31004f2d48b0e88ac
+SHA512 (libSEDML-2.0.19.tar.gz) =
640547d3ce37a9b4a65fc000285acd94d0a7ed5c1aa7c9a0baff38e393d2cde97d29e541b43899543589b9a915b597d920f844516da3f563a9eba1d6e72a6750
commit adba87bab91137fa9a7659202422979774700ced
Author: Antonio Trande <3974791-anto.trande(a)users.noreply.gitlab.com>
Date: Wed Mar 31 20:41:31 2021 +0200
Add gcc BR
diff --git a/libsedml.spec b/libsedml.spec
index f5547de..050a707 100644
--- a/libsedml.spec
+++ b/libsedml.spec
@@ -37,21 +37,23 @@ Obsoletes: libsedml-sharp < 1:0.4.4-1
Name: libsedml
Summary: Library that fully supports SED-ML for SBML
Version: 0.4.4
-Release: 16%{?dist}
+Release: 17%{?dist}
Epoch: 1
URL:
https://github.com/fbergmann/libSEDML
Source0:
https://github.com/fbergmann/libSEDML/archive/v%{version}/libSEDML-%{vers...
License: BSD
BuildRequires: cmake
-BuildRequires: zlib-devel
-BuildRequires: swig
+BuildRequires: gcc
+BuildRequires: gcc-c++
BuildRequires: libsbml-devel
BuildRequires: libnuml-devel
BuildRequires: libxml2-devel
BuildRequires: bzip2-devel
BuildRequires: xerces-c-devel
BuildRequires: minizip-devel
+BuildRequires: swig
+BuildRequires: zlib-devel
%if 0%{?with_check}
BuildRequires: check-devel
@@ -390,6 +392,9 @@ ctest -V --force-new-ctest-process --stop-time 2000
%endif
%changelog
+* Wed Mar 31 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1:0.4.4-17
+- Add gcc BR
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:0.4.4-16
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild