diff --git a/openpgm-01-scons.patch b/openpgm-01-scons.patch deleted file mode 100644 index 285e0c5..0000000 --- a/openpgm-01-scons.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/openpgm/pgm/SConscript.autoconf b/openpgm/pgm/SConscript.autoconf -index d3d833d..abcfd94 100644 ---- a/openpgm/pgm/SConscript.autoconf -+++ b/openpgm/pgm/SConscript.autoconf -@@ -113,7 +113,7 @@ def CheckMember (context, member, header): - int - main () - { -- offsetof (""" + string.replace (member, '.', ', ') + """); -+ offsetof (""" + member.replace('.', ', ') + """); - return 0; - } - """ -diff --git a/openpgm/pgm/SConstruct b/openpgm/pgm/SConstruct -index adff0b7..d408945 100644 ---- a/openpgm/pgm/SConstruct -+++ b/openpgm/pgm/SConstruct -@@ -116,7 +116,7 @@ release = env.Clone(BUILD = 'release') - release.Append(CCFLAGS = '-O2') - - debug = env.Clone(BUILD = 'debug') --debug.Append(CCFLAGS = ['-DPGM_DEBUG','-ggdb'], LINKFLAGS = '-gdb') -+debug.Append(CCFLAGS = ['-DPGM_DEBUG','-ggdb'], LINKFLAGS = '-ggdb') - - profile = env.Clone(BUILD = 'profile') - profile.Append(CCFLAGS = ['-O2','-pg'], LINKFLAGS = '-pg') -@@ -206,15 +206,15 @@ if env['WITH_SNMP'] == 'true': - conf = Configure(env, custom_tests = tests); - - if env['WITH_SNMP'] == 'true' and not conf.CheckSNMP(): -- print 'Net-SNMP libraries not compatible.'; -+ print ('Net-SNMP libraries not compatible.'); - Exit(1); - - if env['WITH_CHECK'] == 'true' and conf.CheckCheck(): -- print 'Enabling Check unit tests.'; -+ print ('Enabling Check unit tests.'); - conf.env['CHECK'] = 'true'; - env['CHECK_FLAGS'] = env.ParseFlags('!pkg-config --cflags --libs check'); - else: -- print 'Disabling Check unit tests.'; -+ print ('Disabling Check unit tests.'); - conf.env['CHECK'] = 'false'; - - env = conf.Finish(); -@@ -236,7 +236,7 @@ env.Append(BUILDERS = {'StaticSharedLibrary': pic_lib}); - #----------------------------------------------------------------------------- - - ref_node = 'ref/' + env['BUILD'] + '-' + platform.system() + '-' + platform.machine() + '/'; --BuildDir(ref_node, '.', duplicate=0) -+VariantDir(ref_node, '.', duplicate=0) - - env.Append(CPPPATH = [ - # $(top_builddir)/include diff --git a/openpgm.spec b/openpgm.spec index 002109d..cebc83e 100644 --- a/openpgm.spec +++ b/openpgm.spec @@ -1,7 +1,7 @@ Name: openpgm Version: 5.2.122 %global version_dash 5-2-122 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An implementation of the PGM reliable multicast protocol # The license is LGPLv2.1 @@ -13,14 +13,13 @@ Source0: https://github.com/steve-o/%{name}/archive/release-%{version_dash # All the following patches have been submitted upstream # as a merge request: https://github.com/steve-o/openpgm/pull/64 -Patch1: openpgm-01-scons.patch Patch2: openpgm-02-c-func.patch Patch3: openpgm-03-pkgconfig.patch Patch4: openpgm-04-py-version-gen.patch BuildRequires: libtool automake autoconf BuildRequires: gcc -BuildRequires: python3 python3-scons +BuildRequires: python3 BuildRequires: perl-interpreter @@ -52,7 +51,6 @@ autoconf ./configure --libdir=%{_libdir} %build -#scons-3 make %{_smp_mflags} %install @@ -75,6 +73,9 @@ rm -f %{buildroot}%{_libdir}/libpgm.{a,la} %changelog +* Wed Oct 30 2019 Denis Arnaud - 5.2.122-2 +- Suppressed the dependency on SCons (as autotools are used rather) + * Tue Oct 29 2019 Denis Arnaud - 5.2.122-1 - First build on EPEL 8