From bd051d818b83b75619f5f49ed1dedad8d59b2502 Mon Sep 17 00:00:00 2001
From: Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date: Nov 10 2019 14:01:34 +0000
Subject: The header files are now installed directly in /usr/include


---

diff --git a/openpgm-05-fix-setgid.patch b/openpgm-05-fix-setgid.patch
new file mode 100644
index 0000000..459d542
--- /dev/null
+++ b/openpgm-05-fix-setgid.patch
@@ -0,0 +1,14 @@
+--- openpgm-release-5-2-122/openpgm/pgm/engine.c.org	2019-11-10 14:56:31.815959556 +0100
++++ openpgm-release-5-2-122/openpgm/pgm/engine.c	2019-11-10 14:57:33.990743464 +0100
+@@ -262,8 +262,9 @@
+ {
+ #ifndef _WIN32
+ 	if (0 == getuid()) {
+-		setuid((gid_t)65534);
+-		setgid((uid_t)65534);
++                setgroups(0, NULL);
++		setgid((gid_t)65534);
++		setuid((uid_t)65534);
+ 	}
+ #endif
+ }
diff --git a/openpgm.spec b/openpgm.spec
index 79799c7..ed83e8f 100644
--- a/openpgm.spec
+++ b/openpgm.spec
@@ -1,7 +1,10 @@
 Name:          openpgm
 Version:       5.2.122
-%global version_dash 5-2-122
-Release:       20%{?dist}
+%global name_alias        pgm
+%global version_main      5.2
+%global version_dash_main 5-2
+%global version_dash      %{version_dash_main}-122
+Release:       21%{?dist}
 Summary:       An implementation of the PGM reliable multicast protocol
 
 # The license is LGPLv2.1
@@ -13,14 +16,15 @@ 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-makefile-am.patch
 Patch2:        openpgm-02-c-func.patch
 Patch3:        openpgm-03-pkgconfig.patch
 Patch4:        openpgm-04-py-version-gen.patch
+Patch5:        openpgm-05-fix-setgid.patch
 
 BuildRequires: libtool automake autoconf
 BuildRequires: gcc
 BuildRequires: python3
+BuildRequires: dos2unix
 BuildRequires: perl-interpreter
 
 
@@ -38,10 +42,12 @@ This package contains OpenPGM related development libraries and header files.
 
 
 %prep
-%setup -q -n %{name}-release-%{version_dash}/openpgm/pgm
+%setup -q -n %{name}-release-%{version_dash}/%{name}/%{name_alias}
 %patch2 -p3
 %patch3 -p3
 %patch4 -p3
+%patch5 -p3
+dos2unix examples/getopt.c examples/getopt.h
 
 libtoolize --force --copy
 aclocal
@@ -51,14 +57,16 @@ autoconf
 %configure
 
 %build
-make %{_smp_mflags}
+%make_build
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+%make_install
 
-rm -f %{buildroot}%{_libdir}/libpgm.{a,la}
+# Remove the static libraries and the temporary libtool artifacts
+rm -f %{buildroot}%{_libdir}/lib%{name_alias}.{a,la}
 
+# Move the header files into /usr/include
+mv -f %{buildroot}%{_includedir}/%{name_alias}-%{version_main}/%{name_alias} %{buildroot}%{_includedir}/
 
 %files
 %doc COPYING LICENSE
@@ -73,6 +81,9 @@ rm -f %{buildroot}%{_libdir}/libpgm.{a,la}
 
 
 %changelog
+* Sun Nov 10 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 5.2.122-21
+- The header files are now installed directly in /usr/include
+
 * Wed Oct 30 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 5.2.122-20
 - Suppressed the dependency on SCons (as autotools are used instead)
 - Fixed the generated version minor number (from 127 to 122)