2 changed files with 24 additions and 103 deletions
--- a/hugs98-gnu.patch
+++ b/hugs98-gnu.patch
@ -1,24 +0,0 @@
-diff -up hugs98-plus-Sep2006/packages/network/include/HsNet.h.gnu hugs98-plus-Sep2006/packages/network/include/HsNet.h
--- hugs98-plus-Sep2006/packages/network/include/HsNet.h.gnu	2006-09-21 00:28:56.000000000 +0200
-+++ hugs98-plus-Sep2006/packages/network/include/HsNet.h	2015-07-10 13:39:37.824377073 +0200
-@@ -20,7 +20,7 @@
- # if defined(_MSC_VER)
- #  define INLINE extern __inline
- # elif defined(__GNUC__)
-#  define INLINE extern inline
-+#  define INLINE inline
- # else
- #  define INLINE inline
- # endif
-@@ -132,4 +132,11 @@ my_inet_ntoa(
-     return inet_ntoa(a);
- }
- 
-+
-+struct ucred {
-+    pid_t pid;    /* process ID of the sending process */
-+    uid_t uid;    /* user ID of the sending process */
-+    gid_t gid;    /* group ID of the sending process */
-+};
-+
- #endif
--- a/hugs98.spec
+++ b/hugs98.spec
@ -2,18 +2,17 @@

 Name:		hugs98
 Version:	2006.09
-Release:	30%{?dist}
+Release:	12%{?dist}
 Summary:	Haskell Interpreter

 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
 Source0:	http://cvs.haskell.org/Hugs/downloads/2006-09/%{name}-%{hugs_ver}.tar.gz
-Patch0:         hugs98-gnu.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:	docbook-utils
 BuildRequires:	freeglut-devel
-BuildRequires:	gcc
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:	libICE-devel
@ -26,9 +25,7 @@ BuildRequires:	readline-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	openal-soft-devel
 BuildRequires:	freealut-devel
-%ifnarch aarch64 ppc64le
-BuildRequires:	/usr/bin/execstack
-%endif
+BuildRequires:	prelink

 %description
 Hugs 98 is a functional programming system based on Haskell 98, the de
@ -106,48 +103,43 @@ Demo files for Hugs98.

 %prep
 %setup -q -n %{name}-%{hugs_ver}
-# add undefined struct
-%patch0 -p1 -b .gnu
-# use inline keyword
-sed -i 's|extern inline|inline|' packages/base/include/HsBase.h packages/network/include/HsNet.h packages/unix/include/HsUnix.h hsc2hs/Main.hs
-# libalut needs libopenal
-sed -i 's|ALUT_LIBS="$ac_cv_search_alutExit"|ALUT_LIBS="$ac_cv_search_alutExit -lopenal"|' packages/ALUT/configure
 # this is to avoid network lookup of the DTD
 sed -i 's|\"http://www.oasis-open.org.*\"||' docs/users_guide/users_guide.xml
-# Update config.guess/sub to fix builds on new architectures (aarch64/ppc64le)
-cp /usr/lib/rpm/config.* .


 %build
-%define __global_ldflags ""
 %configure --with-pthreads --enable-char-encoding=locale
 make %{?_smp_mflags}


 %install
-make DESTDIR=%{buildroot} install_all_but_docs
-make -C docs DESTDIR=%{buildroot} install_man
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install_all_but_docs
+make -C docs DESTDIR=$RPM_BUILD_ROOT install_man

-%ifnarch aarch64 ppc64le
-execstack -s %{buildroot}%{_bindir}/{hugs,runhugs,ffihugs}
-%endif
+execstack -s $RPM_BUILD_ROOT%{_bindir}/{hugs,runhugs,ffihugs}

-find %{buildroot} -name '*.so' -exec chmod 0755 '{}' ';'
+find $RPM_BUILD_ROOT -name '*.so' -exec chmod 0755 '{}' ';'

-mv %{buildroot}%{_libdir}/hugs/demos installed-demos
+mv $RPM_BUILD_ROOT%{_libdir}/hugs/demos installed-demos
 rm installed-demos/Makefile.in

-mv %{buildroot}%{_datadir}/hsc2hs-*/* %{buildroot}%{_libdir}/hugs/programs/hsc2hs
+mv $RPM_BUILD_ROOT%{_datadir}/hsc2hs-*/* $RPM_BUILD_ROOT%{_libdir}/hugs/programs/hsc2hs

 sed -i "s|^bindir.*|bindir=\"%{_bindir}\"|
        s|^libdir.*|libdir=\"%{_libdir}/hugs/programs/hsc2hs|
        s|^datadir.*|datadir=\"%{_libdir}/hugs/programs/hsc2hs\"|" \
-    %{buildroot}%{_libdir}/hugs/programs/hsc2hs/Paths_hsc2hs.hs
+    $RPM_BUILD_ROOT%{_libdir}/hugs/programs/hsc2hs/Paths_hsc2hs.hs



+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
 %files
-%license License
+%defattr(-,root,root,-)
+%doc License
 %doc Readme
 %doc Credits
 %doc docs/ffi-notes.txt
@ -166,30 +158,37 @@ sed -i "s|^bindir.*|bindir=\"%{_bindir}\"|


 %files demos
+%defattr(-,root,root,-)
 %doc installed-demos/*


 %files openal
+%defattr(-,root,root,-)
 %{_libdir}/hugs/packages/OpenAL


 %files alut
+%defattr(-,root,root,-)
 %{_libdir}/hugs/packages/ALUT


 %files x11
+%defattr(-,root,root,-)
 %{_libdir}/hugs/packages/X11


 %files opengl
+%defattr(-,root,root,-)
 %{_libdir}/hugs/packages/OpenGL


 %files glut
+%defattr(-,root,root,-)
 %{_libdir}/hugs/packages/GLUT


 %files hgl
+%defattr(-,root,root,-)
 %{_libdir}/hugs/packages/HGL


@ -211,60 +210,6 @@ fi


 %changelog
-* Mon Feb 19 2018 Jens Petersen <petersen@redhat.com> - 2006.09-30
- BR gcc
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2006.09-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2006.09-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2006.09-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2006.09-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 2006.09-25
- Rebuild for readline 7.x
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2006.09-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Aug 04 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2006.09-23
- Use new execstack (#1247795)
-
-* Fri Jul 10 2015 Gérard Milmeister <gemi@bluewin.ch> - 2006.09-22
- Build fixes
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2006.09-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2006.09-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Fri Jun 13 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2006.09-19
- Fix build for aarch/ppc64le
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2006.09-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Sep 29 2013 Jens Petersen <petersen@redhat.com> - 2006.09-17
- buildroot spec file cleanup
-
-* Wed Aug 21 2013 Jens Petersen <petersen@redhat.com> - 2006.09-16
- BR autoconf for aarch64
-
-* Tue Aug 20 2013 Jens Petersen <petersen@redhat.com> - 2006.09-15
- regenerate autoconf files on aarch64 (#925561)
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2006.09-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2006.09-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2006.09-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild