Architecture specific change in rpms/HepMC.git
by githook-noreply@fedoraproject.org
The package rpms/HepMC.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/HepMC.git/commit/?id=212b3d673083....
Change:
-%ifarch aarch64 %{power64} s390 s390x
Thanks.
Full change:
============
commit 212b3d6730839c6c3c64c57f1126b41e461ab4a6
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Thu Aug 1 23:21:37 2019 +0200
Update to version 2.06.10
Drop patches - all fixed in the new version
Drop the -ffp-contract=off hack
Remove redundant m_outstream->setf(std::ios::fixed)
Fix GenEventCopmpare
Adjust expected test output for changes in the code
diff --git a/HepMC-GenEvent-compare.patch b/HepMC-GenEvent-compare.patch
new file mode 100644
index 0000000..7af6398
--- /dev/null
+++ b/HepMC-GenEvent-compare.patch
@@ -0,0 +1,155 @@
+From 72acdcdbb3032b571c1a3a6a79a554359518f7ea Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 26 Jul 2019 16:22:07 +0200
+Subject: [PATCH 1/2] In GenEvents, the heavy_ion() and pdf_info() are
+ pointers. In order to compare two GenEvents it is not sufficient to compare
+ the pointers, but the objects the pointers are pointing to should be
+ compared.
+
+This fixes a failure in the testMultipleCopies test.
+---
+ HepMC/CompareGenEvent.h | 4 +++-
+ src/CompareGenEvent.cc | 52 ++++++++++++++++++++++++++++-------------
+ 2 files changed, 39 insertions(+), 17 deletions(-)
+
+diff --git a/HepMC/CompareGenEvent.h b/HepMC/CompareGenEvent.h
+index 90f2be4..712d85f 100644
+--- a/HepMC/CompareGenEvent.h
++++ b/HepMC/CompareGenEvent.h
+@@ -20,8 +20,10 @@ bool compareGenEvent( GenEvent*, GenEvent* );
+ bool compareSignalProcessVertex( GenEvent*, GenEvent* );
+ bool compareBeamParticles( GenEvent*, GenEvent* );
+ bool compareWeights( GenEvent*, GenEvent* );
+-bool compareVertices( GenEvent*, GenEvent* );
++bool compareHeavyIons( GenEvent*, GenEvent* );
++bool comparePdfInfo( GenEvent*, GenEvent* );
+ bool compareParticles( GenEvent*, GenEvent* );
++bool compareVertices( GenEvent*, GenEvent* );
+ bool compareVertex( GenVertex* v1, GenVertex* v2 );
+
+ } // HepMC
+diff --git a/src/CompareGenEvent.cc b/src/CompareGenEvent.cc
+index 69efeba..c40efe5 100644
+--- a/src/CompareGenEvent.cc
++++ b/src/CompareGenEvent.cc
+@@ -48,14 +48,8 @@ bool compareGenEvent( GenEvent* e1, GenEvent* e2)
+ std::cerr << "compareGenEvent: random states differ " << std::endl;
+ return false;
+ }
+- if( e1->heavy_ion() != e2->heavy_ion() ) {
+- std::cerr << "compareGenEvent: heavy ions differ " << std::endl;
+- return false;
+- }
+- if( e1->pdf_info() != e2->pdf_info() ) {
+- std::cerr << "compareGenEvent: pdf info differs " << std::endl;
+- return false;
+- }
++ if ( !compareHeavyIons( e1, e2 ) ) { return false; }
++ if ( !comparePdfInfo( e1, e2 ) ) { return false; }
+ if ( !compareParticles( e1, e2 ) ) { return false; }
+ if ( !compareVertices( e1, e2 ) ) { return false; }
+ return true;
+@@ -95,6 +89,32 @@ bool compareWeights( GenEvent* e1, GenEvent* e2 ) {
+ return false;
+ }
+
++bool compareHeavyIons( GenEvent* e1, GenEvent* e2 ) {
++ // compare heavy ions
++ HeavyIon* h1 = e1->heavy_ion();
++ HeavyIon* h2 = e2->heavy_ion();
++ if( h1 && h2 ) {
++ if( (*h1) != (*h2) ) {
++ std::cerr << "compareHeavyIons: heavy ions differ " << std::endl;
++ return false;
++ }
++ }
++ return true;
++}
++
++bool comparePdfInfo( GenEvent* e1, GenEvent* e2 ) {
++ // compare pdf info
++ PdfInfo* p1 = e1->pdf_info();
++ PdfInfo* p2 = e2->pdf_info();
++ if( p1 && p2 ) {
++ if( (*p1) != (*p2) ) {
++ std::cerr << "comparePdfInfo: PDF info differs " << std::endl;
++ return false;
++ }
++ }
++ return true;
++}
++
+ bool compareParticles( GenEvent* e1, GenEvent* e2 ) {
+ if( e1->particles_size() != e2->particles_size() ) {
+ std::cerr << "compareParticles: number of particles differs " << std::endl;
+@@ -109,7 +129,7 @@ bool compareParticles( GenEvent* e1, GenEvent* e2 ) {
+ << std::endl; */
+ if ( **p1 != **p2 ) {
+ std::cerr << "compareParticles: particle "
+- << (*p1)->barcode() << " differs from "
++ << (*p1)->barcode() << " differs from "
+ << (*p2)->barcode() << std::endl;
+ return false;
+ }
+@@ -125,13 +145,13 @@ bool compareVertices( GenEvent* e1, GenEvent* e2 ) {
+ for ( GenEvent::vertex_const_iterator v = e1->vertices_begin();
+ v != e1->vertices_end(); ++v ) {
+ //std::cout << "compareVertices: comparing vertex "
+- // << (*v)->barcode() << std::endl;
++ // << (*v)->barcode() << std::endl;
+ GenVertex* v1 = (*v);
+ GenVertex* v2 = e2->barcode_to_vertex((*v)->barcode());
+ compareVertex( (*v), e2->barcode_to_vertex((*v)->barcode()));
+ if ( (*v1) != (*v2) ) {
+ std::cerr << "compareVertices: vertex "
+- << (*v)->barcode() << " differs" << std::endl;
++ << (*v)->barcode() << " differs" << std::endl;
+ return false;
+ }
+ }
+@@ -141,13 +161,13 @@ bool compareVertices( GenEvent* e1, GenEvent* e2 ) {
+ bool compareVertex( GenVertex* v1, GenVertex* v2 ) {
+ if ( v1->position() != v2->position() ) {
+ std::cerr << "compareVertex: position "
+- << v1->barcode() << " differs" << std::endl;
++ << v1->barcode() << " differs" << std::endl;
+ return false;
+ }
+ // if the size of the inlist differs, return false.
+ if ( v1->particles_in_size() != v2->particles_in_size() ) {
+ std::cerr << "compareVertex: particles_in_size "
+- << v1->barcode() << " differs" << std::endl;
++ << v1->barcode() << " differs" << std::endl;
+ return false;
+ }
+ // loop over the inlist and ensure particles are identical
+@@ -158,7 +178,7 @@ bool compareVertex( GenVertex* v1, GenVertex* v2 ) {
+ ia != v1->particles_in_const_end(); ia++, ib++ ){
+ if ( **ia != **ib ) {
+ std::cerr << "compareVertex: incoming particle "
+- << v1->barcode() << " differs: "
++ << v1->barcode() << " differs: "
+ << (*ia)->barcode() << " " << (*ib)->barcode()
+ << std::endl;
+ //return false;
+@@ -168,7 +188,7 @@ bool compareVertex( GenVertex* v1, GenVertex* v2 ) {
+ // if the size of the outlist differs, return false.
+ if ( v1->particles_out_size() != v2->particles_out_size() ) {
+ std::cerr << "compareVertex: particles_out_size "
+- << v1->barcode() << " differs" << std::endl;
++ << v1->barcode() << " differs" << std::endl;
+ return false;
+ }
+ // loop over the outlist and ensure particles are identical
+@@ -179,7 +199,7 @@ bool compareVertex( GenVertex* v1, GenVertex* v2 ) {
+ ia != v1->particles_out_const_end(); ia++, ib++ ){
+ if ( **ia != **ib ) {
+ std::cerr << "compareVertex: outgoing particle "
+- << v1->barcode() << " differs: "
++ << v1->barcode() << " differs: "
+ << (*ia)->barcode() << " " << (*ib)->barcode()
+ << std::endl;
+ //return false;
+--
+2.21.0
+
diff --git a/HepMC-continue-vs-break.patch b/HepMC-continue-vs-break.patch
deleted file mode 100644
index 2c75bac..0000000
--- a/HepMC-continue-vs-break.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur HepMC-2.06.09.orig/src/WeightContainer.cc HepMC-2.06.09/src/WeightContainer.cc
---- HepMC-2.06.09.orig/src/WeightContainer.cc 2010-05-17 17:23:44.000000000 +0200
-+++ HepMC-2.06.09/src/WeightContainer.cc 2018-12-08 22:22:50.073203625 +0100
-@@ -57,7 +57,7 @@
- {
- if( m->second == vit ) {
- m_names.erase(m->first);
-- continue;
-+ break;
- }
- }
- m_weights.pop_back();
diff --git a/HepMC-epsilon.patch b/HepMC-epsilon.patch
deleted file mode 100644
index fcb8897..0000000
--- a/HepMC-epsilon.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur HepMC-2.06.09.orig/test/testSimpleVector.cc HepMC-2.06.09/test/testSimpleVector.cc
---- HepMC-2.06.09.orig/test/testSimpleVector.cc 2009-06-02 20:45:23.000000000 +0200
-+++ HepMC-2.06.09/test/testSimpleVector.cc 2015-03-06 20:01:29.894088753 +0100
-@@ -14,7 +14,7 @@
-
- HepMC::ThreeVector v3copy( v3 );
-
-- double eps = 1.e-15; // allowed differnce between doubles
-+ double eps = 2.e-15; // allowed difference between doubles
- int numbad = 0;
-
- double x = v3.x();
diff --git a/HepMC-examples-hwaend.patch b/HepMC-examples-hwaend.patch
deleted file mode 100644
index 134ac82..0000000
--- a/HepMC-examples-hwaend.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-provide dummy hwaend_ function in examples.
-
---- a/examples/fio/example_MyHerwig.cc
-+++ b/examples/fio/example_MyHerwig.cc
-@@ -21,6 +21,8 @@
- #include "HepMC/GenEvent.h"
- #include "HepMC/HEPEVT_Wrapper.h"
-
-+extern "C" void hwaend_() {}
-+
- int main() {
- //
- //........................................HEPEVT
---- a/examples/fio/testHerwigCopies.cc
-+++ b/examples/fio/testHerwigCopies.cc
-@@ -13,6 +13,8 @@
- #include "HepMC/CompareGenEvent.h"
- #include "HepMC/HEPEVT_Wrapper.h"
-
-+extern "C" void hwaend_() {}
-+
- int main() {
- //
- //........................................HEPEVT
diff --git a/HepMC-examples-makefile.patch b/HepMC-examples-makefile.patch
deleted file mode 100644
index 74c6101..0000000
--- a/HepMC-examples-makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/examples/fio/GNUmakefile.example.in
-+++ b/examples/fio/GNUmakefile.example.in
-@@ -12,18 +12,16 @@
- # You may have to change GENSERdir and/or other variables
- #
- HepMCdir = @prefix@
-- HepMClib = -L$(HepMCdir)/lib -lHepMC
-- HepMCfiolib = -L$(HepMCdir)/lib -lHepMCfio
-+ HepMClib = -lHepMC
-+ HepMCfiolib = -lHepMCfio
- GENSERdir = @GENSERdir@
-- Pythia_LIB = -L$(GENSERdir)/lib -Wl,-rpath -Wl,$(GENSERdir)/lib \
-- -lpythia6_403 -lpythia6_403_dumm -lpythia6_403_pdfdumm
-- Herwig_LIB = -L$(GENSERdir)/lib -Wl,-rpath -Wl,$(GENSERdir)/lib \
-- -lherwig6_510 -lherwig6_510_dumm -lherwig6_510_pdfdumm
-+ Pythia_LIB = -lpythia6
-+ Herwig_LIB = -lherwig6
-
- ################################################################################ Compiler options
- #
- CXX = @CXX@
-- F77 = @F77@
-+ F77 = gfortran
- INCLUDES = -I$(HepMCdir)/include -I$(CLHEPdir)/include
- CXXFLAGS = @AM_CXXFLAGS@ @CXXFLAGS@ $(INCLUDES)
- ifeq "$(CXX)" "g++"
---- a/examples/pythia8/GNUmakefile.example.in
-+++ b/examples/pythia8/GNUmakefile.example.in
-@@ -14,15 +14,13 @@
- #
- HepMCdir = @prefix@
- HEPMCLOCATION = $(HepMCdir)
-- HepMClib = -L$(HEPMCLOCATION)/lib -Wl,-rpath -Wl,$(HEPMCLOCATION)/lib \
-- -lHepMC
-- Pythia_LIB = -L$(PYTHIA8_HOME)/lib -Wl,-rpath -Wl,$(PYTHIA8_HOME)/lib \
-- -lpythia8 -llhapdfdummy -lhepmcinterface
-+ HepMClib = -lHepMC
-+ Pythia_LIB = -lpythia8 -lLHAPDF -lhepmcinterface
-
- ################################################################################ Compiler options
- #
- CXX = @CXX@
-- INCLUDES = -I$(HEPMCLOCATION)/include -I$(PYTHIA8_HOME)/include
-+ INCLUDES = -I/usr/include/pythia8
- CXXFLAGS = @AM_CXXFLAGS@ @CXXFLAGS@ -Wshadow -fbounds-check $(INCLUDES)
- ifeq "$(CXX)" "g++"
- FLAGS = $(DFLG) -fno-second-underscore $(INCDIR)
diff --git a/HepMC-fix-typo-hierachy-hierarchy.patch b/HepMC-fix-typo-hierachy-hierarchy.patch
deleted file mode 100644
index 0efed0c..0000000
--- a/HepMC-fix-typo-hierachy-hierarchy.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 59755b58f1a6e2fe1521223a4dcf0d17a51f7181
-Author: Lifeng Sun <lifongsun(a)gmail.com>
-Date: Sun Apr 3 08:22:36 2011 +0800
-
- fix typo: hierachy -> hierarchy.
-
-diff --git a/fio/HEPEVT_Wrapper.cc b/fio/HEPEVT_Wrapper.cc
-index 1f382a8..9906002 100644
---- a/fio/HEPEVT_Wrapper.cc
-+++ b/fio/HEPEVT_Wrapper.cc
-@@ -186,7 +186,7 @@ namespace HepMC {
- << "\n relationships ... but all other information "
- << "\n (4-vectors etc) will be correctly transferred."
- << "\n In order for HepMC to be able to interpret the mother/"
-- << "\n daughter hierachy, it MUST be given consistent input."
-+ << "\n daughter hierarchy, it MUST be given consistent input."
- << "\n This is one of the design criteria of HepMC: "
- << "\n consistency is enforced by the code.";
- os << "\nThere is a switch in IO_HEPEVT, set-able using "
diff --git a/HepMC-linking.patch b/HepMC-linking.patch
deleted file mode 100644
index 2793acc..0000000
--- a/HepMC-linking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur HepMC-2.06.09.orig/fio/Makefile.am HepMC-2.06.09/fio/Makefile.am
---- HepMC-2.06.09.orig/fio/Makefile.am 2011-10-31 20:05:37.000000000 +0100
-+++ HepMC-2.06.09/fio/Makefile.am 2012-11-16 16:22:11.373692129 +0100
-@@ -10,6 +10,8 @@
-
- lib_LTLIBRARIES = libHepMCfio.la
-
-+libHepMCfio_la_LIBADD = $(top_builddir)/src/libHepMC.la
-+
- if BUILD_VISUAL
- lib_shared = HepMC.$(SHEXT)
- else
-diff -ur HepMC-2.06.09.orig/fio/Makefile.in HepMC-2.06.09/fio/Makefile.in
---- HepMC-2.06.09.orig/fio/Makefile.in 2012-06-05 22:50:44.000000000 +0200
-+++ HepMC-2.06.09/fio/Makefile.in 2012-11-16 16:23:07.581987610 +0100
-@@ -55,7 +55,7 @@
- am__installdirs = "$(DESTDIR)$(libdir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libHepMCfio_la_LIBADD =
-+libHepMCfio_la_LIBADD = $(top_builddir)/src/libHepMC.la
- am_libHepMCfio_la_OBJECTS = HEPEVT_Wrapper.lo IO_HEPEVT.lo \
- IO_HERWIG.lo HerwigWrapper.lo
- libHepMCfio_la_OBJECTS = $(am_libHepMCfio_la_OBJECTS)
diff --git a/HepMC-no-hexfloat.patch b/HepMC-no-hexfloat.patch
deleted file mode 100644
index 3d09418..0000000
--- a/HepMC-no-hexfloat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur HepMC-2.06.09.orig/src/IO_AsciiParticles.cc HepMC-2.06.09/src/IO_AsciiParticles.cc
---- HepMC-2.06.09.orig/src/IO_AsciiParticles.cc 2010-05-17 17:23:44.000000000 +0200
-+++ HepMC-2.06.09/src/IO_AsciiParticles.cc 2015-03-06 17:38:41.860507302 +0100
-@@ -156,14 +156,14 @@
-
- xmassi = (*part)->generatedMass();
- if(fabs(xmassi) < 0.0001) xmassi =0.;
-- m_outstream->setf(std::ios::fixed);
-+ m_outstream->unsetf(std::ios::floatfield);
- m_outstream->precision(3);
- m_outstream->width(8);
- *m_outstream << xmassi << " ";
- m_outstream->setf(std::ios::scientific,std::ios::floatfield);
- m_outstream->precision(m_precision);
-
-- m_outstream->setf(std::ios::fixed);
-+ m_outstream->unsetf(std::ios::floatfield);
- m_outstream->precision(3);
- m_outstream->width(6);
- etai = (*part)->momentum().eta();
diff --git a/HepMC-remove-redundant-setf-std-ios-fixed.patch b/HepMC-remove-redundant-setf-std-ios-fixed.patch
new file mode 100644
index 0000000..977aa58
--- /dev/null
+++ b/HepMC-remove-redundant-setf-std-ios-fixed.patch
@@ -0,0 +1,44 @@
+From 1690bc6c36a5b378677d6f606a1e70df0bd9222f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Thu, 4 Jul 2019 08:44:32 +0200
+Subject: [PATCH] Remove redundant m_outstream->setf(std::ios::fixed)
+
+The following call to m_outstream->unsetf(std::ios_base::floatfield) a
+few line further down clears the fixed bit again, and no output is
+sent to the output stream between these lines, so setting the fixed
+bit here has no effect.
+---
+ src/IO_AsciiParticles.cc | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/IO_AsciiParticles.cc b/src/IO_AsciiParticles.cc
+index 178c1ba..d5de480 100644
+--- a/src/IO_AsciiParticles.cc
++++ b/src/IO_AsciiParticles.cc
+@@ -156,21 +156,19 @@ namespace HepMC {
+
+ xmassi = (*part)->generatedMass();
+ if(fabs(xmassi) < 0.0001) xmassi =0.;
+- m_outstream->setf(std::ios::fixed);
+ m_outstream->precision(3);
+ m_outstream->width(8);
+- m_outstream->unsetf(std::ios_base::floatfield);
++ m_outstream->unsetf(std::ios_base::floatfield);
+ *m_outstream << xmassi << " ";
+ m_outstream->setf(std::ios::scientific,std::ios::floatfield);
+ m_outstream->precision(m_precision);
+
+- m_outstream->setf(std::ios::fixed);
+ m_outstream->precision(3);
+ m_outstream->width(6);
+ etai = (*part)->momentum().eta();
+ if(etai > 999.)etai = 999.;
+ if(etai < -999.)etai = -999.;
+- m_outstream->unsetf(std::ios_base::floatfield);
++ m_outstream->unsetf(std::ios_base::floatfield);
+ *m_outstream << etai << std::endl;
+ m_outstream->setf(std::ios::scientific,std::ios::floatfield);
+ m_outstream->precision(m_precision);
+--
+2.21.0
+
diff --git a/HepMC-test-fixes.patch b/HepMC-test-fixes.patch
new file mode 100644
index 0000000..3c6aef1
--- /dev/null
+++ b/HepMC-test-fixes.patch
@@ -0,0 +1,105 @@
+From 77671d78a5208bf61bbb137c07f9eb745ae3081b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 26 Jul 2019 16:35:27 +0200
+Subject: [PATCH 2/2] Due to changes in the the code there are new lines in the
+ output that must be added to the expected output files.
+
+This fixes failures in testHepMC.sh, testMass.sh and testStreamIO.sh
+---
+ test/testCrossSection.dat | 2 ++
+ test/testHepMC.dat | 3 +++
+ test/testMass1.dat | 2 ++
+ test/testWithWeight.dat | 2 ++
+ 4 files changed, 9 insertions(+)
+
+diff --git a/test/testCrossSection.dat b/test/testCrossSection.dat
+index 0ace3a0..fc4e5bc 100644
+--- a/test/testCrossSection.dat
++++ b/test/testCrossSection.dat
+@@ -5,6 +5,7 @@ E 1 65 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 2
+ N 3 "0" "second weight name" "weightName"
+ U GEV MM
+ C 3.3260000000000000e-03 1.0000000000000000e-04
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 3 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0
+ P 3 -1 7.2521029125687850e-02 4.0916270130125820e-01 2.3327360517627892e+02 2.3327397528518750e+02 0 3 0 0 -3 0
+@@ -1412,6 +1413,7 @@ E 39 4 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 2
+ N 3 "0" "second weight name" "weightName"
+ U GEV MM
+ C 3.2685771680665248e+01 4.0912561144384779e-01
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 2 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0
+ P 3 1 1.5073383106491554e+00 -1.2993365623313919e+00 2.7209201338025518e+03 2.7209208615607290e+03 0 3 0 0 -3 0
+diff --git a/test/testHepMC.dat b/test/testHepMC.dat
+index 89b814b..d3a58b2 100644
+--- a/test/testHepMC.dat
++++ b/test/testHepMC.dat
+@@ -4,6 +4,7 @@ HepMC::IO_GenEvent-START_EVENT_LISTING
+ E 9 51 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 309 1 2 0 4 2.3000000000000001e-01 3.4000000000000002e-01 1.1000000000000000e-01 6.5000000000000002e-02
+ N 4 "0" "1" "2" "3"
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 3 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0
+ P 3 21 -9.5802904850995474e-01 3.4892974578914365e-01 1.5677975928920182e+01 1.5711094833049845e+01 0 3 0 0 -3 0
+@@ -1245,6 +1246,7 @@ P 929 130 1.5144574134495588e+00 7.2590137012971407e+00 -2.3983943019256262e+01
+ E 18 40 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 219 1 2 0 5 2.3000000000000001e-01 1.4000000000000000e-02 3.5400000000000000e+00 1.3400000000000001e+00 1.2000000000000000e-01
+ N 5 "0" "3" "4" "p 2" "p1"
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 2 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0
+ P 3 2 -3.1410233325201048e-01 4.1184766785753961e+00 7.1390134753684538e+02 7.1391329622395415e+02 0 3 0 0 -3 0
+@@ -2140,6 +2142,7 @@ P 673 -211 -6.7514417930739964e-02 -1.0120446765128294e-02 -1.8254475337189451e+
+ P 674 211 3.0894826880397325e-01 -1.5887730643141576e-01 -1.7377281346698286e+01 1.7381314041766348e+01 1.3957000000000000e-01 1 0 0 0 0
+ E 56 41 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 267 1 2 0 0
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 3 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0
+ P 3 21 6.3025125034486240e-01 -1.5608419695341000e+00 1.9452414252898802e+01 1.9525108567144983e+01 0 3 0 0 -3 0
+diff --git a/test/testMass1.dat b/test/testMass1.dat
+index 2219505..41deb33 100644
+--- a/test/testMass1.dat
++++ b/test/testMass1.dat
+@@ -1247,6 +1247,7 @@ P 929 130 1.5144574134495588e+00 7.2590137012971407e+00 -2.3983943019256262e+01
+ E 18 40 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 219 1 2 0 5 2.3000000000000001e-01 1.4000000000000000e-02 3.5400000000000000e+00 1.3400000000000001e+00 1.2000000000000000e-01
+ N 5 "0" "3" "4" "p 2" "p1"
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 2 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0
+ P 3 2 -3.1410233325201048e-01 4.1184766785753961e+00 7.1390134753684538e+02 7.1391329622395415e+02 0 3 0 0 -3 0
+@@ -2142,6 +2143,7 @@ P 673 -211 -6.7514417930739964e-02 -1.0120446765128294e-02 -1.8254475337189451e+
+ P 674 211 3.0894826880397325e-01 -1.5887730643141576e-01 -1.7377281346698286e+01 1.7381314041766348e+01 1.3957000000000000e-01 1 0 0 0 0
+ E 56 41 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 267 1 2 0 0
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 3 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0
+ P 3 21 6.3025125034486240e-01 -1.5608419695341000e+00 1.9452414252898802e+01 1.9525108567144983e+01 0 3 0 0 -3 0
+diff --git a/test/testWithWeight.dat b/test/testWithWeight.dat
+index 6f07ad2..300984f 100644
+--- a/test/testWithWeight.dat
++++ b/test/testWithWeight.dat
+@@ -4,6 +4,7 @@ HepMC::IO_GenEvent-START_EVENT_LISTING
+ E 1 65 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 357 1 2 0 3 3.4560000000000002e-01 9.8563000000000001e-01 9.8595999999999995e-01
+ N 3 "0" "1" "2"
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 3 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0
+ P 3 -1 7.2521029125687850e-02 4.0916270130125820e-01 2.3327360517627892e+02 2.3327397528518750e+02 0 3 0 0 -3 0
+@@ -1410,6 +1411,7 @@ P 1046 22 -2.0596811409436391e-01 3.7999759000577560e-01 1.7194504358090985e+00
+ E 39 4 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 133 1 2 0 3 3.4560000000000002e-01 9.9222999999999995e-01 9.9256000000000000e-01
+ N 3 "0" "1" "2"
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 2 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0
+ P 3 1 1.5073383106491554e+00 -1.2993365623313919e+00 2.7209201338025518e+03 2.7209208615607290e+03 0 3 0 0 -3 0
+--
+2.21.0
+
diff --git a/HepMC.spec b/HepMC.spec
index c10c2b8..4569136 100644
--- a/HepMC.spec
+++ b/HepMC.spec
@@ -1,20 +1,25 @@
Name: HepMC
-Version: 2.06.09
-Release: 24%{?dist}
+Version: 2.06.10
+Release: 1%{?dist}
Summary: C++ Event Record for Monte Carlo Generators
License: GPLv2+
-URL: http://lcgapp.cern.ch/project/simu/HepMC/
-Source0: http://lcgapp.cern.ch/project/simu/HepMC/download/%{name}-%{version}.tar.gz
-Patch0: %{name}-fix-typo-hierachy-hierarchy.patch
-Patch1: %{name}-examples-makefile.patch
-Patch2: %{name}-examples-hwaend.patch
-Patch3: %{name}-linking.patch
-Patch4: %{name}-no-hexfloat.patch
-Patch5: %{name}-epsilon.patch
-Patch6: %{name}-continue-vs-break.patch
+URL: http://hepmc.web.cern.ch/hepmc/
+Source0: http://hepmc.web.cern.ch/hepmc/releases/%{name}-%{version}.tar.gz
+# Remove redundant m_outstream->setf(std::ios::fixed)
+# https://gitlab.cern.ch/hepmc/HepMC/merge_requests/7
+Patch0: %{name}-remove-redundant-setf-std-ios-fixed.patch
+# Fix GenEventCopmpare
+# https://gitlab.cern.ch/hepmc/HepMC/merge_requests/8
+Patch1: %{name}-GenEvent-compare.patch
+# Adjust expected test output for changes in the code
+# https://gitlab.cern.ch/hepmc/HepMC/merge_requests/8
+Patch2: %{name}-test-fixes.patch
BuildRequires: gcc-c++
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
%description
The HepMC package is an object oriented event record written in C++
@@ -49,18 +54,9 @@ This package provides HepMC manuals and examples.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
-# take care of testSimpleVector failure
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 7
-%ifarch aarch64 %{power64} s390 s390x
-export CXXFLAGS="%{optflags} -ffp-contract=off"
-%endif
-%endif
+autoreconf -i
%configure --with-momentum=GEV --with-length=MM --disable-static
make %{?_smp_mflags}
@@ -113,6 +109,14 @@ make check
%{?_licensedir: %license COPYING}
%changelog
+* Sun Jul 28 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 2.06.10-1
+- Update to version 2.06.10
+- Drop patches - all fixed in the new version
+- Drop the -ffp-contract=off hack
+- Remove redundant m_outstream->setf(std::ios::fixed)
+- Fix GenEventCopmpare
+- Adjust expected test output for changes in the code
+
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.06.09-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index 9db317e..cfdc676 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c47627ced4255b40e731b8666848b087 HepMC-2.06.09.tar.gz
+SHA512 (HepMC-2.06.10.tar.gz) = 0f35e88eb488ef060e74993659c829efd07ebeb092a8e0b85af763097c04a4f67c3d2feeb065d266ef9b4f147a07b3ffe9515cc3812fc214a5ea7a0023f82e4b
commit 72c67e08fc89763bf88470081329470dab9a3c85
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 24 15:53:50 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/HepMC.spec b/HepMC.spec
index 62a5598..c10c2b8 100644
--- a/HepMC.spec
+++ b/HepMC.spec
@@ -1,6 +1,6 @@
Name: HepMC
Version: 2.06.09
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: C++ Event Record for Monte Carlo Generators
License: GPLv2+
@@ -113,6 +113,9 @@ make check
%{?_licensedir: %license COPYING}
%changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.06.09-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.06.09-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 16b5fd401e4c83c5801fba74ee0fc665c5808e50
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 31 11:36:50 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/HepMC.spec b/HepMC.spec
index 7f7715c..62a5598 100644
--- a/HepMC.spec
+++ b/HepMC.spec
@@ -1,6 +1,6 @@
Name: HepMC
Version: 2.06.09
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: C++ Event Record for Monte Carlo Generators
License: GPLv2+
@@ -113,6 +113,9 @@ make check
%{?_licensedir: %license COPYING}
%changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.06.09-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Sat Dec 08 2018 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 2.06.09-22
- Fix a segmentation fault (continue vs. break)
commit e3f88029a5abe6bd6138c0832eaf78ac1a5110c9
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Sat Dec 8 23:11:32 2018 +0100
Don't use new g++ option for old g++ version
diff --git a/HepMC.spec b/HepMC.spec
index 1ecea50..7f7715c 100644
--- a/HepMC.spec
+++ b/HepMC.spec
@@ -56,9 +56,11 @@ This package provides HepMC manuals and examples.
%build
# take care of testSimpleVector failure
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 7
%ifarch aarch64 %{power64} s390 s390x
export CXXFLAGS="%{optflags} -ffp-contract=off"
%endif
+%endif
%configure --with-momentum=GEV --with-length=MM --disable-static
make %{?_smp_mflags}
4 years, 8 months
Architecture specific change in rpms/pveclib.git
by githook-noreply@fedoraproject.org
The package rpms/pveclib.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/pveclib.git/commit/?id=e49d0062ce....
Change:
+ExclusiveArch: ppc %{power64}
Thanks.
Full change:
============
commit e49d0062cea3bbc86e8542357175abad416ee19b
Author: Steven Munroe <munroesj52(a)gmail.com>
Date: Thu Aug 1 15:29:39 2019 -0500
Initial import (#1725924).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/pveclib.spec b/pveclib.spec
new file mode 100644
index 0000000..4c9857d
--- /dev/null
+++ b/pveclib.spec
@@ -0,0 +1,73 @@
+Name: pveclib
+Version: 1.0.3
+Release: 1%{?dist}
+Summary: Library for simplified access to PowerISA vector operations
+License: ASL 2.0
+URL: https://github.com/open-power-sdk/pveclib
+Source0: https://github.com/open-power-sdk/pveclib/archive/v%{version}.tar.gz
+
+ExclusiveArch: ppc %{power64}
+BuildRequires: libtool autoconf-archive gcc-c++
+
+%description
+A library of useful vector operations for PowerISA 2.06 or later. Pveclib
+builds on the PPC vector built-ins provided by <altivec.h> to provide higher
+level operations. These operations also bridge gaps in compiler builtin
+support for the latest PowerISA and functional differences between versions
+of the PowerISA. The intent is to improve the productivity of application
+developers who need to optimize their applications or dependent libraries for
+POWER.
+
+%package devel
+Summary: Header files for pveclib
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description devel
+Contains header files for using pveclib operations as inline vector
+instructions.
+
+%package static
+Summary: This package contains static libraries for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description static
+This package contains static libraries for pveclib.
+So far only constant vectors used in conversions.
+
+%prep
+%autosetup
+
+%build
+%configure --docdir=%{_docdir}/%{name}
+%make_build
+
+%install
+%make_install
+
+%check
+# do not fail on test failures as builder might not support all required features
+make check || :
+
+# we are installing it using doc
+find %{buildroot} -type f -name "*.la" -delete
+
+%files
+%license LICENSE COPYING
+%doc COPYING README.md CONTRIBUTING.md ChangeLog.md
+%{_libdir}/libpvec.so.0
+%{_libdir}/libpvec.so.0.0.0
+
+%files devel
+%doc README.md
+%{_libdir}/libpvec.so
+%{_includedir}/pveclib
+
+%files static
+%doc README.md
+%{_libdir}/libpvec.a
+
+%changelog
+* Tue Jul 30 2019 Munroe S <munroesj52(a)gmail.com> 1.0.3-1
+- Updates for RPM release.
+* Mon Jul 22 2019 Munroe S <munroesj52(a)gmail.com> 1.0.2y-1
+- Updates for RPM pre-release.
+* Fri May 31 2019 Munroe S <munroesj52(a)gmail.com> 1.0.2-1
+- Initial RPM release
diff --git a/sources b/sources
new file mode 100644
index 0000000..e69de29
diff --git a/v1.0.3.tar.gz b/v1.0.3.tar.gz
new file mode 100644
index 0000000..1d09295
Binary files /dev/null and b/v1.0.3.tar.gz differ
4 years, 8 months
Architecture specific change in rpms/glusterfs-coreutils.git
by githook-noreply@fedoraproject.org
The package rpms/glusterfs-coreutils.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/glusterfs-coreutils.git/commit/?i...
https://src.fedoraproject.org/cgit/rpms/glusterfs-coreutils.git/commit/?i....
Change:
-ExcludeArch: i686
+ExcludeArch: i686
Thanks.
Full change:
============
commit b6a6f8e23b399e6aef887b3b2768f535a3d4f670
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Thu Aug 1 16:20:12 2019 -0400
glusterfs-coreutils 0.3.1 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/glusterfs-coreutils.spec b/glusterfs-coreutils.spec
index c252113..4d037f3 100644
--- a/glusterfs-coreutils.spec
+++ b/glusterfs-coreutils.spec
@@ -41,9 +41,6 @@ make
%{_mandir}/man1/*
%changelog
-* Thu Aug 1 2019 Kaleb S. KEITHLEY <kkeithle [at] redhat.com> - 0.3.1-2
-- restore i686
-
* Thu Aug 1 2019 Kaleb S. KEITHLEY <kkeithle [at] redhat.com> - 0.3.1-1
- glusterfs-coreutils 0.3.1 GA
commit 66afa59da4ea2e5886c0126e3220170a25682da8
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Thu Aug 1 16:06:35 2019 -0400
restore i686
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/glusterfs-coreutils.spec b/glusterfs-coreutils.spec
index 77ffcb9..c252113 100644
--- a/glusterfs-coreutils.spec
+++ b/glusterfs-coreutils.spec
@@ -2,13 +2,12 @@
Summary: Core Utilities for the Gluster Distributed File System
Name: glusterfs-coreutils
Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3
URL: https://github.com/gluster/glusterfs-coreutils
# The source for this package was created from upstream source using the
# following command:
# make dist
-ExcludeArch: i686
Source0: https://github.com/gluster/glusterfs-coreutils/archive/v%{version}/%{name...
Provides: bundled(gnulib)
@@ -42,6 +41,9 @@ make
%{_mandir}/man1/*
%changelog
+* Thu Aug 1 2019 Kaleb S. KEITHLEY <kkeithle [at] redhat.com> - 0.3.1-2
+- restore i686
+
* Thu Aug 1 2019 Kaleb S. KEITHLEY <kkeithle [at] redhat.com> - 0.3.1-1
- glusterfs-coreutils 0.3.1 GA
commit d62c9157b182da353e9d4cb019937bd8ac670f72
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Thu Aug 1 08:05:50 2019 -0400
glusterfs-coreutils 0.3.1 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 3de3edc..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/glusterfs-coreutils-60d57d8.tar.gz
-/glusterfs-coreutils-259f269.tar.gz
-/glusterfs-coreutils-c155815.tar.gz
-/glusterfs-coreutils-v0.3.0.tar.gz
+/*.tar.gz
diff --git a/adapting-to-ftruncate-signature-change.patch b/adapting-to-ftruncate-signature-change.patch
deleted file mode 100644
index f146e59..0000000
--- a/adapting-to-ftruncate-signature-change.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 1b5a326d48b3e2837d6952a8c710ef9c25a14c14 Mon Sep 17 00:00:00 2001
-From: Anoop C S <anoopcs(a)cryptolab.net>
-Date: Thu, 1 Aug 2019 16:42:24 +0530
-Subject: [PATCH] Adapt to change in ftruncate API signature changes (#37)
-
-Signed-off-by: Anoop C S <anoopcs(a)redhat.com>
----
- configure.ac | 3 ++-
- src/glfs-cp.c | 5 ++++-
- src/glfs-mv.c | 4 ++++
- src/glfs-put.c | 4 ++++
- 4 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5c4978e..ce38fe4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,7 +35,8 @@ AC_PROG_EGREP
-
- # Dependencies
- AC_CHECK_HEADERS([readline/readline.h readline/history.h],,[AC_MSG_ERROR([cannot find readline headers])])
--PKG_CHECK_MODULES([GLFS], [glusterfs-api >= 3],,[AC_MSG_ERROR([cannot find glusterfs api headers])])
-+PKG_CHECK_MODULES([GLFS], [glusterfs-api >= 3],[],[AC_MSG_ERROR([cannot find glusterfs api headers])])
-+PKG_CHECK_MODULES([GLFS_7_6],[glusterfs-api >= 7.6],[AC_DEFINE(HAVE_GLFS_7_6,1,[found glusterfs api version >= 7.6])], [no])
-
- AC_CHECK_PROG([HAVE_HELP2MAN],[help2man],[yes],[no])
- AM_CONDITIONAL([HAVE_HELP2MAN], [test "x$HAVE_HELP2MAN" = xyes])
-diff --git a/src/glfs-cp.c b/src/glfs-cp.c
-index 3edfcce..b778425 100644
---- a/src/glfs-cp.c
-+++ b/src/glfs-cp.c
-@@ -566,8 +566,11 @@ local_to_remote (const char *local_path, const char *remote_path, glfs_t *fs)
- error (0, errno, "failed to lock %s", full_path);
- goto out;
- }
--
-+#ifdef HAVE_GLFS_7_6
-+ ret = glfs_ftruncate (remote_fd, 0, NULL, NULL);
-+#else
- ret = glfs_ftruncate (remote_fd, 0);
-+#endif
- if (ret == -1) {
- error (0, errno, "failed to truncate %s", full_path);
- goto out;
-diff --git a/src/glfs-mv.c b/src/glfs-mv.c
-index dfe1d91..cacd66d 100644
---- a/src/glfs-mv.c
-+++ b/src/glfs-mv.c
-@@ -567,7 +567,11 @@ local_to_remote (const char *local_path, const char *remote_path, glfs_t *fs)
- goto out;
- }
-
-+#ifdef HAVE_GLFS_7_6
-+ ret = glfs_ftruncate (remote_fd, 0, NULL, NULL);
-+#else
- ret = glfs_ftruncate (remote_fd, 0);
-+#endif
- if (ret == -1) {
- error (0, errno, "failed to truncate %s", full_path);
- goto out;
-diff --git a/src/glfs-put.c b/src/glfs-put.c
-index c253d81..e7be636 100644
---- a/src/glfs-put.c
-+++ b/src/glfs-put.c
-@@ -256,7 +256,11 @@ gluster_put (glfs_t *fs, struct state *state)
- goto out;
- }
- } else {
-+#ifdef HAVE_GLFS_7_6
-+ ret = glfs_ftruncate (fd, 0, NULL, NULL);
-+#else
- ret = glfs_ftruncate (fd, 0);
-+#endif
- if (ret == -1) {
- error (0, errno, "truncate error: %s", filename);
- goto out;
---
-2.21.0
-
diff --git a/glusterfs-coreutils.spec b/glusterfs-coreutils.spec
index 0f8d188..77ffcb9 100644
--- a/glusterfs-coreutils.spec
+++ b/glusterfs-coreutils.spec
@@ -1,15 +1,15 @@
Summary: Core Utilities for the Gluster Distributed File System
Name: glusterfs-coreutils
-Version: 0.3.0
-Release: 7%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
License: GPLv3
URL: https://github.com/gluster/glusterfs-coreutils
# The source for this package was created from upstream source using the
# following command:
# make dist
+ExcludeArch: i686
Source0: https://github.com/gluster/glusterfs-coreutils/archive/v%{version}/%{name...
-Patch0001: adapting-to-ftruncate-signature-change.patch
Provides: bundled(gnulib)
@@ -27,7 +27,6 @@ stat, rm and tail that are implemented specifically using the GlusterFS API.
%prep
%setup -q -n %{name}-%{version}%{?prereltag}
-%patch0001 -p1
%build
sed -i 's|m4_esyscmd.*|0.3.0,|' configure.ac
@@ -43,6 +42,9 @@ make
%{_mandir}/man1/*
%changelog
+* Thu Aug 1 2019 Kaleb S. KEITHLEY <kkeithle [at] redhat.com> - 0.3.1-1
+- glusterfs-coreutils 0.3.1 GA
+
* Thu Aug 1 2019 Anoop C S <anoopcs(a)redhat.com> - 0.3.0-7
- Adapt to ftruncate api changes
diff --git a/sources b/sources
index 7b5f382..ed4ae9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-coreutils-v0.3.0.tar.gz) = 1a0fa450a7f3d26214a8ce37c0381dbae23b35110479dd56c205583fe0b74becb71f1c6194f9a7d114ba005aa2fa28132c066b766af26f204fa1bb2ccd6a9aa8
+SHA512 (glusterfs-coreutils-v0.3.1.tar.gz) = 0b94160f20d7d687c2dfeac6773dc8392b4b33f72aef111c9a2a3832793b19d86a1bda5d217d3f107dfcf066a139cc551ab3ce75206e230dc2b6b65b9d6c7d90
commit 1953d38c270dcdb0a74d9d5d63dd40d34048374c
Author: Anoop C S <anoopcs(a)redhat.com>
Date: Thu Aug 1 17:21:39 2019 +0530
Adapt to ftruncate API signature changes
Signed-off-by: Anoop C S <anoopcs(a)redhat.com>
diff --git a/adapting-to-ftruncate-signature-change.patch b/adapting-to-ftruncate-signature-change.patch
new file mode 100644
index 0000000..f146e59
--- /dev/null
+++ b/adapting-to-ftruncate-signature-change.patch
@@ -0,0 +1,79 @@
+From 1b5a326d48b3e2837d6952a8c710ef9c25a14c14 Mon Sep 17 00:00:00 2001
+From: Anoop C S <anoopcs(a)cryptolab.net>
+Date: Thu, 1 Aug 2019 16:42:24 +0530
+Subject: [PATCH] Adapt to change in ftruncate API signature changes (#37)
+
+Signed-off-by: Anoop C S <anoopcs(a)redhat.com>
+---
+ configure.ac | 3 ++-
+ src/glfs-cp.c | 5 ++++-
+ src/glfs-mv.c | 4 ++++
+ src/glfs-put.c | 4 ++++
+ 4 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5c4978e..ce38fe4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,7 +35,8 @@ AC_PROG_EGREP
+
+ # Dependencies
+ AC_CHECK_HEADERS([readline/readline.h readline/history.h],,[AC_MSG_ERROR([cannot find readline headers])])
+-PKG_CHECK_MODULES([GLFS], [glusterfs-api >= 3],,[AC_MSG_ERROR([cannot find glusterfs api headers])])
++PKG_CHECK_MODULES([GLFS], [glusterfs-api >= 3],[],[AC_MSG_ERROR([cannot find glusterfs api headers])])
++PKG_CHECK_MODULES([GLFS_7_6],[glusterfs-api >= 7.6],[AC_DEFINE(HAVE_GLFS_7_6,1,[found glusterfs api version >= 7.6])], [no])
+
+ AC_CHECK_PROG([HAVE_HELP2MAN],[help2man],[yes],[no])
+ AM_CONDITIONAL([HAVE_HELP2MAN], [test "x$HAVE_HELP2MAN" = xyes])
+diff --git a/src/glfs-cp.c b/src/glfs-cp.c
+index 3edfcce..b778425 100644
+--- a/src/glfs-cp.c
++++ b/src/glfs-cp.c
+@@ -566,8 +566,11 @@ local_to_remote (const char *local_path, const char *remote_path, glfs_t *fs)
+ error (0, errno, "failed to lock %s", full_path);
+ goto out;
+ }
+-
++#ifdef HAVE_GLFS_7_6
++ ret = glfs_ftruncate (remote_fd, 0, NULL, NULL);
++#else
+ ret = glfs_ftruncate (remote_fd, 0);
++#endif
+ if (ret == -1) {
+ error (0, errno, "failed to truncate %s", full_path);
+ goto out;
+diff --git a/src/glfs-mv.c b/src/glfs-mv.c
+index dfe1d91..cacd66d 100644
+--- a/src/glfs-mv.c
++++ b/src/glfs-mv.c
+@@ -567,7 +567,11 @@ local_to_remote (const char *local_path, const char *remote_path, glfs_t *fs)
+ goto out;
+ }
+
++#ifdef HAVE_GLFS_7_6
++ ret = glfs_ftruncate (remote_fd, 0, NULL, NULL);
++#else
+ ret = glfs_ftruncate (remote_fd, 0);
++#endif
+ if (ret == -1) {
+ error (0, errno, "failed to truncate %s", full_path);
+ goto out;
+diff --git a/src/glfs-put.c b/src/glfs-put.c
+index c253d81..e7be636 100644
+--- a/src/glfs-put.c
++++ b/src/glfs-put.c
+@@ -256,7 +256,11 @@ gluster_put (glfs_t *fs, struct state *state)
+ goto out;
+ }
+ } else {
++#ifdef HAVE_GLFS_7_6
++ ret = glfs_ftruncate (fd, 0, NULL, NULL);
++#else
+ ret = glfs_ftruncate (fd, 0);
++#endif
+ if (ret == -1) {
+ error (0, errno, "truncate error: %s", filename);
+ goto out;
+--
+2.21.0
+
diff --git a/glusterfs-coreutils.spec b/glusterfs-coreutils.spec
index 4e2f552..0f8d188 100644
--- a/glusterfs-coreutils.spec
+++ b/glusterfs-coreutils.spec
@@ -2,13 +2,14 @@
Summary: Core Utilities for the Gluster Distributed File System
Name: glusterfs-coreutils
Version: 0.3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv3
URL: https://github.com/gluster/glusterfs-coreutils
# The source for this package was created from upstream source using the
# following command:
# make dist
Source0: https://github.com/gluster/glusterfs-coreutils/archive/v%{version}/%{name...
+Patch0001: adapting-to-ftruncate-signature-change.patch
Provides: bundled(gnulib)
@@ -26,6 +27,7 @@ stat, rm and tail that are implemented specifically using the GlusterFS API.
%prep
%setup -q -n %{name}-%{version}%{?prereltag}
+%patch0001 -p1
%build
sed -i 's|m4_esyscmd.*|0.3.0,|' configure.ac
@@ -41,6 +43,9 @@ make
%{_mandir}/man1/*
%changelog
+* Thu Aug 1 2019 Anoop C S <anoopcs(a)redhat.com> - 0.3.0-7
+- Adapt to ftruncate api changes
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 251508295d45103448949170cda8ca02a3304e8a
Author: Anoop C S <anoopcs(a)redhat.com>
Date: Thu Aug 1 13:34:02 2019 +0530
Remove an old patch
Signed-off-by: Anoop C S <anoopcs(a)redhat.com>
diff --git a/0001-uninitialized.patch b/0001-uninitialized.patch
deleted file mode 100644
index 22f3b48..0000000
--- a/0001-uninitialized.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- glusterfs-coreutils-c155815/src/glfs-ls.c.orig 2018-03-20 07:31:33.552119109 -0400
-+++ glusterfs-coreutils-c155815/src/glfs-ls.c 2018-03-20 07:32:50.294119109 -0400
-@@ -432,7 +432,7 @@
- {
- char *pattern = NULL;
- char *real_path = NULL;
-- int ret;
-+ int ret = -1;
- struct stat statbuf;
-
- /**
-@@ -459,7 +459,6 @@
- if (pattern && strchr (pattern, '*') == NULL) {
- if (glfs_stat (fs, path, &statbuf)) {
- error (0, errno, "failed to access %s", state->url);
-- ret = -1;
- goto out;
- }
-
---- glusterfs-coreutils-c155815/src/glfs-tail.c.orig 2018-03-20 07:33:02.133119109 -0400
-+++ glusterfs-coreutils-c155815/src/glfs-tail.c 2018-03-20 07:33:46.237119109 -0400
-@@ -567,7 +567,7 @@
- {
- int argc = ctx->argc;
- char **argv = ctx->argv;
-- int ret;
-+ int ret = -1;
-
- state = init_state ();
- if (state == NULL) {
commit cfdbbad70c9dbe6554a0cf46e14b750b7baab397
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 25 03:58:27 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/glusterfs-coreutils.spec b/glusterfs-coreutils.spec
index c3d0c70..4e2f552 100644
--- a/glusterfs-coreutils.spec
+++ b/glusterfs-coreutils.spec
@@ -2,7 +2,7 @@
Summary: Core Utilities for the Gluster Distributed File System
Name: glusterfs-coreutils
Version: 0.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv3
URL: https://github.com/gluster/glusterfs-coreutils
# The source for this package was created from upstream source using the
@@ -41,6 +41,9 @@ make
%{_mandir}/man1/*
%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Wed Feb 20 2019 Kaleb S. KEITHLEY <kkeithle [at] redhat.com> - 0.3.0-5
- rebuild for f31/rawhide
commit 874a79eba3d18cd9688cdc7266fe06a90f60ad6c
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Wed Feb 20 14:19:41 2019 -0500
rebuild for f31/rawhide
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/glusterfs-coreutils.spec b/glusterfs-coreutils.spec
index 1437ae0..c3d0c70 100644
--- a/glusterfs-coreutils.spec
+++ b/glusterfs-coreutils.spec
@@ -2,7 +2,7 @@
Summary: Core Utilities for the Gluster Distributed File System
Name: glusterfs-coreutils
Version: 0.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv3
URL: https://github.com/gluster/glusterfs-coreutils
# The source for this package was created from upstream source using the
@@ -30,7 +30,7 @@ stat, rm and tail that are implemented specifically using the GlusterFS API.
%build
sed -i 's|m4_esyscmd.*|0.3.0,|' configure.ac
./autogen.sh && %configure
-make %{?_smp_mflags}
+make
%install
%make_install
@@ -41,6 +41,9 @@ make %{?_smp_mflags}
%{_mandir}/man1/*
%changelog
+* Wed Feb 20 2019 Kaleb S. KEITHLEY <kkeithle [at] redhat.com> - 0.3.0-5
+- rebuild for f31/rawhide
+
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.3.0-4
- Rebuild for readline 8.0
commit d34079f676170a41a18459e6a7331305cea3adf8
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sun Feb 17 09:30:50 2019 +0100
Rebuild for readline 8.0
diff --git a/glusterfs-coreutils.spec b/glusterfs-coreutils.spec
index f4adaba..1437ae0 100644
--- a/glusterfs-coreutils.spec
+++ b/glusterfs-coreutils.spec
@@ -2,7 +2,7 @@
Summary: Core Utilities for the Gluster Distributed File System
Name: glusterfs-coreutils
Version: 0.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv3
URL: https://github.com/gluster/glusterfs-coreutils
# The source for this package was created from upstream source using the
@@ -41,6 +41,9 @@ make %{?_smp_mflags}
%{_mandir}/man1/*
%changelog
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.3.0-4
+- Rebuild for readline 8.0
+
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 2e302b143a9921b3d5a322f855166070dcfa6635
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 31 22:57:39 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/glusterfs-coreutils.spec b/glusterfs-coreutils.spec
index aa5ef1d..f4adaba 100644
--- a/glusterfs-coreutils.spec
+++ b/glusterfs-coreutils.spec
@@ -2,7 +2,7 @@
Summary: Core Utilities for the Gluster Distributed File System
Name: glusterfs-coreutils
Version: 0.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3
URL: https://github.com/gluster/glusterfs-coreutils
# The source for this package was created from upstream source using the
@@ -41,6 +41,9 @@ make %{?_smp_mflags}
%{_mandir}/man1/*
%changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit e667fc58b54da33b5bea197e3a9f5beee6d6e4c2
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:17:46 2019 +0100
Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/glusterfs-coreutils.spec b/glusterfs-coreutils.spec
index 16609a8..aa5ef1d 100644
--- a/glusterfs-coreutils.spec
+++ b/glusterfs-coreutils.spec
@@ -4,7 +4,6 @@ Name: glusterfs-coreutils
Version: 0.3.0
Release: 2%{?dist}
License: GPLv3
-Group: System Environment/Base
URL: https://github.com/gluster/glusterfs-coreutils
# The source for this package was created from upstream source using the
# following command:
4 years, 8 months
Architecture specific change in rpms/glusterfs-coreutils.git
by githook-noreply@fedoraproject.org
The package rpms/glusterfs-coreutils.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/glusterfs-coreutils.git/commit/?i....
Change:
-ExcludeArch: i686
Thanks.
Full change:
============
commit 66afa59da4ea2e5886c0126e3220170a25682da8
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Thu Aug 1 16:06:35 2019 -0400
restore i686
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/glusterfs-coreutils.spec b/glusterfs-coreutils.spec
index 77ffcb9..c252113 100644
--- a/glusterfs-coreutils.spec
+++ b/glusterfs-coreutils.spec
@@ -2,13 +2,12 @@
Summary: Core Utilities for the Gluster Distributed File System
Name: glusterfs-coreutils
Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3
URL: https://github.com/gluster/glusterfs-coreutils
# The source for this package was created from upstream source using the
# following command:
# make dist
-ExcludeArch: i686
Source0: https://github.com/gluster/glusterfs-coreutils/archive/v%{version}/%{name...
Provides: bundled(gnulib)
@@ -42,6 +41,9 @@ make
%{_mandir}/man1/*
%changelog
+* Thu Aug 1 2019 Kaleb S. KEITHLEY <kkeithle [at] redhat.com> - 0.3.1-2
+- restore i686
+
* Thu Aug 1 2019 Kaleb S. KEITHLEY <kkeithle [at] redhat.com> - 0.3.1-1
- glusterfs-coreutils 0.3.1 GA
4 years, 8 months
Architecture specific change in rpms/ocaml-seq.git
by githook-noreply@fedoraproject.org
The package rpms/ocaml-seq.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/ocaml-seq.git/commit/?id=24c4890a....
Change:
+%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit 24c4890a132877fba5e56fa92b4da93935dbc152
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Aug 1 18:19:51 2019 +0100
Initial import.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0f62d13
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/0.1.tar.gz
diff --git a/0001-switch-between-definition-alias-module-depending-on-.patch b/0001-switch-between-definition-alias-module-depending-on-.patch
new file mode 100644
index 0000000..ceaa884
--- /dev/null
+++ b/0001-switch-between-definition-alias-module-depending-on-.patch
@@ -0,0 +1,125 @@
+From 2d608bd49647a4a6d0ec51c61cf63678212ea185 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Thu, 19 Apr 2018 00:08:23 -0500
+Subject: [PATCH 1/4] switch between definition/alias module depending on
+ ocaml's version
+
+---
+ .gitignore | 2 ++
+ Makefile | 11 ++++++++++-
+ select_version.ml | 14 ++++++++++++++
+ seq.opam | 3 ---
+ src/seq_alias.ml | 1 +
+ src/seq_alias.mli | 2 ++
+ src/{seq.ml => seq_redef.ml} | 0
+ src/{seq.mli => seq_redef.mli} | 2 --
+ 8 files changed, 29 insertions(+), 6 deletions(-)
+ create mode 100644 select_version.ml
+ create mode 100644 src/seq_alias.ml
+ create mode 100644 src/seq_alias.mli
+ rename src/{seq.ml => seq_redef.ml} (100%)
+ rename src/{seq.mli => seq_redef.mli} (99%)
+
+diff --git a/.gitignore b/.gitignore
+index e35d885..487f91e 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1 +1,3 @@
+ _build
++src/seq.ml
++src/seq.mli
+diff --git a/Makefile b/Makefile
+index fbf5dc9..c3048a5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,18 @@
+
++all: build
++
++OCAML_VERSION=$(shell ocaml -vnum)
++SELECT_CMD=$(shell ocaml select_version.ml $(OCAML_VERSION))
++
++select:
++ $(SELECT_CMD)
++
+ TARGETS=$(addprefix src/, seq.cma seq.cmxa seq.cmxs)
+-build:
++build: select
+ ocamlbuild $(TARGETS)
+
+ clean:
++ rm src/seq.ml src/seq.mli || true
+ ocamlbuild -clean
+
+ TOINSTALL=$(wildcard _build/src/*)
+diff --git a/select_version.ml b/select_version.ml
+new file mode 100644
+index 0000000..f92c665
+--- /dev/null
++++ b/select_version.ml
+@@ -0,0 +1,14 @@
++
++let () =
++ let version =
++ Scanf.sscanf Sys.argv.(1) "%d.%d" (fun major minor -> (major, minor))
++ in
++ let file =
++ if version < (4, 07) then
++ "cp src/seq_redef.ml src/seq.ml; cp src/seq_redef.mli src/seq.mli"
++ else
++ "cp src/seq_alias.ml src/seq.ml; cp src/seq_alias.mli src/seq.mli"
++ in
++ print_string file;
++ flush stdout
++
+diff --git a/seq.opam b/seq.opam
+index 8d3569c..b75ca84 100644
+--- a/seq.opam
++++ b/seq.opam
+@@ -21,8 +21,5 @@ tags: [ "iterator" "seq" "pure" "list" "compatibility" "cascade" ]
+ homepage: "https://github.com/c-cube/seq/"
+ bug-reports: "https://github.com/c-cube/seq/issues"
+ dev-repo: "https://github.com/c-cube/seq.git"
+-available: [
+- ocaml-version < "4.07.0"
+-]
+
+
+diff --git a/src/seq_alias.ml b/src/seq_alias.ml
+new file mode 100644
+index 0000000..49d3313
+--- /dev/null
++++ b/src/seq_alias.ml
+@@ -0,0 +1 @@
++include Stdlib.Seq
+diff --git a/src/seq_alias.mli b/src/seq_alias.mli
+new file mode 100644
+index 0000000..8872dd5
+--- /dev/null
++++ b/src/seq_alias.mli
+@@ -0,0 +1,2 @@
++
++include module type of Stdlib.Seq
+diff --git a/src/seq.ml b/src/seq_redef.ml
+similarity index 100%
+rename from src/seq.ml
+rename to src/seq_redef.ml
+diff --git a/src/seq.mli b/src/seq_redef.mli
+similarity index 99%
+rename from src/seq.mli
+rename to src/seq_redef.mli
+index f33c19a..c22dff9 100644
+--- a/src/seq.mli
++++ b/src/seq_redef.mli
+@@ -23,8 +23,6 @@
+ them in a lazy fashion rather than upfront.
+ *)
+
+-(** @since 4.07 *)
+-
+ type 'a t = unit -> 'a node
+ (** The type of delayed lists containing elements of type ['a].
+ Note that the concrete list node ['a node] is delayed under a closure,
+--
+2.22.0
+
diff --git a/0002-fix-opam-set-LGPL-as-the-license-close-2.patch b/0002-fix-opam-set-LGPL-as-the-license-close-2.patch
new file mode 100644
index 0000000..d1bf857
--- /dev/null
+++ b/0002-fix-opam-set-LGPL-as-the-license-close-2.patch
@@ -0,0 +1,25 @@
+From d2404b77e7f2e41e56a944b000b47b9f53c84cc0 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Fri, 13 Jul 2018 03:56:05 -0500
+Subject: [PATCH 2/4] fix(opam): set LGPL as the license (close #2)
+
+---
+ seq.opam | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/seq.opam b/seq.opam
+index b75ca84..c3862bb 100644
+--- a/seq.opam
++++ b/seq.opam
+@@ -3,7 +3,7 @@ name: "seq"
+ version: "0.1"
+ author: "Simon Cruanes"
+ maintainer: "simon.cruanes.2007(a)m4x.org"
+-license: "GPL"
++license: "LGPL2.1"
+ build: [
+ [make "build"]
+ ]
+--
+2.22.0
+
diff --git a/0003-fix-opam-specify-constraints-on-ocaml-4.07.patch b/0003-fix-opam-specify-constraints-on-ocaml-4.07.patch
new file mode 100644
index 0000000..c1aab7c
--- /dev/null
+++ b/0003-fix-opam-specify-constraints-on-ocaml-4.07.patch
@@ -0,0 +1,25 @@
+From 46b0991b2a5bfd5a3b5c2b7ea9d2fe7d71e677d0 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Thu, 30 Aug 2018 13:23:47 -0500
+Subject: [PATCH 3/4] fix(opam): specify constraints on ocaml<4.07
+
+see #3
+---
+ seq.opam | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/seq.opam b/seq.opam
+index c3862bb..d8f19cf 100644
+--- a/seq.opam
++++ b/seq.opam
+@@ -22,4 +22,7 @@ homepage: "https://github.com/c-cube/seq/"
+ bug-reports: "https://github.com/c-cube/seq/issues"
+ dev-repo: "https://github.com/c-cube/seq.git"
+
++# opam-repo contains a version for 4.07 and above that does nothing,
++# because OCaml starts having a `Seq` module in the stdlib
++available: [ocaml-version < "4.07.0"]
+
+--
+2.22.0
+
diff --git a/0004-add-license.patch b/0004-add-license.patch
new file mode 100644
index 0000000..11cc363
--- /dev/null
+++ b/0004-add-license.patch
@@ -0,0 +1,224 @@
+From c1fdba2441a7d11556c8c19c843c46d87110d3e4 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Thu, 1 Aug 2019 11:18:11 -0500
+Subject: [PATCH 4/4] add license
+
+close #4
+---
+ LICENSE | 204 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 204 insertions(+)
+ create mode 100644 LICENSE
+
+diff --git a/LICENSE b/LICENSE
+new file mode 100644
+index 0000000..f1f1f2f
+--- /dev/null
++++ b/LICENSE
+@@ -0,0 +1,204 @@
++The Seq library is copyright Institut National de Recherche en
++Informatique et en Automatique (INRIA) and distributed under the terms of the
++GNU Lesser General Public License (LGPL) version 2.1 (included below).
++
++As a special exception to the GNU Lesser General Public License, you
++may link, statically or dynamically, a "work that uses the Seq
++library" with a publicly distributed version of the Seq library to
++produce an executable file containing portions of the Seq library, and
++distribute that executable file under terms of your choice, without
++any of the additional requirements listed in clause 6 of the GNU
++Lesser General Public License. By "a publicly distributed version of
++the Seq library", we mean either the unmodified Seq library
++available from https://github/com/c-cube/seq, or a modified version of the Seq
++library that is distributed under the conditions defined in clause 2
++of the GNU Lesser General Public License. This exception does not
++however invalidate any other reasons why the executable file might be
++covered by the GNU Lesser General Public License.
++
++The files in directory toplevel/ are taken from findlib and are covered by
++the license in file toplevel/LICENSE-findlib.
++
++----------------------------------------------------------------------
++
++GNU LESSER GENERAL PUBLIC LICENSE
++
++Version 2.1, February 1999
++
++Copyright (C) 1991, 1999 Free Software Foundation, Inc.
++51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++Everyone is permitted to copy and distribute verbatim copies
++of this license document, but changing it is not allowed.
++
++[This is the first released version of the Lesser GPL. It also counts
++ as the successor of the GNU Library Public License, version 2, hence
++ the version number 2.1.]
++
++Preamble
++
++The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
++
++This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
++
++When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
++
++To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
++
++For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
++
++We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
++
++To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
++
++Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
++
++Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
++
++When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
++
++We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
++
++For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
++
++In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
++
++Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
++
++The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
++
++TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++
++0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
++
++A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
++
++The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
++
++"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
++
++Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
++
++1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
++
++You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
++
++2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
++
++ a) The modified work must itself be a software library.
++ b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
++ c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
++ d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
++
++ (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
++
++These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
++
++Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
++
++In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
++
++3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
++
++Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
++
++This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
++
++4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
++
++If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
++
++5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
++
++However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
++
++When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
++
++If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
++
++Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
++
++6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
++
++You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
++
++ a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
++ b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
++ c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
++ d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
++ e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
++
++For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
++
++It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
++
++7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
++
++ a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
++ b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
++
++8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
++
++9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
++
++10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
++
++11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
++
++If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
++
++It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
++
++This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
++
++12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
++
++13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
++
++Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
++
++14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
++
++NO WARRANTY
++
++15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
++
++16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
++END OF TERMS AND CONDITIONS
++
++How to Apply These Terms to Your New Libraries
++
++If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License).
++
++To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
++
++one line to give the library's name and an idea of what it does.
++Copyright (C) year name of author
++
++This library is free software; you can redistribute it and/or
++modify it under the terms of the GNU Lesser General Public
++License as published by the Free Software Foundation; either
++version 2.1 of the License, or (at your option) any later version.
++
++This library is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++Lesser General Public License for more details.
++
++You should have received a copy of the GNU Lesser General Public
++License along with this library; if not, write to the Free Software
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++
++Also add information on how to contact you by electronic and paper mail.
++
++You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names:
++
++Yoyodyne, Inc., hereby disclaims all copyright interest in
++the library `Frob' (a library for tweaking knobs) written
++by James Random Hacker.
++
++signature of Ty Coon, 1 April 1990
++Ty Coon, President of Vice
++
++That's all there is to it!
++
++--------------------------------------------------
+--
+2.22.0
+
diff --git a/README.md b/README.md
deleted file mode 100644
index b17da9b..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ocaml-seq
-
-The ocaml-seq package
\ No newline at end of file
diff --git a/ocaml-seq.spec b/ocaml-seq.spec
new file mode 100644
index 0000000..8f32747
--- /dev/null
+++ b/ocaml-seq.spec
@@ -0,0 +1,89 @@
+Name: ocaml-seq
+Version: 0.1
+Release: 3%{?dist}
+Summary: Compatibility package for OCaml's standard iterator type
+License: LGPLv2+ with exceptions
+
+URL: https://github.com/c-cube/seq
+Source0: https://github.com/c-cube/seq/archive/0.1.tar.gz
+
+# Upstream patches since 0.1 was released.
+Patch0001: 0001-switch-between-definition-alias-module-depending-on-.patch
+Patch0002: 0002-fix-opam-set-LGPL-as-the-license-close-2.patch
+Patch0003: 0003-fix-opam-specify-constraints-on-ocaml-4.07.patch
+Patch0004: 0004-add-license.patch
+
+BuildRequires: ocaml
+BuildRequires: ocaml-findlib-devel
+BuildRequires: ocaml-ocamlbuild-devel
+
+
+%description
+Compatibility package for OCaml's standard iterator type starting from 4.07.
+
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name} = %{version}-%{release}
+
+
+%description devel
+The %{name}-devel package contains libraries and signature files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q -n seq-%{version}
+%autopatch -p1
+
+
+%build
+make %{?_smp_mflags} all
+
+
+%install
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR
+mkdir -p $OCAMLFIND_DESTDIR/stublibs
+make install
+
+# Don't ship the .ml file.
+rm $OCAMLFIND_DESTDIR/seq/seq.ml
+
+
+%files
+%doc README.md
+%license LICENSE
+%{_libdir}/ocaml/seq
+%ifarch %{ocaml_native_compiler}
+%exclude %{_libdir}/ocaml/seq/*.a
+%exclude %{_libdir}/ocaml/seq/*.cmxa
+%exclude %{_libdir}/ocaml/seq/*.cmx
+%endif
+%exclude %{_libdir}/ocaml/seq/*.mli
+%exclude %{_libdir}/ocaml/seq/META
+
+
+%files devel
+%license LICENSE
+%ifarch %{ocaml_native_compiler}
+%{_libdir}/ocaml/seq/*.a
+%{_libdir}/ocaml/seq/*.cmxa
+%{_libdir}/ocaml/seq/*.cmx
+%endif
+%{_libdir}/ocaml/seq/*.mli
+%{_libdir}/ocaml/seq/META
+
+
+%changelog
+* Thu Aug 1 2019 Richard W.M. Jones <rjones(a)redhat.com> - 0.1-3
+- Add license file from upstream.
+
+* Thu Aug 1 2019 Richard W.M. Jones <rjones(a)redhat.com> - 0.1-2
+- Add a link to upstream bug about the license.
+- Don't install seq.ml file.
+- Don't package META twice.
+
+* Thu Aug 1 2019 Richard W.M. Jones <rjones(a)redhat.com> - 0.1-1
+- Initial version.
diff --git a/sources b/sources
new file mode 100644
index 0000000..2dc3b50
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (0.1.tar.gz) = cf0df428408efd8f593765c419007c3b181c1234fa957bd09bd96bbbbc7950dcd329429a8a22573680fdfd46847e21befae29ade967509690428ba2b90fe83f2
4 years, 8 months
Architecture specific change in rpms/ocaml-seq.git
by githook-noreply@fedoraproject.org
The package rpms/ocaml-seq.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/ocaml-seq.git/commit/?id=24c4890a....
Change:
+%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit 24c4890a132877fba5e56fa92b4da93935dbc152
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Aug 1 18:19:51 2019 +0100
Initial import.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0f62d13
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/0.1.tar.gz
diff --git a/0001-switch-between-definition-alias-module-depending-on-.patch b/0001-switch-between-definition-alias-module-depending-on-.patch
new file mode 100644
index 0000000..ceaa884
--- /dev/null
+++ b/0001-switch-between-definition-alias-module-depending-on-.patch
@@ -0,0 +1,125 @@
+From 2d608bd49647a4a6d0ec51c61cf63678212ea185 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Thu, 19 Apr 2018 00:08:23 -0500
+Subject: [PATCH 1/4] switch between definition/alias module depending on
+ ocaml's version
+
+---
+ .gitignore | 2 ++
+ Makefile | 11 ++++++++++-
+ select_version.ml | 14 ++++++++++++++
+ seq.opam | 3 ---
+ src/seq_alias.ml | 1 +
+ src/seq_alias.mli | 2 ++
+ src/{seq.ml => seq_redef.ml} | 0
+ src/{seq.mli => seq_redef.mli} | 2 --
+ 8 files changed, 29 insertions(+), 6 deletions(-)
+ create mode 100644 select_version.ml
+ create mode 100644 src/seq_alias.ml
+ create mode 100644 src/seq_alias.mli
+ rename src/{seq.ml => seq_redef.ml} (100%)
+ rename src/{seq.mli => seq_redef.mli} (99%)
+
+diff --git a/.gitignore b/.gitignore
+index e35d885..487f91e 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1 +1,3 @@
+ _build
++src/seq.ml
++src/seq.mli
+diff --git a/Makefile b/Makefile
+index fbf5dc9..c3048a5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,18 @@
+
++all: build
++
++OCAML_VERSION=$(shell ocaml -vnum)
++SELECT_CMD=$(shell ocaml select_version.ml $(OCAML_VERSION))
++
++select:
++ $(SELECT_CMD)
++
+ TARGETS=$(addprefix src/, seq.cma seq.cmxa seq.cmxs)
+-build:
++build: select
+ ocamlbuild $(TARGETS)
+
+ clean:
++ rm src/seq.ml src/seq.mli || true
+ ocamlbuild -clean
+
+ TOINSTALL=$(wildcard _build/src/*)
+diff --git a/select_version.ml b/select_version.ml
+new file mode 100644
+index 0000000..f92c665
+--- /dev/null
++++ b/select_version.ml
+@@ -0,0 +1,14 @@
++
++let () =
++ let version =
++ Scanf.sscanf Sys.argv.(1) "%d.%d" (fun major minor -> (major, minor))
++ in
++ let file =
++ if version < (4, 07) then
++ "cp src/seq_redef.ml src/seq.ml; cp src/seq_redef.mli src/seq.mli"
++ else
++ "cp src/seq_alias.ml src/seq.ml; cp src/seq_alias.mli src/seq.mli"
++ in
++ print_string file;
++ flush stdout
++
+diff --git a/seq.opam b/seq.opam
+index 8d3569c..b75ca84 100644
+--- a/seq.opam
++++ b/seq.opam
+@@ -21,8 +21,5 @@ tags: [ "iterator" "seq" "pure" "list" "compatibility" "cascade" ]
+ homepage: "https://github.com/c-cube/seq/"
+ bug-reports: "https://github.com/c-cube/seq/issues"
+ dev-repo: "https://github.com/c-cube/seq.git"
+-available: [
+- ocaml-version < "4.07.0"
+-]
+
+
+diff --git a/src/seq_alias.ml b/src/seq_alias.ml
+new file mode 100644
+index 0000000..49d3313
+--- /dev/null
++++ b/src/seq_alias.ml
+@@ -0,0 +1 @@
++include Stdlib.Seq
+diff --git a/src/seq_alias.mli b/src/seq_alias.mli
+new file mode 100644
+index 0000000..8872dd5
+--- /dev/null
++++ b/src/seq_alias.mli
+@@ -0,0 +1,2 @@
++
++include module type of Stdlib.Seq
+diff --git a/src/seq.ml b/src/seq_redef.ml
+similarity index 100%
+rename from src/seq.ml
+rename to src/seq_redef.ml
+diff --git a/src/seq.mli b/src/seq_redef.mli
+similarity index 99%
+rename from src/seq.mli
+rename to src/seq_redef.mli
+index f33c19a..c22dff9 100644
+--- a/src/seq.mli
++++ b/src/seq_redef.mli
+@@ -23,8 +23,6 @@
+ them in a lazy fashion rather than upfront.
+ *)
+
+-(** @since 4.07 *)
+-
+ type 'a t = unit -> 'a node
+ (** The type of delayed lists containing elements of type ['a].
+ Note that the concrete list node ['a node] is delayed under a closure,
+--
+2.22.0
+
diff --git a/0002-fix-opam-set-LGPL-as-the-license-close-2.patch b/0002-fix-opam-set-LGPL-as-the-license-close-2.patch
new file mode 100644
index 0000000..d1bf857
--- /dev/null
+++ b/0002-fix-opam-set-LGPL-as-the-license-close-2.patch
@@ -0,0 +1,25 @@
+From d2404b77e7f2e41e56a944b000b47b9f53c84cc0 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Fri, 13 Jul 2018 03:56:05 -0500
+Subject: [PATCH 2/4] fix(opam): set LGPL as the license (close #2)
+
+---
+ seq.opam | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/seq.opam b/seq.opam
+index b75ca84..c3862bb 100644
+--- a/seq.opam
++++ b/seq.opam
+@@ -3,7 +3,7 @@ name: "seq"
+ version: "0.1"
+ author: "Simon Cruanes"
+ maintainer: "simon.cruanes.2007(a)m4x.org"
+-license: "GPL"
++license: "LGPL2.1"
+ build: [
+ [make "build"]
+ ]
+--
+2.22.0
+
diff --git a/0003-fix-opam-specify-constraints-on-ocaml-4.07.patch b/0003-fix-opam-specify-constraints-on-ocaml-4.07.patch
new file mode 100644
index 0000000..c1aab7c
--- /dev/null
+++ b/0003-fix-opam-specify-constraints-on-ocaml-4.07.patch
@@ -0,0 +1,25 @@
+From 46b0991b2a5bfd5a3b5c2b7ea9d2fe7d71e677d0 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Thu, 30 Aug 2018 13:23:47 -0500
+Subject: [PATCH 3/4] fix(opam): specify constraints on ocaml<4.07
+
+see #3
+---
+ seq.opam | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/seq.opam b/seq.opam
+index c3862bb..d8f19cf 100644
+--- a/seq.opam
++++ b/seq.opam
+@@ -22,4 +22,7 @@ homepage: "https://github.com/c-cube/seq/"
+ bug-reports: "https://github.com/c-cube/seq/issues"
+ dev-repo: "https://github.com/c-cube/seq.git"
+
++# opam-repo contains a version for 4.07 and above that does nothing,
++# because OCaml starts having a `Seq` module in the stdlib
++available: [ocaml-version < "4.07.0"]
+
+--
+2.22.0
+
diff --git a/0004-add-license.patch b/0004-add-license.patch
new file mode 100644
index 0000000..11cc363
--- /dev/null
+++ b/0004-add-license.patch
@@ -0,0 +1,224 @@
+From c1fdba2441a7d11556c8c19c843c46d87110d3e4 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Thu, 1 Aug 2019 11:18:11 -0500
+Subject: [PATCH 4/4] add license
+
+close #4
+---
+ LICENSE | 204 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 204 insertions(+)
+ create mode 100644 LICENSE
+
+diff --git a/LICENSE b/LICENSE
+new file mode 100644
+index 0000000..f1f1f2f
+--- /dev/null
++++ b/LICENSE
+@@ -0,0 +1,204 @@
++The Seq library is copyright Institut National de Recherche en
++Informatique et en Automatique (INRIA) and distributed under the terms of the
++GNU Lesser General Public License (LGPL) version 2.1 (included below).
++
++As a special exception to the GNU Lesser General Public License, you
++may link, statically or dynamically, a "work that uses the Seq
++library" with a publicly distributed version of the Seq library to
++produce an executable file containing portions of the Seq library, and
++distribute that executable file under terms of your choice, without
++any of the additional requirements listed in clause 6 of the GNU
++Lesser General Public License. By "a publicly distributed version of
++the Seq library", we mean either the unmodified Seq library
++available from https://github/com/c-cube/seq, or a modified version of the Seq
++library that is distributed under the conditions defined in clause 2
++of the GNU Lesser General Public License. This exception does not
++however invalidate any other reasons why the executable file might be
++covered by the GNU Lesser General Public License.
++
++The files in directory toplevel/ are taken from findlib and are covered by
++the license in file toplevel/LICENSE-findlib.
++
++----------------------------------------------------------------------
++
++GNU LESSER GENERAL PUBLIC LICENSE
++
++Version 2.1, February 1999
++
++Copyright (C) 1991, 1999 Free Software Foundation, Inc.
++51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++Everyone is permitted to copy and distribute verbatim copies
++of this license document, but changing it is not allowed.
++
++[This is the first released version of the Lesser GPL. It also counts
++ as the successor of the GNU Library Public License, version 2, hence
++ the version number 2.1.]
++
++Preamble
++
++The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
++
++This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
++
++When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
++
++To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
++
++For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
++
++We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
++
++To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
++
++Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
++
++Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
++
++When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
++
++We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
++
++For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
++
++In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
++
++Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
++
++The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
++
++TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++
++0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
++
++A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
++
++The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
++
++"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
++
++Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
++
++1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
++
++You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
++
++2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
++
++ a) The modified work must itself be a software library.
++ b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
++ c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
++ d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
++
++ (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
++
++These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
++
++Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
++
++In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
++
++3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
++
++Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
++
++This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
++
++4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
++
++If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
++
++5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
++
++However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
++
++When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
++
++If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
++
++Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
++
++6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
++
++You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
++
++ a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
++ b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
++ c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
++ d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
++ e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
++
++For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
++
++It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
++
++7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
++
++ a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
++ b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
++
++8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
++
++9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
++
++10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
++
++11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
++
++If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
++
++It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
++
++This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
++
++12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
++
++13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
++
++Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
++
++14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
++
++NO WARRANTY
++
++15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
++
++16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
++END OF TERMS AND CONDITIONS
++
++How to Apply These Terms to Your New Libraries
++
++If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License).
++
++To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
++
++one line to give the library's name and an idea of what it does.
++Copyright (C) year name of author
++
++This library is free software; you can redistribute it and/or
++modify it under the terms of the GNU Lesser General Public
++License as published by the Free Software Foundation; either
++version 2.1 of the License, or (at your option) any later version.
++
++This library is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++Lesser General Public License for more details.
++
++You should have received a copy of the GNU Lesser General Public
++License along with this library; if not, write to the Free Software
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++
++Also add information on how to contact you by electronic and paper mail.
++
++You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names:
++
++Yoyodyne, Inc., hereby disclaims all copyright interest in
++the library `Frob' (a library for tweaking knobs) written
++by James Random Hacker.
++
++signature of Ty Coon, 1 April 1990
++Ty Coon, President of Vice
++
++That's all there is to it!
++
++--------------------------------------------------
+--
+2.22.0
+
diff --git a/README.md b/README.md
deleted file mode 100644
index b17da9b..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ocaml-seq
-
-The ocaml-seq package
\ No newline at end of file
diff --git a/ocaml-seq.spec b/ocaml-seq.spec
new file mode 100644
index 0000000..8f32747
--- /dev/null
+++ b/ocaml-seq.spec
@@ -0,0 +1,89 @@
+Name: ocaml-seq
+Version: 0.1
+Release: 3%{?dist}
+Summary: Compatibility package for OCaml's standard iterator type
+License: LGPLv2+ with exceptions
+
+URL: https://github.com/c-cube/seq
+Source0: https://github.com/c-cube/seq/archive/0.1.tar.gz
+
+# Upstream patches since 0.1 was released.
+Patch0001: 0001-switch-between-definition-alias-module-depending-on-.patch
+Patch0002: 0002-fix-opam-set-LGPL-as-the-license-close-2.patch
+Patch0003: 0003-fix-opam-specify-constraints-on-ocaml-4.07.patch
+Patch0004: 0004-add-license.patch
+
+BuildRequires: ocaml
+BuildRequires: ocaml-findlib-devel
+BuildRequires: ocaml-ocamlbuild-devel
+
+
+%description
+Compatibility package for OCaml's standard iterator type starting from 4.07.
+
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name} = %{version}-%{release}
+
+
+%description devel
+The %{name}-devel package contains libraries and signature files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q -n seq-%{version}
+%autopatch -p1
+
+
+%build
+make %{?_smp_mflags} all
+
+
+%install
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR
+mkdir -p $OCAMLFIND_DESTDIR/stublibs
+make install
+
+# Don't ship the .ml file.
+rm $OCAMLFIND_DESTDIR/seq/seq.ml
+
+
+%files
+%doc README.md
+%license LICENSE
+%{_libdir}/ocaml/seq
+%ifarch %{ocaml_native_compiler}
+%exclude %{_libdir}/ocaml/seq/*.a
+%exclude %{_libdir}/ocaml/seq/*.cmxa
+%exclude %{_libdir}/ocaml/seq/*.cmx
+%endif
+%exclude %{_libdir}/ocaml/seq/*.mli
+%exclude %{_libdir}/ocaml/seq/META
+
+
+%files devel
+%license LICENSE
+%ifarch %{ocaml_native_compiler}
+%{_libdir}/ocaml/seq/*.a
+%{_libdir}/ocaml/seq/*.cmxa
+%{_libdir}/ocaml/seq/*.cmx
+%endif
+%{_libdir}/ocaml/seq/*.mli
+%{_libdir}/ocaml/seq/META
+
+
+%changelog
+* Thu Aug 1 2019 Richard W.M. Jones <rjones(a)redhat.com> - 0.1-3
+- Add license file from upstream.
+
+* Thu Aug 1 2019 Richard W.M. Jones <rjones(a)redhat.com> - 0.1-2
+- Add a link to upstream bug about the license.
+- Don't install seq.ml file.
+- Don't package META twice.
+
+* Thu Aug 1 2019 Richard W.M. Jones <rjones(a)redhat.com> - 0.1-1
+- Initial version.
diff --git a/sources b/sources
new file mode 100644
index 0000000..2dc3b50
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (0.1.tar.gz) = cf0df428408efd8f593765c419007c3b181c1234fa957bd09bd96bbbbc7950dcd329429a8a22573680fdfd46847e21befae29ade967509690428ba2b90fe83f2
4 years, 8 months
Architecture specific change in rpms/ocaml-seq.git
by githook-noreply@fedoraproject.org
The package rpms/ocaml-seq.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/ocaml-seq.git/commit/?id=24c4890a....
Change:
+%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit 24c4890a132877fba5e56fa92b4da93935dbc152
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Aug 1 18:19:51 2019 +0100
Initial import.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0f62d13
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/0.1.tar.gz
diff --git a/0001-switch-between-definition-alias-module-depending-on-.patch b/0001-switch-between-definition-alias-module-depending-on-.patch
new file mode 100644
index 0000000..ceaa884
--- /dev/null
+++ b/0001-switch-between-definition-alias-module-depending-on-.patch
@@ -0,0 +1,125 @@
+From 2d608bd49647a4a6d0ec51c61cf63678212ea185 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Thu, 19 Apr 2018 00:08:23 -0500
+Subject: [PATCH 1/4] switch between definition/alias module depending on
+ ocaml's version
+
+---
+ .gitignore | 2 ++
+ Makefile | 11 ++++++++++-
+ select_version.ml | 14 ++++++++++++++
+ seq.opam | 3 ---
+ src/seq_alias.ml | 1 +
+ src/seq_alias.mli | 2 ++
+ src/{seq.ml => seq_redef.ml} | 0
+ src/{seq.mli => seq_redef.mli} | 2 --
+ 8 files changed, 29 insertions(+), 6 deletions(-)
+ create mode 100644 select_version.ml
+ create mode 100644 src/seq_alias.ml
+ create mode 100644 src/seq_alias.mli
+ rename src/{seq.ml => seq_redef.ml} (100%)
+ rename src/{seq.mli => seq_redef.mli} (99%)
+
+diff --git a/.gitignore b/.gitignore
+index e35d885..487f91e 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1 +1,3 @@
+ _build
++src/seq.ml
++src/seq.mli
+diff --git a/Makefile b/Makefile
+index fbf5dc9..c3048a5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,18 @@
+
++all: build
++
++OCAML_VERSION=$(shell ocaml -vnum)
++SELECT_CMD=$(shell ocaml select_version.ml $(OCAML_VERSION))
++
++select:
++ $(SELECT_CMD)
++
+ TARGETS=$(addprefix src/, seq.cma seq.cmxa seq.cmxs)
+-build:
++build: select
+ ocamlbuild $(TARGETS)
+
+ clean:
++ rm src/seq.ml src/seq.mli || true
+ ocamlbuild -clean
+
+ TOINSTALL=$(wildcard _build/src/*)
+diff --git a/select_version.ml b/select_version.ml
+new file mode 100644
+index 0000000..f92c665
+--- /dev/null
++++ b/select_version.ml
+@@ -0,0 +1,14 @@
++
++let () =
++ let version =
++ Scanf.sscanf Sys.argv.(1) "%d.%d" (fun major minor -> (major, minor))
++ in
++ let file =
++ if version < (4, 07) then
++ "cp src/seq_redef.ml src/seq.ml; cp src/seq_redef.mli src/seq.mli"
++ else
++ "cp src/seq_alias.ml src/seq.ml; cp src/seq_alias.mli src/seq.mli"
++ in
++ print_string file;
++ flush stdout
++
+diff --git a/seq.opam b/seq.opam
+index 8d3569c..b75ca84 100644
+--- a/seq.opam
++++ b/seq.opam
+@@ -21,8 +21,5 @@ tags: [ "iterator" "seq" "pure" "list" "compatibility" "cascade" ]
+ homepage: "https://github.com/c-cube/seq/"
+ bug-reports: "https://github.com/c-cube/seq/issues"
+ dev-repo: "https://github.com/c-cube/seq.git"
+-available: [
+- ocaml-version < "4.07.0"
+-]
+
+
+diff --git a/src/seq_alias.ml b/src/seq_alias.ml
+new file mode 100644
+index 0000000..49d3313
+--- /dev/null
++++ b/src/seq_alias.ml
+@@ -0,0 +1 @@
++include Stdlib.Seq
+diff --git a/src/seq_alias.mli b/src/seq_alias.mli
+new file mode 100644
+index 0000000..8872dd5
+--- /dev/null
++++ b/src/seq_alias.mli
+@@ -0,0 +1,2 @@
++
++include module type of Stdlib.Seq
+diff --git a/src/seq.ml b/src/seq_redef.ml
+similarity index 100%
+rename from src/seq.ml
+rename to src/seq_redef.ml
+diff --git a/src/seq.mli b/src/seq_redef.mli
+similarity index 99%
+rename from src/seq.mli
+rename to src/seq_redef.mli
+index f33c19a..c22dff9 100644
+--- a/src/seq.mli
++++ b/src/seq_redef.mli
+@@ -23,8 +23,6 @@
+ them in a lazy fashion rather than upfront.
+ *)
+
+-(** @since 4.07 *)
+-
+ type 'a t = unit -> 'a node
+ (** The type of delayed lists containing elements of type ['a].
+ Note that the concrete list node ['a node] is delayed under a closure,
+--
+2.22.0
+
diff --git a/0002-fix-opam-set-LGPL-as-the-license-close-2.patch b/0002-fix-opam-set-LGPL-as-the-license-close-2.patch
new file mode 100644
index 0000000..d1bf857
--- /dev/null
+++ b/0002-fix-opam-set-LGPL-as-the-license-close-2.patch
@@ -0,0 +1,25 @@
+From d2404b77e7f2e41e56a944b000b47b9f53c84cc0 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Fri, 13 Jul 2018 03:56:05 -0500
+Subject: [PATCH 2/4] fix(opam): set LGPL as the license (close #2)
+
+---
+ seq.opam | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/seq.opam b/seq.opam
+index b75ca84..c3862bb 100644
+--- a/seq.opam
++++ b/seq.opam
+@@ -3,7 +3,7 @@ name: "seq"
+ version: "0.1"
+ author: "Simon Cruanes"
+ maintainer: "simon.cruanes.2007(a)m4x.org"
+-license: "GPL"
++license: "LGPL2.1"
+ build: [
+ [make "build"]
+ ]
+--
+2.22.0
+
diff --git a/0003-fix-opam-specify-constraints-on-ocaml-4.07.patch b/0003-fix-opam-specify-constraints-on-ocaml-4.07.patch
new file mode 100644
index 0000000..c1aab7c
--- /dev/null
+++ b/0003-fix-opam-specify-constraints-on-ocaml-4.07.patch
@@ -0,0 +1,25 @@
+From 46b0991b2a5bfd5a3b5c2b7ea9d2fe7d71e677d0 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Thu, 30 Aug 2018 13:23:47 -0500
+Subject: [PATCH 3/4] fix(opam): specify constraints on ocaml<4.07
+
+see #3
+---
+ seq.opam | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/seq.opam b/seq.opam
+index c3862bb..d8f19cf 100644
+--- a/seq.opam
++++ b/seq.opam
+@@ -22,4 +22,7 @@ homepage: "https://github.com/c-cube/seq/"
+ bug-reports: "https://github.com/c-cube/seq/issues"
+ dev-repo: "https://github.com/c-cube/seq.git"
+
++# opam-repo contains a version for 4.07 and above that does nothing,
++# because OCaml starts having a `Seq` module in the stdlib
++available: [ocaml-version < "4.07.0"]
+
+--
+2.22.0
+
diff --git a/0004-add-license.patch b/0004-add-license.patch
new file mode 100644
index 0000000..11cc363
--- /dev/null
+++ b/0004-add-license.patch
@@ -0,0 +1,224 @@
+From c1fdba2441a7d11556c8c19c843c46d87110d3e4 Mon Sep 17 00:00:00 2001
+From: Simon Cruanes <simon.cruanes.2007(a)m4x.org>
+Date: Thu, 1 Aug 2019 11:18:11 -0500
+Subject: [PATCH 4/4] add license
+
+close #4
+---
+ LICENSE | 204 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 204 insertions(+)
+ create mode 100644 LICENSE
+
+diff --git a/LICENSE b/LICENSE
+new file mode 100644
+index 0000000..f1f1f2f
+--- /dev/null
++++ b/LICENSE
+@@ -0,0 +1,204 @@
++The Seq library is copyright Institut National de Recherche en
++Informatique et en Automatique (INRIA) and distributed under the terms of the
++GNU Lesser General Public License (LGPL) version 2.1 (included below).
++
++As a special exception to the GNU Lesser General Public License, you
++may link, statically or dynamically, a "work that uses the Seq
++library" with a publicly distributed version of the Seq library to
++produce an executable file containing portions of the Seq library, and
++distribute that executable file under terms of your choice, without
++any of the additional requirements listed in clause 6 of the GNU
++Lesser General Public License. By "a publicly distributed version of
++the Seq library", we mean either the unmodified Seq library
++available from https://github/com/c-cube/seq, or a modified version of the Seq
++library that is distributed under the conditions defined in clause 2
++of the GNU Lesser General Public License. This exception does not
++however invalidate any other reasons why the executable file might be
++covered by the GNU Lesser General Public License.
++
++The files in directory toplevel/ are taken from findlib and are covered by
++the license in file toplevel/LICENSE-findlib.
++
++----------------------------------------------------------------------
++
++GNU LESSER GENERAL PUBLIC LICENSE
++
++Version 2.1, February 1999
++
++Copyright (C) 1991, 1999 Free Software Foundation, Inc.
++51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++Everyone is permitted to copy and distribute verbatim copies
++of this license document, but changing it is not allowed.
++
++[This is the first released version of the Lesser GPL. It also counts
++ as the successor of the GNU Library Public License, version 2, hence
++ the version number 2.1.]
++
++Preamble
++
++The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
++
++This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
++
++When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
++
++To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
++
++For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
++
++We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
++
++To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
++
++Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
++
++Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
++
++When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
++
++We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
++
++For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
++
++In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
++
++Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
++
++The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
++
++TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++
++0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
++
++A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
++
++The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
++
++"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
++
++Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
++
++1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
++
++You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
++
++2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
++
++ a) The modified work must itself be a software library.
++ b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
++ c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
++ d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
++
++ (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
++
++These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
++
++Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
++
++In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
++
++3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
++
++Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
++
++This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
++
++4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
++
++If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
++
++5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
++
++However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
++
++When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
++
++If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
++
++Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
++
++6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
++
++You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
++
++ a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
++ b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
++ c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
++ d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
++ e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
++
++For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
++
++It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
++
++7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
++
++ a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
++ b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
++
++8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
++
++9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
++
++10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
++
++11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
++
++If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
++
++It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
++
++This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
++
++12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
++
++13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
++
++Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
++
++14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
++
++NO WARRANTY
++
++15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
++
++16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
++END OF TERMS AND CONDITIONS
++
++How to Apply These Terms to Your New Libraries
++
++If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License).
++
++To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
++
++one line to give the library's name and an idea of what it does.
++Copyright (C) year name of author
++
++This library is free software; you can redistribute it and/or
++modify it under the terms of the GNU Lesser General Public
++License as published by the Free Software Foundation; either
++version 2.1 of the License, or (at your option) any later version.
++
++This library is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++Lesser General Public License for more details.
++
++You should have received a copy of the GNU Lesser General Public
++License along with this library; if not, write to the Free Software
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++
++Also add information on how to contact you by electronic and paper mail.
++
++You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names:
++
++Yoyodyne, Inc., hereby disclaims all copyright interest in
++the library `Frob' (a library for tweaking knobs) written
++by James Random Hacker.
++
++signature of Ty Coon, 1 April 1990
++Ty Coon, President of Vice
++
++That's all there is to it!
++
++--------------------------------------------------
+--
+2.22.0
+
diff --git a/README.md b/README.md
deleted file mode 100644
index b17da9b..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ocaml-seq
-
-The ocaml-seq package
\ No newline at end of file
diff --git a/ocaml-seq.spec b/ocaml-seq.spec
new file mode 100644
index 0000000..8f32747
--- /dev/null
+++ b/ocaml-seq.spec
@@ -0,0 +1,89 @@
+Name: ocaml-seq
+Version: 0.1
+Release: 3%{?dist}
+Summary: Compatibility package for OCaml's standard iterator type
+License: LGPLv2+ with exceptions
+
+URL: https://github.com/c-cube/seq
+Source0: https://github.com/c-cube/seq/archive/0.1.tar.gz
+
+# Upstream patches since 0.1 was released.
+Patch0001: 0001-switch-between-definition-alias-module-depending-on-.patch
+Patch0002: 0002-fix-opam-set-LGPL-as-the-license-close-2.patch
+Patch0003: 0003-fix-opam-specify-constraints-on-ocaml-4.07.patch
+Patch0004: 0004-add-license.patch
+
+BuildRequires: ocaml
+BuildRequires: ocaml-findlib-devel
+BuildRequires: ocaml-ocamlbuild-devel
+
+
+%description
+Compatibility package for OCaml's standard iterator type starting from 4.07.
+
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name} = %{version}-%{release}
+
+
+%description devel
+The %{name}-devel package contains libraries and signature files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q -n seq-%{version}
+%autopatch -p1
+
+
+%build
+make %{?_smp_mflags} all
+
+
+%install
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR
+mkdir -p $OCAMLFIND_DESTDIR/stublibs
+make install
+
+# Don't ship the .ml file.
+rm $OCAMLFIND_DESTDIR/seq/seq.ml
+
+
+%files
+%doc README.md
+%license LICENSE
+%{_libdir}/ocaml/seq
+%ifarch %{ocaml_native_compiler}
+%exclude %{_libdir}/ocaml/seq/*.a
+%exclude %{_libdir}/ocaml/seq/*.cmxa
+%exclude %{_libdir}/ocaml/seq/*.cmx
+%endif
+%exclude %{_libdir}/ocaml/seq/*.mli
+%exclude %{_libdir}/ocaml/seq/META
+
+
+%files devel
+%license LICENSE
+%ifarch %{ocaml_native_compiler}
+%{_libdir}/ocaml/seq/*.a
+%{_libdir}/ocaml/seq/*.cmxa
+%{_libdir}/ocaml/seq/*.cmx
+%endif
+%{_libdir}/ocaml/seq/*.mli
+%{_libdir}/ocaml/seq/META
+
+
+%changelog
+* Thu Aug 1 2019 Richard W.M. Jones <rjones(a)redhat.com> - 0.1-3
+- Add license file from upstream.
+
+* Thu Aug 1 2019 Richard W.M. Jones <rjones(a)redhat.com> - 0.1-2
+- Add a link to upstream bug about the license.
+- Don't install seq.ml file.
+- Don't package META twice.
+
+* Thu Aug 1 2019 Richard W.M. Jones <rjones(a)redhat.com> - 0.1-1
+- Initial version.
diff --git a/sources b/sources
new file mode 100644
index 0000000..2dc3b50
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (0.1.tar.gz) = cf0df428408efd8f593765c419007c3b181c1234fa957bd09bd96bbbbc7950dcd329429a8a22573680fdfd46847e21befae29ade967509690428ba2b90fe83f2
4 years, 8 months
Architecture specific change in rpms/COPASI.git
by githook-noreply@fedoraproject.org
The package rpms/COPASI.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/COPASI.git/commit/?id=361b3ed5cb9...
https://src.fedoraproject.org/cgit/rpms/COPASI.git/commit/?id=9636c73d63a....
Change:
-%ifarch %{ix86} x86_64 sparc sparcv9 ia64 %{arm} aarch64 alpha s390x ppc
-%ifarch %{openblas_arches}
Thanks.
Full change:
============
commit 361b3ed5cb9a0e0fdc36ed75d021ac8c2a76efcc
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Aug 1 19:02:05 2019 +0200
Release 4.25 build-213
diff --git a/.gitignore b/.gitignore
index 4a58bf0..06adb90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/COPASI-Build-184.tar.gz
/COPASI-Build-197.tar.gz
/COPASI-Build-207.tar.gz
+/COPASI-Build-213.tar.gz
diff --git a/COPASI-use_c++17.patch b/COPASI-use_c++17.patch
new file mode 100644
index 0000000..c7647af
--- /dev/null
+++ b/COPASI-use_c++17.patch
@@ -0,0 +1,14 @@
+--- CMakeLists.txt_use_cxx17 2019-07-29 10:31:06.000000000 +0200
++++ CMakeLists.txt 2019-07-31 19:04:52.285195735 +0200
+@@ -118,9 +118,9 @@
+ endif()
+
+ if (CMAKE_MAJOR_VERSION LESS 3 OR CMAKE_MINOR_VERSION LESS 1)
+- set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11")
++ set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=gnu++17")
+ else()
+- set(CMAKE_CXX_STANDARD 11)
++ set(CMAKE_CXX_STANDARD 17)
+ endif()
+
+ CHECK_FUNCTION_EXISTS(strptime HAVE_STRPTIME)
diff --git a/COPASI.rpmlintrc b/COPASI.rpmlintrc
deleted file mode 100644
index ad480d2..0000000
--- a/COPASI.rpmlintrc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-
-# Edited by sagitter (sagitter AT fedoraproject dot org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-addFilter(r'(hardcoded-library-path) %{_prefix}/lib/mono/copasicsP')
-
-# WARNINGS:
-##### RPMs #####
-addFilter(r'(no-manual-page-for-binary) CopasiSE')
-addFilter(r'(no-manual-page-for-binary) CopasiUI')
-addFilter(r'(no-manual-page-for-binary) CopasiSBW')
diff --git a/COPASI.spec b/COPASI.spec
index f4032b1..d528f7f 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -1,38 +1,17 @@
-%global buildid 207
-%global octpkg COPASI
+%global buildid 213
+%global octpkg COPASI
%global with_python 1
-# Disable Java binding
+# Disabled bindings
%global with_java 0
-
-# Disable Octave binding ('virtual memory exhausted' issue)
%global with_octave 0
-
-%global with_perl 1
-%global with_r 1
-
-# rhbz #1588734,#1686738
-%if 0%{?fedora} && 0%{?fedora} < 30
-%ifarch %{?mono_arches}
-%global with_mono 1
-%else
+%global with_perl 0
+%global with_r 0
%global with_mono 0
-%endif
-%endif
-
-%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_mono 0
-
-Obsoletes: COPASI-sharp < 4.24.197-7
-%endif
-%endif
#
-##Use QWT6? (Experimental)
+# Use QWT6? (Experimental)
%global with_qwt6 0
%if 0%{?with_octave}
@@ -46,7 +25,7 @@ Obsoletes: COPASI-sharp < 4.24.197-7
Name: COPASI
Summary: Biochemical network simulator
Version: 4.25.%{buildid}
-Release: 6%{?dist}
+Release: 1%{?dist}
##Artistic 2.0 is main license
##GPLv2+ is related to a Mixed Source Licensing Scenario
@@ -102,32 +81,37 @@ BuildRequires: minizip-devel
Requires: %{name}-data = %{version}-%{release}
Requires: libsedml%{?_isa} >= 1:0.4.3-3
-Obsoletes: python2-%{name} < 4.24.197
+Obsoletes: R-%{octpkg} < 0:4.25.213-1
+Obsoletes: perl-%{octpkg} < 0:4.25.213-1
+Obsoletes: %{name}-sharp < 0:4.25.213-1
-##This patch sets libraries' installation paths
+# This patch sets libraries' installation paths
Patch0: %{name}-fix_install_libpaths.patch
-##This patch sets paths to find QWT5, QTMML, SBW files on Fedora
+# This patch sets paths to find QWT5, QTMML, SBW files on Fedora
Patch1: %{name}-find_QWT5-QTMML-SBW.patch
-##This patch sets paths to find QWT6, QTMML, SBW files on Fedora
+# This patch sets paths to find QWT6, QTMML, SBW files on Fedora
Patch3: %{name}-find_QWT6-QTMML-SBW.patch
-##This patch sets paths to find QTPLOT3D-QT4 files on Fedora
+# This patch sets paths to find QTPLOT3D-QT4 files on Fedora
Patch2: %{name}-set_QWTPLOT3D_QT4.patch
-##This patch fixes executable permissions of CopasiSE and CopasiUI
+# This patch fixes executable permissions of CopasiSE and CopasiUI
Patch4: %{name}-fix_exe_permissions.patch
-##This patch sets paths to find QTPLOT3D-QT5 files on Fedora
+# This patch sets paths to find QTPLOT3D-QT5 files on Fedora
Patch5: %{name}-set_QWTPLOT3D_QT5.patch
-##This patch sets paths to find libCombine files on Fedora
+# This patch sets paths to find libCombine files on Fedora
Patch6: %{name}-libCombine_paths.patch
-##This patch sets paths to find libcroosguid2 files on Fedora
+# This patch sets paths to find libcroosguid2 files on Fedora
Patch7: %{name}-find_crossguid2.patch
+# This patch forces the use of C++17 standard
+Patch8: %{name}-use_c++17.patch
+
%description
COPASI is a software application for simulation and analysis of biochemical
networks and their dynamics.
@@ -171,7 +155,7 @@ This package provides the COPASI data, example and license files.
%package -n python3-%{name}
Summary: %{name} Python3 Bindings
BuildRequires: python3-devel
-Obsoletes: python2-%{name} < 4.24.197
+Obsoletes: python2-%{name}
%{?python_provide:%python_provide python3-%{name}}
%description -n python3-%{octpkg}
This package provides the libraries to
@@ -258,6 +242,7 @@ done
%patch4 -p0 -b .fix_exe_permissions
%patch6 -p0 -b .libCombine_paths
%patch7 -p0 -b .find_crossguid2
+%patch8 -p0 -b .use_c++17
%if 0%{?with_qwt6}
%patch3 -p0
@@ -265,18 +250,28 @@ done
%patch1 -p0
%endif
-##Set Qwt libdir
+# Set Qwt libdir
sed -e 's|@@libdir@@|%{_libdir}|g' -i CMakeModules/FindQwtQt4.cmake
%patch5 -p0
-####Set QTPLOT3D-QT5 paths
+# Set QTPLOT3D-QT5 paths
sed -e 's|@@qtplot3d_includedir@@|%{_qt5_headerdir}/qwtplot3d-qt5|g' -i CMakeModules/FindQwtplot3dQt4.cmake
sed -e 's|@@qtplot3d_libdir@@|%{_qt5_libdir}|g' -i CMakeModules/FindQwtplot3dQt4.cmake
-##Set QtMmlQt5 paths
+# Set QtMmlQt5 paths
sed -e 's|@@_libmml_includedir@@|%{_qt5_headerdir}/libmml-qt5|g' -i CMakeModules/FindQtMmlQt4.cmake
sed -e 's|@@_libmml_libdir@@|%{_qt5_libdir}|g' -i CMakeModules/FindQtMmlQt4.cmake
+# Exclude obsolete functions
+# http://tracker.copasi.org/show_bug.cgi?id=2810#c1
+sed -i.bak '/double sqrt(doublereal);/d' copasi/optimization/CNL2SOL.cpp
+sed -i.bak '/double pow_dd(doublereal *, doublereal *);/d' copasi/optimization/CNL2SOL.cpp
+sed -i.bak '/int s_copy(char *, char *, ftnlen, ftnlen);/d' copasi/optimization/CNL2SOL.cpp
+sed -i.bak '/double sqrt(doublereal);/d' copasi/odepack++/dc_decsol.cpp
+sed -i.bak '/double sqrt(doublereal),/d' copasi/odepack++/CRadau5.cpp
+sed -i.bak '/double pow_dd(doublereal *,/d' copasi/odepack++/CRadau5.cpp
+sed -i.bak '/C_FLOAT64 d_lg10(C_FLOAT64 *);/d' copasi/optimization/CPraxis.cpp
+
%build
mkdir -p build && pushd build
export CXXFLAGS="-I$PWD/../copasi/lapack -DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} %{__global_ldflags}"
@@ -353,7 +348,7 @@ popd
rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/copasi/examples
%endif
-##Just for R library
+# For R library only
%if 0%{?with_r}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library build/copasi/bindings/R/%{name}_*.tar.gz
@@ -367,10 +362,10 @@ mkdir -p $RPM_BUILD_ROOT%{octpkgdir}/packinfo
install -pm 644 copasi/ArtisticLicense.txt $RPM_BUILD_ROOT%{octpkgdir}/packinfo
%endif
-##Install .xpm icon files
+# Install .xpm icon files
install -pm 644 copasi/UI/icons/Copasi48-Alpha.xpm $RPM_BUILD_ROOT%{_datadir}/icons/copasi/icons
-##Make a .desktop file
+# Make a .desktop file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
cat > $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop <<EOF
[Desktop Entry]
@@ -384,7 +379,7 @@ Type=Application
Categories=Science;
EOF
-## Install appdata file
+# Install appdata file
mkdir -p $RPM_BUILD_ROOT%{_metainfodir}
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/
@@ -452,6 +447,12 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%{_datadir}/copasi/doc/
%changelog
+* Wed Jul 31 2019 Antonio Trande <sagitterATfedoraproject.org> - 4.25.213-1
+- Release 4.25 build-213
+- Use standard c++17
+- Disable R package
+- Disable perl package
+
* Wed Jun 19 2019 Tim Landscheidt <tim(a)tim-landscheidt.de> - 4.25.207-6
- Do not list Git-tracked COPASI.rpmlintrc as source
diff --git a/sources b/sources
index dc418ef..d8328a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (COPASI-Build-207.tar.gz) = eda3c4416912f73849b701c60accf4a1f49317623ba23fea3d4dc6a437b2417a91ae71b9bafa448b57d3ce0e1928b078593b75acdd9bc8ddc9d3973683130603
+SHA512 (COPASI-Build-213.tar.gz) = 8cfa7a6d4e4b026dca900f09a75afcb670d03c341dc3f36833e58021efe5edc4e29c5d81ff20be80acca39a5afeb112bd0fcedbaf37206bad8e9015155dbd4a8
commit 64ddcf034cf1963852fdbd4f1e2526ebcfbced63
Author: Tim Landscheidt <tim(a)tim-landscheidt.de>
Date: Wed Jun 19 08:40:21 2019 +0000
Do not list Git-tracked COPASI.rpmlintrc as source
diff --git a/COPASI.rpmlintrc b/COPASI.rpmlintrc
index f127f75..ad480d2 100644
--- a/COPASI.rpmlintrc
+++ b/COPASI.rpmlintrc
@@ -1,3 +1,6 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+
# Edited by sagitter (sagitter AT fedoraproject dot org)
# KNOWN BUGS:
diff --git a/COPASI.spec b/COPASI.spec
index 9902afc..f4032b1 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -46,7 +46,7 @@ Obsoletes: COPASI-sharp < 4.24.197-7
Name: COPASI
Summary: Biochemical network simulator
Version: 4.25.%{buildid}
-Release: 5%{?dist}
+Release: 6%{?dist}
##Artistic 2.0 is main license
##GPLv2+ is related to a Mixed Source Licensing Scenario
@@ -61,10 +61,6 @@ URL: http://copasi.org/
Source0: https://github.com/copasi/COPASI/archive/Build-%{buildid}/%{name}-Build-%...
Source1: %{name}.appdata.xml
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-Source2: %{name}.rpmlintrc
-
%if 0%{?with_qwt6}
BuildRequires: qwt-devel
%endif
@@ -456,6 +452,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%{_datadir}/copasi/doc/
%changelog
+* Wed Jun 19 2019 Tim Landscheidt <tim(a)tim-landscheidt.de> - 4.25.207-6
+- Do not list Git-tracked COPASI.rpmlintrc as source
+
* Tue Jun 18 2019 Orion Poplawski <orion(a)nwra.com> - 4.25.207-5
- Rebuild for octave 5.1
commit af241e4b822670e5c15da15f1f51d2ad53c3f5cd
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Jun 17 21:30:35 2019 -0600
Rebuild for octave 5.1
diff --git a/COPASI.spec b/COPASI.spec
index 100b08c..9902afc 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -46,7 +46,7 @@ Obsoletes: COPASI-sharp < 4.24.197-7
Name: COPASI
Summary: Biochemical network simulator
Version: 4.25.%{buildid}
-Release: 4%{?dist}
+Release: 5%{?dist}
##Artistic 2.0 is main license
##GPLv2+ is related to a Mixed Source Licensing Scenario
@@ -90,6 +90,8 @@ BuildRequires: libxslt-devel
BuildRequires: pkgconf-pkg-config
BuildRequires: openblas-devel, openblas-srpm-macros, lapack-devel
BuildRequires: crossguid2-devel >= 0:0.2.2
+# Needed until https://bugzilla.redhat.com/show_bug.cgi?id=1721342 is resolved
+BuildRequires: libuuid-devel
BuildRequires: desktop-file-utils
BuildRequires: swig
BuildRequires: expat-devel
@@ -454,6 +456,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%{_datadir}/copasi/doc/
%changelog
+* Tue Jun 18 2019 Orion Poplawski <orion(a)nwra.com> - 4.25.207-5
+- Rebuild for octave 5.1
+
* Sat Jun 01 2019 Jitka Plesnikova <jplesnik(a)redhat.com> - 4.25.207-4
- Perl 5.30 rebuild
commit e0d83d74a24f8acb41d2e07e04fc96b22050c37e
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Sat Jun 1 20:20:57 2019 +0200
Perl 5.30 rebuild
diff --git a/COPASI.spec b/COPASI.spec
index 2ecae8b..100b08c 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -46,7 +46,7 @@ Obsoletes: COPASI-sharp < 4.24.197-7
Name: COPASI
Summary: Biochemical network simulator
Version: 4.25.%{buildid}
-Release: 3%{?dist}
+Release: 4%{?dist}
##Artistic 2.0 is main license
##GPLv2+ is related to a Mixed Source Licensing Scenario
@@ -454,6 +454,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%{_datadir}/copasi/doc/
%changelog
+* Sat Jun 01 2019 Jitka Plesnikova <jplesnik(a)redhat.com> - 4.25.207-4
+- Perl 5.30 rebuild
+
* Tue May 21 2019 Antonio Trande <sagitterATfedoraproject.org> - 4.25.207-3
- Use Python3 abiflags
commit cafae5b07a148eaa5d188c6926d843739f6b3847
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue May 21 19:09:40 2019 +0200
Fix python3-config commands again
diff --git a/COPASI.spec b/COPASI.spec
index a7b586f..2ecae8b 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -287,8 +287,8 @@ export CXXFLAGS="-I$PWD/../copasi/lapack -DF2C_INTEGER=int -DF2C_LOGICAL=long %{
%if 0%{?with_python}
-DENABLE_PYTHON:BOOL=ON \
-DPYTHON_EXECUTABLE:FILEPATH=%{__python3} \
- -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python3_version}${python3-config --abiflags} \
- -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python3_version}${python3-config --abiflags}.so \
+ -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python3_version}%(python3-config --abiflags) \
+ -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python3_version}%(python3-config --abiflags).so \
%else
-DENABLE_PYTHON:BOOL=OFF \
%endif
commit a39081947b8ae474eb2a7e023218d7f230b88dad
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue May 21 18:50:26 2019 +0200
Fix python3-config commands
diff --git a/COPASI.spec b/COPASI.spec
index 16f25b3..a7b586f 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -287,8 +287,8 @@ export CXXFLAGS="-I$PWD/../copasi/lapack -DF2C_INTEGER=int -DF2C_LOGICAL=long %{
%if 0%{?with_python}
-DENABLE_PYTHON:BOOL=ON \
-DPYTHON_EXECUTABLE:FILEPATH=%{__python3} \
- -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python3_version}%{python3-config --abiflags} \
- -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python3_version}%{python3-config --abiflags}.so \
+ -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python3_version}${python3-config --abiflags} \
+ -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python3_version}${python3-config --abiflags}.so \
%else
-DENABLE_PYTHON:BOOL=OFF \
%endif
commit 4df7a86e1a789daec0dfb656cf86b58afa0623c7
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue May 21 18:43:49 2019 +0200
Use Python3 abiflags
diff --git a/COPASI.spec b/COPASI.spec
index cad56a3..16f25b3 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -46,7 +46,7 @@ Obsoletes: COPASI-sharp < 4.24.197-7
Name: COPASI
Summary: Biochemical network simulator
Version: 4.25.%{buildid}
-Release: 2%{?dist}
+Release: 3%{?dist}
##Artistic 2.0 is main license
##GPLv2+ is related to a Mixed Source Licensing Scenario
@@ -287,8 +287,8 @@ export CXXFLAGS="-I$PWD/../copasi/lapack -DF2C_INTEGER=int -DF2C_LOGICAL=long %{
%if 0%{?with_python}
-DENABLE_PYTHON:BOOL=ON \
-DPYTHON_EXECUTABLE:FILEPATH=%{__python3} \
- -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python3_version}m \
- -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python3_version}m.so \
+ -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python3_version}%{python3-config --abiflags} \
+ -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python3_version}%{python3-config --abiflags}.so \
%else
-DENABLE_PYTHON:BOOL=OFF \
%endif
@@ -454,6 +454,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%{_datadir}/copasi/doc/
%changelog
+* Tue May 21 2019 Antonio Trande <sagitterATfedoraproject.org> - 4.25.207-3
+- Use Python3 abiflags
+
* Sun May 05 2019 Antonio Trande <sagitterATfedoraproject.org> - 4.25.207-2
- Rebuild for libsbml-5.18.0
commit c25b88cba9794c3c8e26df7a054a33daf5cd5848
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun May 5 19:33:18 2019 +0200
Rebuild for libsbml-5.18.0
diff --git a/COPASI.spec b/COPASI.spec
index 80ab596..cad56a3 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -1,7 +1,7 @@
-%global buildid 207
+%global buildid 207
%global octpkg COPASI
-%global with_python3 1
+%global with_python 1
# Disable Java binding
%global with_java 0
@@ -46,7 +46,7 @@ Obsoletes: COPASI-sharp < 4.24.197-7
Name: COPASI
Summary: Biochemical network simulator
Version: 4.25.%{buildid}
-Release: 1%{?dist}
+Release: 2%{?dist}
##Artistic 2.0 is main license
##GPLv2+ is related to a Mixed Source Licensing Scenario
@@ -169,7 +169,7 @@ BuildArch: noarch
%description data
This package provides the COPASI data, example and license files.
-%if 0%{?with_python3}
+%if 0%{?with_python}
%package -n python3-%{name}
Summary: %{name} Python3 Bindings
BuildRequires: python3-devel
@@ -284,7 +284,7 @@ mkdir -p build && pushd build
export CXXFLAGS="-I$PWD/../copasi/lapack -DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} %{__global_ldflags}"
%cmake -Wno-dev \
-DCOPASI_OVERRIDE_VERSION:STRING=%{version} \
-%if 0%{?with_python3}
+%if 0%{?with_python}
-DENABLE_PYTHON:BOOL=ON \
-DPYTHON_EXECUTABLE:FILEPATH=%{__python3} \
-DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python3_version}m \
@@ -351,7 +351,7 @@ popd
%make_install -C build
# Remove directory of examples
-%if 0%{?with_python3}
+%if 0%{?with_python}
rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/copasi/examples
%endif
@@ -409,7 +409,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%{_datadir}/copasi/
%exclude %{_datadir}/copasi/doc/
-%if 0%{?with_python3}
+%if 0%{?with_python}
%files -n python3-%{octpkg}
%license copasi/ArtisticLicense.txt
%{python3_sitearch}/copasi/
@@ -454,6 +454,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%{_datadir}/copasi/doc/
%changelog
+* Sun May 05 2019 Antonio Trande <sagitterATfedoraproject.org> - 4.25.207-2
+- Rebuild for libsbml-5.18.0
+
* Sat Mar 16 2019 Antonio Trande <sagitterATfedoraproject.org> - 4.25.207-1
- Release 4.25 build-207
- Use openblas always
commit 9636c73d63a4c7b1fab4724950dd92429f503d41
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Mar 25 17:48:36 2019 +0100
Release 4.25 build-207|Use openblas always
diff --git a/.gitignore b/.gitignore
index 9d1e74f..4a58bf0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/COPASI-Build-170.tar.gz
/COPASI-Build-184.tar.gz
/COPASI-Build-197.tar.gz
+/COPASI-Build-207.tar.gz
diff --git a/COPASI-find_crossguid2.patch b/COPASI-find_crossguid2.patch
new file mode 100644
index 0000000..137971c
--- /dev/null
+++ b/COPASI-find_crossguid2.patch
@@ -0,0 +1,56 @@
+--- CMakeModules/FindCROSSGUID.orig.cmake 2019-03-23 19:54:03.269453000 +0100
++++ CMakeModules/FindCROSSGUID.cmake 2019-03-23 19:56:45.218630640 +0100
+@@ -16,11 +16,11 @@
+ # $CROSSGUID_DIR is an environment variable that would
+ # correspond to the ./configure --prefix=$CROSSGUID_DIR
+
+-find_package(crossguid CONFIG REQUIRED
+- CONFIGS crossguid-config.cmake
++find_package(crossguid2 CONFIG REQUIRED
++ CONFIGS crossguid2-config.cmake
+ PATHS $ENV{CROSSGUID_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake
+ ${COPASI_DEPENDENCY_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake
+- /usr/${CMAKE_INSTALL_LIBDIR}/cmake
++ ${CMAKE_INSTALL_LIBDIR}/cmake/crossguid2
+ )
+
+ if (NOT CROSSGUID_FOUND)
+@@ -29,6 +29,7 @@
+ find_path(CROSSGUID_INCLUDE_DIR crossguid/guid.hpp
+ PATHS $ENV{CROSSGUID_DIR}/include
+ $ENV{CROSSGUID_DIR}
++ ${INCLUDE_INSTALL_DIR}/crossguid2
+ ${COPASI_DEPENDENCY_DIR}/include
+ ${COPASI_DEPENDENCY_DIR}
+ ~/Library/Frameworks
+@@ -45,10 +46,10 @@
+ endif (NOT CROSSGUID_INCLUDE_DIR)
+
+ find_library(CROSSGUID_LIBRARY
+- NAMES crossguid crossguid-dgb
++ NAMES crossguid2 crossguid-dgb
+ PATHS $ENV{CROSSGUID_DIR}/lib
+ $ENV{CROSSGUID_DIR}
+- ${COPASI_DEPENDENCY_DIR}/${CMAKE_INSTALL_LIBDIR}
++ ${CMAKE_INSTALL_LIBDIR}
+ ${COPASI_DEPENDENCY_DIR}/lib
+ ${COPASI_DEPENDENCY_DIR}
+ ~/Library/Frameworks
+@@ -73,14 +74,14 @@
+ else ()
+ set(CROSSGUID_FOUND ${crossguid_FOUND})
+
+- get_target_property(CROSSGUID_INCLUDE_DIR crossguid INTERFACE_INCLUDE_DIRECTORIES)
+- get_target_property(CROSSGUID_LIBRARY crossguid IMPORTED_LOCATION_RELEASE)
++ get_target_property(CROSSGUID_INCLUDE_DIR crossguid2 INTERFACE_INCLUDE_DIRECTORIES)
++ get_target_property(CROSSGUID_LIBRARY crossguid2 IMPORTED_LOCATION_RELEASE)
+
+ if (NOT CROSSGUID_LIBRARY)
+ get_target_property(CROSSGUID_LIBRARY crossguid IMPORTED_LOCATION_DEBUG)
+ endif()
+
+- get_target_property(CROSSGUID_INTERFACE_LINK_LIBRARIES crossguid INTERFACE_LINK_LIBRARIES)
++ get_target_property(CROSSGUID_INTERFACE_LINK_LIBRARIES crossguid2 INTERFACE_LINK_LIBRARIES)
+
+ if (CROSSGUID_INTERFACE_LINK_LIBRARIES)
+ set(CROSSGUID_LIBRARY ${CROSSGUID_LIBRARY} ${CROSSGUID_INTERFACE_LINK_LIBRARIES})
diff --git a/COPASI-fix_install_libpaths.patch b/COPASI-fix_install_libpaths.patch
index 8f03174..c5aabf0 100644
--- a/COPASI-fix_install_libpaths.patch
+++ b/COPASI-fix_install_libpaths.patch
@@ -105,7 +105,7 @@
# they still work with the current objectmodel
--- copasi/bindings/octave/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100
+++ copasi/bindings/octave/CMakeLists.txt 2015-01-08 18:34:10.609971192 +0100
-@@ -145,12 +145,12 @@
+@@ -147,12 +147,12 @@
#
set(OCTAVE_PACKAGE_INSTALL_DIR)
if (UNIX OR CYGWIN)
@@ -118,5 +118,5 @@
-INSTALL(TARGETS binding_octave_lib DESTINATION ${OCTAVE_PACKAGE_INSTALL_DIR} )
+INSTALL(TARGETS binding_octave_lib PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${OCTAVE_PACKAGE_INSTALL_DIR})
- add_test(NAME octave_test_version
- COMMAND octave --no-gui --eval "COPASI;display(COPASI.CVersion.VERSION.getVersion())"
+ set(OCTAVE_INTERPRETER "octave" CACHE STRING "full path to the octave interpreter to be used for running tests." )
+
diff --git a/COPASI.spec b/COPASI.spec
index 164aec8..80ab596 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -1,4 +1,4 @@
-%global buildid 197
+%global buildid 207
%global octpkg COPASI
%global with_python3 1
@@ -26,7 +26,8 @@
%global with_mono 1
%else
%global with_mono 0
-Obsoletes: %{name}-sharp < 4.24.197-7
+
+Obsoletes: COPASI-sharp < 4.24.197-7
%endif
%endif
#
@@ -44,8 +45,8 @@ Obsoletes: %{name}-sharp < 4.24.197-7
Name: COPASI
Summary: Biochemical network simulator
-Version: 4.24.%{buildid}
-Release: 8%{?dist}
+Version: 4.25.%{buildid}
+Release: 1%{?dist}
##Artistic 2.0 is main license
##GPLv2+ is related to a Mixed Source Licensing Scenario
@@ -87,12 +88,8 @@ BuildRequires: cppunit-devel
BuildRequires: libcurl-devel
BuildRequires: libxslt-devel
BuildRequires: pkgconf-pkg-config
-%ifarch %{openblas_arches}
-BuildRequires: openblas-devel, openblas-srpm-macros
-%else
-BuildRequires: blas-devel
-BuildRequires: lapack-devel
-%endif
+BuildRequires: openblas-devel, openblas-srpm-macros, lapack-devel
+BuildRequires: crossguid2-devel >= 0:0.2.2
BuildRequires: desktop-file-utils
BuildRequires: swig
BuildRequires: expat-devel
@@ -102,17 +99,7 @@ BuildRequires: cmake, gcc, gcc-c++
BuildRequires: bison
BuildRequires: ImageMagick
BuildRequires: libappstream-glib
-# Use new minizip starting from fedora 30
-# rhbz #1632172
-%if 0%{?fedora} == 29
-BuildRequires: minizip-compat-devel
-%endif
-%if 0%{?fedora} == 28
-BuildRequires: minizip-devel
-%endif
-%if 0%{?fedora} >= 30
-#BuildRequires: minizip-devel >= 2.5.0
-%endif
+BuildRequires: minizip-devel
Requires: %{name}-data = %{version}-%{release}
Requires: libsedml%{?_isa} >= 1:0.4.3-3
@@ -138,7 +125,10 @@ Patch4: %{name}-fix_exe_permissions.patch
Patch5: %{name}-set_QWTPLOT3D_QT5.patch
##This patch sets paths to find libCombine files on Fedora
-Patch6: COPASI-libCombine_paths.patch
+Patch6: %{name}-libCombine_paths.patch
+
+##This patch sets paths to find libcroosguid2 files on Fedora
+Patch7: %{name}-find_crossguid2.patch
%description
COPASI is a software application for simulation and analysis of biochemical
@@ -266,9 +256,10 @@ for file in `find copasi -type f \( -name "*.cpp" \)`; do
mv $file.new $file
done
-%patch0 -p0
-%patch4 -p0
-%patch6 -p0
+%patch0 -p0 -b .fix_install_libpaths
+%patch4 -p0 -b .fix_exe_permissions
+%patch6 -p0 -b .libCombine_paths
+%patch7 -p0 -b .find_crossguid2
%if 0%{?with_qwt6}
%patch3 -p0
@@ -290,17 +281,7 @@ sed -e 's|@@_libmml_libdir@@|%{_qt5_libdir}|g' -i CMakeModules/FindQtMmlQt4.cmak
%build
mkdir -p build && pushd build
-export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} %{__global_ldflags} -DCOPASI_OVERWRITE_USE_LAPACK -DNO_BLAS_WRAP"
-
-%ifarch %{openblas_arches}
-export LIBBLAS=libopenblas.so
-export INCBLAS=%{_includedir}/openblas
-%else
-export LIBBLAS=libblas.so
-export LIBLAPACK=liblapack.so
-export INCBLAS=%{_includedir}
-%endif
-
+export CXXFLAGS="-I$PWD/../copasi/lapack -DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} %{__global_ldflags}"
%cmake -Wno-dev \
-DCOPASI_OVERRIDE_VERSION:STRING=%{version} \
%if 0%{?with_python3}
@@ -342,14 +323,17 @@ export INCBLAS=%{_includedir}
-DQWT_VERSION_STRING:STRING="%(pkg-config --modversion Qt5Qwt6)" \
-DQWT_LIBRARY:FILEPATH=%{_qt5_libdir}/libqwt-qt5.so \
-DQWT_INCLUDE_DIR:PATH=%{_qt5_headerdir}/qwt \
- -DBUILD_GUI:BOOL=ON -DBUILD_COPASISBW:BOOL=ON --DENABLE_MML:BOOL=ON -DENABLE_USE_SBMLUNIT=ON \
+ -DBUILD_GUI:BOOL=ON -DBUILD_COPASISBW:BOOL=ON -DENABLE_MML:BOOL=ON -DENABLE_USE_SBMLUNIT=ON \
-DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -pthread" \
-DCMAKE_EXE_LINKER_FLAGS:STRING="%{__global_ldflags}" \
-DMML_INCLUDE_DIR:PATH=%{_qt5_headerdir}/libmml-qt5 -DMML_LIBRARY:FILEPATH=%{_qt5_libdir}/libmml.so \
-DENABLE_SBW_INTEGRATION=ON -DBUILD_CXX_EXAMPLES=OFF \
-DENABLE_COPASI_BANDED_GRAPH:BOOL=ON -DENABLE_COPASI_SEDML:BOOL=ON \
-DENABLE_COPASI_NONLIN_DYN_OSCILLATION:BOOL=ON -DENABLE_COPASI_EXTUNIT:BOOL=ON \
- -DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/$LIBBLAS -DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/$LIBLAPACK -DCLAPACK_INCLUDE_DIR:PATH=$INCBLAS \
+ -DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/libopenblas.so -DBLAS_INCLUDE_DIR:PATH=%{_includedir}/openblas \
+ -DCLAPACK_INCLUDE_DIR:PATH= -DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/liblapack.so -DCLAPACK_LIBRARIES:FILEPATH= \
+ -DCOPASI_OVERWRITE_USE_LAPACK:BOOL=ON -DNO_BLAS_WRAP:BOOL=ON -DBLA_VENDOR=Generic \
+ -DCROSSGUID_INCLUDE_DIR:PATH=%{_includedir}/crossguid2 \
-DENABLE_FLEX_BISON:BOOL=ON -DENABLE_COPASI_PARAMETERFITTING_RESIDUAL_SCALING:BOOL=ON \
-DENABLE_WITH_MERGEMODEL:BOOL=ON -DENABLE_USE_MATH_CONTAINER:BOOL=ON \
-DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DLIBSBML_SHARED:BOOL=ON -DLIBSBML_LIBRARY:FILEPATH=%{_libdir}/libsbml.so \
@@ -470,6 +454,11 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%{_datadir}/copasi/doc/
%changelog
+* Sat Mar 16 2019 Antonio Trande <sagitterATfedoraproject.org> - 4.25.207-1
+- Release 4.25 build-207
+- Use openblas always
+- Add crossguid dependency
+
* Fri Mar 08 2019 Antonio Trande <sagitter(a)fedoraproject.org> - 4.24.197-8
- Obsolete COPASI-sharp on fedora 30+/pp64* (rhbz#1588734,#1686738)
diff --git a/sources b/sources
index f6d5ba2..dc418ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (COPASI-Build-197.tar.gz) = 273d4144f81bc65af819583141a754bc2e7c50e26bdcf15265045e19434740d84a5ce8ac09aab393658ff20da48f7a487acb7fd58aebdf483df3b40917b3ef30
+SHA512 (COPASI-Build-207.tar.gz) = eda3c4416912f73849b701c60accf4a1f49317623ba23fea3d4dc6a437b2417a91ae71b9bafa448b57d3ce0e1928b078593b75acdd9bc8ddc9d3973683130603
4 years, 8 months
Architecture specific change in rpms/COPASI.git
by githook-noreply@fedoraproject.org
The package rpms/COPASI.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/COPASI.git/commit/?id=361b3ed5cb9....
Change:
-%ifarch %{ix86} x86_64 sparc sparcv9 ia64 %{arm} aarch64 alpha s390x ppc
Thanks.
Full change:
============
commit 361b3ed5cb9a0e0fdc36ed75d021ac8c2a76efcc
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Aug 1 19:02:05 2019 +0200
Release 4.25 build-213
diff --git a/.gitignore b/.gitignore
index 4a58bf0..06adb90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/COPASI-Build-184.tar.gz
/COPASI-Build-197.tar.gz
/COPASI-Build-207.tar.gz
+/COPASI-Build-213.tar.gz
diff --git a/COPASI-use_c++17.patch b/COPASI-use_c++17.patch
new file mode 100644
index 0000000..c7647af
--- /dev/null
+++ b/COPASI-use_c++17.patch
@@ -0,0 +1,14 @@
+--- CMakeLists.txt_use_cxx17 2019-07-29 10:31:06.000000000 +0200
++++ CMakeLists.txt 2019-07-31 19:04:52.285195735 +0200
+@@ -118,9 +118,9 @@
+ endif()
+
+ if (CMAKE_MAJOR_VERSION LESS 3 OR CMAKE_MINOR_VERSION LESS 1)
+- set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11")
++ set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=gnu++17")
+ else()
+- set(CMAKE_CXX_STANDARD 11)
++ set(CMAKE_CXX_STANDARD 17)
+ endif()
+
+ CHECK_FUNCTION_EXISTS(strptime HAVE_STRPTIME)
diff --git a/COPASI.rpmlintrc b/COPASI.rpmlintrc
deleted file mode 100644
index ad480d2..0000000
--- a/COPASI.rpmlintrc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-
-# Edited by sagitter (sagitter AT fedoraproject dot org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-addFilter(r'(hardcoded-library-path) %{_prefix}/lib/mono/copasicsP')
-
-# WARNINGS:
-##### RPMs #####
-addFilter(r'(no-manual-page-for-binary) CopasiSE')
-addFilter(r'(no-manual-page-for-binary) CopasiUI')
-addFilter(r'(no-manual-page-for-binary) CopasiSBW')
diff --git a/COPASI.spec b/COPASI.spec
index f4032b1..d528f7f 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -1,38 +1,17 @@
-%global buildid 207
-%global octpkg COPASI
+%global buildid 213
+%global octpkg COPASI
%global with_python 1
-# Disable Java binding
+# Disabled bindings
%global with_java 0
-
-# Disable Octave binding ('virtual memory exhausted' issue)
%global with_octave 0
-
-%global with_perl 1
-%global with_r 1
-
-# rhbz #1588734,#1686738
-%if 0%{?fedora} && 0%{?fedora} < 30
-%ifarch %{?mono_arches}
-%global with_mono 1
-%else
+%global with_perl 0
+%global with_r 0
%global with_mono 0
-%endif
-%endif
-
-%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_mono 0
-
-Obsoletes: COPASI-sharp < 4.24.197-7
-%endif
-%endif
#
-##Use QWT6? (Experimental)
+# Use QWT6? (Experimental)
%global with_qwt6 0
%if 0%{?with_octave}
@@ -46,7 +25,7 @@ Obsoletes: COPASI-sharp < 4.24.197-7
Name: COPASI
Summary: Biochemical network simulator
Version: 4.25.%{buildid}
-Release: 6%{?dist}
+Release: 1%{?dist}
##Artistic 2.0 is main license
##GPLv2+ is related to a Mixed Source Licensing Scenario
@@ -102,32 +81,37 @@ BuildRequires: minizip-devel
Requires: %{name}-data = %{version}-%{release}
Requires: libsedml%{?_isa} >= 1:0.4.3-3
-Obsoletes: python2-%{name} < 4.24.197
+Obsoletes: R-%{octpkg} < 0:4.25.213-1
+Obsoletes: perl-%{octpkg} < 0:4.25.213-1
+Obsoletes: %{name}-sharp < 0:4.25.213-1
-##This patch sets libraries' installation paths
+# This patch sets libraries' installation paths
Patch0: %{name}-fix_install_libpaths.patch
-##This patch sets paths to find QWT5, QTMML, SBW files on Fedora
+# This patch sets paths to find QWT5, QTMML, SBW files on Fedora
Patch1: %{name}-find_QWT5-QTMML-SBW.patch
-##This patch sets paths to find QWT6, QTMML, SBW files on Fedora
+# This patch sets paths to find QWT6, QTMML, SBW files on Fedora
Patch3: %{name}-find_QWT6-QTMML-SBW.patch
-##This patch sets paths to find QTPLOT3D-QT4 files on Fedora
+# This patch sets paths to find QTPLOT3D-QT4 files on Fedora
Patch2: %{name}-set_QWTPLOT3D_QT4.patch
-##This patch fixes executable permissions of CopasiSE and CopasiUI
+# This patch fixes executable permissions of CopasiSE and CopasiUI
Patch4: %{name}-fix_exe_permissions.patch
-##This patch sets paths to find QTPLOT3D-QT5 files on Fedora
+# This patch sets paths to find QTPLOT3D-QT5 files on Fedora
Patch5: %{name}-set_QWTPLOT3D_QT5.patch
-##This patch sets paths to find libCombine files on Fedora
+# This patch sets paths to find libCombine files on Fedora
Patch6: %{name}-libCombine_paths.patch
-##This patch sets paths to find libcroosguid2 files on Fedora
+# This patch sets paths to find libcroosguid2 files on Fedora
Patch7: %{name}-find_crossguid2.patch
+# This patch forces the use of C++17 standard
+Patch8: %{name}-use_c++17.patch
+
%description
COPASI is a software application for simulation and analysis of biochemical
networks and their dynamics.
@@ -171,7 +155,7 @@ This package provides the COPASI data, example and license files.
%package -n python3-%{name}
Summary: %{name} Python3 Bindings
BuildRequires: python3-devel
-Obsoletes: python2-%{name} < 4.24.197
+Obsoletes: python2-%{name}
%{?python_provide:%python_provide python3-%{name}}
%description -n python3-%{octpkg}
This package provides the libraries to
@@ -258,6 +242,7 @@ done
%patch4 -p0 -b .fix_exe_permissions
%patch6 -p0 -b .libCombine_paths
%patch7 -p0 -b .find_crossguid2
+%patch8 -p0 -b .use_c++17
%if 0%{?with_qwt6}
%patch3 -p0
@@ -265,18 +250,28 @@ done
%patch1 -p0
%endif
-##Set Qwt libdir
+# Set Qwt libdir
sed -e 's|@@libdir@@|%{_libdir}|g' -i CMakeModules/FindQwtQt4.cmake
%patch5 -p0
-####Set QTPLOT3D-QT5 paths
+# Set QTPLOT3D-QT5 paths
sed -e 's|@@qtplot3d_includedir@@|%{_qt5_headerdir}/qwtplot3d-qt5|g' -i CMakeModules/FindQwtplot3dQt4.cmake
sed -e 's|@@qtplot3d_libdir@@|%{_qt5_libdir}|g' -i CMakeModules/FindQwtplot3dQt4.cmake
-##Set QtMmlQt5 paths
+# Set QtMmlQt5 paths
sed -e 's|@@_libmml_includedir@@|%{_qt5_headerdir}/libmml-qt5|g' -i CMakeModules/FindQtMmlQt4.cmake
sed -e 's|@@_libmml_libdir@@|%{_qt5_libdir}|g' -i CMakeModules/FindQtMmlQt4.cmake
+# Exclude obsolete functions
+# http://tracker.copasi.org/show_bug.cgi?id=2810#c1
+sed -i.bak '/double sqrt(doublereal);/d' copasi/optimization/CNL2SOL.cpp
+sed -i.bak '/double pow_dd(doublereal *, doublereal *);/d' copasi/optimization/CNL2SOL.cpp
+sed -i.bak '/int s_copy(char *, char *, ftnlen, ftnlen);/d' copasi/optimization/CNL2SOL.cpp
+sed -i.bak '/double sqrt(doublereal);/d' copasi/odepack++/dc_decsol.cpp
+sed -i.bak '/double sqrt(doublereal),/d' copasi/odepack++/CRadau5.cpp
+sed -i.bak '/double pow_dd(doublereal *,/d' copasi/odepack++/CRadau5.cpp
+sed -i.bak '/C_FLOAT64 d_lg10(C_FLOAT64 *);/d' copasi/optimization/CPraxis.cpp
+
%build
mkdir -p build && pushd build
export CXXFLAGS="-I$PWD/../copasi/lapack -DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} %{__global_ldflags}"
@@ -353,7 +348,7 @@ popd
rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/copasi/examples
%endif
-##Just for R library
+# For R library only
%if 0%{?with_r}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library build/copasi/bindings/R/%{name}_*.tar.gz
@@ -367,10 +362,10 @@ mkdir -p $RPM_BUILD_ROOT%{octpkgdir}/packinfo
install -pm 644 copasi/ArtisticLicense.txt $RPM_BUILD_ROOT%{octpkgdir}/packinfo
%endif
-##Install .xpm icon files
+# Install .xpm icon files
install -pm 644 copasi/UI/icons/Copasi48-Alpha.xpm $RPM_BUILD_ROOT%{_datadir}/icons/copasi/icons
-##Make a .desktop file
+# Make a .desktop file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
cat > $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop <<EOF
[Desktop Entry]
@@ -384,7 +379,7 @@ Type=Application
Categories=Science;
EOF
-## Install appdata file
+# Install appdata file
mkdir -p $RPM_BUILD_ROOT%{_metainfodir}
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/
@@ -452,6 +447,12 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%{_datadir}/copasi/doc/
%changelog
+* Wed Jul 31 2019 Antonio Trande <sagitterATfedoraproject.org> - 4.25.213-1
+- Release 4.25 build-213
+- Use standard c++17
+- Disable R package
+- Disable perl package
+
* Wed Jun 19 2019 Tim Landscheidt <tim(a)tim-landscheidt.de> - 4.25.207-6
- Do not list Git-tracked COPASI.rpmlintrc as source
diff --git a/sources b/sources
index dc418ef..d8328a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (COPASI-Build-207.tar.gz) = eda3c4416912f73849b701c60accf4a1f49317623ba23fea3d4dc6a437b2417a91ae71b9bafa448b57d3ce0e1928b078593b75acdd9bc8ddc9d3973683130603
+SHA512 (COPASI-Build-213.tar.gz) = 8cfa7a6d4e4b026dca900f09a75afcb670d03c341dc3f36833e58021efe5edc4e29c5d81ff20be80acca39a5afeb112bd0fcedbaf37206bad8e9015155dbd4a8
4 years, 8 months