F35 rebuild

5 files changed, 116 insertions, 112 deletions

diff --git a/0001-Honor-CFLAGS-passed-to-cmake.patch b/0001-Honor-CFLAGS-passed-to-cmake.patch
deleted file mode 100644
index dc6a1e3..0000000
--- a/0001-Honor-CFLAGS-passed-to-cmake.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0100e1a89bc7ba3f7e94960437f69294638322a6 Mon Sep 17 00:00:00 2001
-From: Lubos Kardos <lkardos@redhat.com>
-Date: Tue, 7 Jul 2015 10:25:40 +0200
-Subject: [PATCH] Honor CFLAGS passed to cmake resovles: #1239997
-
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4cfeef3..d0f96fe 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -4,7 +4,7 @@ SET(MODULE_CMD "/usr/bin/modulecmd" )
- SET(CONF_DIR "/etc/scl/conf/" )
- CONFIGURE_FILE( config.h.cmake config.h )
- 
--SET( CMAKE_C_FLAGS "-Wall -pedantic --std=gnu99 -D_GNU_SOURCE -g" )
-+SET( CMAKE_C_FLAGS "-Wall -pedantic --std=gnu99 -D_GNU_SOURCE -g ${CMAKE_C_FLAGS}" )
- INCLUDE_DIRECTORIES ("${PROJECT_BINARY_DIR}/src")
- list(APPEND SOURCES scl.c debug.c scllib.c lib_common.c args.c sclmalloc.c fallback.c)
- ADD_EXECUTABLE (scl ${SOURCES})
--- 
-1.9.3
-
diff --git a/0002-Fix-core-dumps-with-large-input-on-stdin-rhbz-125727.patch b/0002-Fix-core-dumps-with-large-input-on-stdin-rhbz-125727.patch
deleted file mode 100644
index 56e71fa..0000000
--- a/0002-Fix-core-dumps-with-large-input-on-stdin-rhbz-125727.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c041733a012ec179950c5113a8875a6d4b8c2867 Mon Sep 17 00:00:00 2001
-From: Lubos Kardos <lkardos@redhat.com>
-Date: Thu, 27 Aug 2015 13:46:06 +0200
-Subject: [PATCH] Fix core dumps with large input on stdin (rhbz:1257274)
-
----
- src/args.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/args.c b/src/args.c
-index c524dbc..dda57cd 100644
---- a/src/args.c
-+++ b/src/args.c
-@@ -139,8 +139,8 @@ static int extract_command_stdin(struct scl_args *args)
- 
-     len = 0;
-     while ((r = fread(command+len, 1, BUFSIZ, stdin)) == BUFSIZ) {
--        command = xrealloc(command, len+BUFSIZ+1);
-         len += r;
-+        command = xrealloc(command, len+BUFSIZ+1);
-     }
- 
-     if (feof(stdin)) {
--- 
-1.9.3
-
diff --git a/macros.scl-filesystem b/macros.scl-filesystem
index 1e51cf9..b64cba6 100644
--- a/macros.scl-filesystem
+++ b/macros.scl-filesystem
@@ -4,8 +4,6 @@
 %dir %attr(555,root,root) %{_scl_root}
 %dir %attr(555,root,root) %{_scl_scripts}
 %{_scl_scripts}/enable
-%{_scl_scripts}/%{scl}
-%{_root_sysconfdir}/scl/modulefiles/%{scl}
 %{_root_sysconfdir}/scl/prefixes/%scl
 %{_scl_root}/bin
 %attr(555,root,root) %{_scl_root}/boot
@@ -21,7 +19,7 @@
 %{_sysconfdir}/pki
 %{_scl_root}/home
 %{_scl_root}/lib
-%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
+%ifarch x86_64 ppc ppc64 ppc64le aarch64 sparc sparc64 s390 s390x
 %{_scl_root}/%{_lib}
 %endif
 %{_scl_root}/media
@@ -40,7 +38,7 @@
 %{_scl_root}/usr/games
 %{_scl_root}/usr/include
 %dir %attr(555,root,root) %{_scl_root}/usr/lib
-%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
+%ifarch x86_64 ppc ppc64 ppc64le aarch64 sparc sparc64 s390 s390x
 %attr(555,root,root) %{_scl_root}/usr/%{_lib}
 %endif
 %{_scl_root}/usr/libexec
@@ -61,6 +59,7 @@
 %{_scl_root}/usr/share/icons
 %{_scl_root}/usr/share/idl
 %{_scl_root}/usr/share/info
+%dir %{_scl_root}/usr/share/licenses
 %dir %{_scl_root}/usr/share/locale
 %dir %{_scl_root}/usr/share/man
 %{_scl_root}/usr/share/mime-info
@@ -103,14 +102,12 @@ mkdir -p %{buildroot}%{_root_sysconfdir}/{rpm,scl/{prefixes,modulefiles}}
 cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF
 %%%%scl %scl
 %{?nfsmountable:%%%%nfsmountable %{nfsmountable}}
-%{!?nfsmountable:%%%%undefine nfsmountable}
 %{?rh_layout:%%%%rh_layout %{rh_layout}}
-%{!?rh_layout:%%%%undefine rh_layout}
 EOF
 cat >> %{buildroot}%{_root_sysconfdir}/scl/prefixes/%{scl} << EOF
 %_scl_prefix
 EOF
-ln -s %{_scl_scripts}/%{scl} %{buildroot}%{_root_sysconfdir}/scl/modulefiles/%{scl}
+test -e %{buildroot}%{_scl_scripts}/%{scl} && ln -s %{_scl_scripts}/%{scl} %{buildroot}%{_root_sysconfdir}/scl/modulefiles/%{scl}
 # filelist
 set +x
 cat >> %{buildroot}/lang-exceptions << EOF
@@ -281,8 +278,8 @@ rm -f $RPM_BUILD_DIR/%{buildsubdir}/filesystem
 pushd %{buildroot}%{_scl_root}
 mkdir -p boot dev \\
         home media mnt opt proc root run/lock srv sys tmp \\
-        usr/{bin,etc,games,include,lib/{games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11},src,src/kernels,src/debug}
-%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
+        usr/{bin,etc,games,include,lib/{games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11},src,src/kernels,src/debug}
+%ifarch x86_64 ppc ppc64 ppc64le aarch64 sparc sparc64 s390 s390x
 mkdir -p usr/{%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},local/%{_lib}}
 %endif
 ln -snf %{_localstatedir}/tmp usr/tmp
@@ -290,7 +287,7 @@ ln -snf spool/mail %{buildroot}%{_localstatedir}/mail
 ln -snf usr/bin bin
 ln -snf usr/sbin sbin
 ln -snf usr/lib lib
-%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
+%ifarch x86_64 ppc ppc64 ppc64le aarch64 sparc sparc64 s390 s390x
 ln -snf usr/%{_lib} %{_lib}
 %endif
 sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml >%{buildroot}/iso_639.tab
diff --git a/scl-utils-layout.patch b/scl-utils-layout.patch
deleted file mode 100644
index 8069019..0000000
--- a/scl-utils-layout.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up rpm/macros.scl.orig rpm/macros.scl
---- a/rpm/macros.scl.orig	2015-06-24 07:26:39.838044392 +0200
-+++ a/rpm/macros.scl	2015-06-24 07:34:13.762968582 +0200
-@@ -69,10 +69,13 @@ package or when debugging this package.
- %global _datadir		%{_prefix}/share
- %global _sysconfdir		%{_scl_root}/etc
- %{?nfsmountable:		%global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/scls/%{scl}}
-+%{?rh_layout:			%global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/%{scl}}
- %global _sharedstatedir		%{_scl_root}/var/lib
- %{?nfsmountable:		%global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}/lib}
-+%{?rh_layout:			%global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}/lib}
- %global _localstatedir		%{_scl_root}/var
- %{?nfsmountable:		%global _localstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}}
-+%{?rh_layout:			%global _localstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}}
- %global _libdir			%{_exec_prefix}/%{_lib}
- %global _includedir		%{_prefix}/include
- %global _infodir		%{_datadir}/info
diff --git a/scl-utils.spec b/scl-utils.spec
index 37703e5..ff7b673 100644
--- a/scl-utils.spec
+++ b/scl-utils.spec
@@ -1,34 +1,31 @@
+%global __cmake_in_source_build 1
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:       scl-utils
 Epoch:      1
-Version:    2.0.1
-Release:    9%{dist}
+Version:    2.0.2
+Release:    18%{dist}
 Summary:    Utilities for alternative packaging
 
 License:    GPLv2+
-Group:      Applications/File
-URL:        https://fedorahosted.org/SoftwareCollections/
-Source0:    https://fedorahosted.org/released/scl-utils/%{name}-%{version}.tar.bz2
+URL:        https://github.com/sclorg/scl-utils
+Source0:    https://github.com/sclorg/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 Source1:    macros.scl-filesystem
-Buildrequires:  cmake
+BuildRequires:	gcc make
+Buildrequires:  cmake 
 Buildrequires:  rpm-devel
-%if 0%{?fedora} >= 24
-Buildrequires:  glibc-all-langpacks
-%endif
+Requires:   %{_bindir}/modulecmd
 
-Requires:   environment-modules
+Patch1:     0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch
 
-Patch0:     %{name}-layout.patch
-Patch1:     0001-Honor-CFLAGS-passed-to-cmake.patch
-Patch2:     0002-Fix-core-dumps-with-large-input-on-stdin-rhbz-125727.patch
+# https://github.com/sclorg/scl-utils/pull/25
+Patch100:   scl-utils-2.0.2-rhbz-1728450.patch
 
 %description
 Run-time utility for alternative packaging.
 
 %package build
 Summary:    RPM build macros for alternative packaging
-Group:      Applications/File
 Requires:   iso-codes
 Requires:   redhat-rpm-config
 
@@ -39,9 +36,13 @@ Essential RPM build macros for alternative packaging.
 %autosetup -p1
 
 %build
-%cmake
+%cmake .
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
+%if 0%{?fedora} >= 33
+sed -e 's/__python}/__python3}/' -i rpm/macros.scl
+%endif
+
 
 %install
 rm -rf %{buildroot}
@@ -58,16 +59,14 @@ mkdir modulefiles
 mkdir prefixes
 ln -s prefixes conf
 
-%clean
-rm -rf %buildroot
-
 %files
-%defattr(-,root,root,-)
 %dir %{_sysconfdir}/scl/modulefiles
 %dir %{_sysconfdir}/scl/prefixes
 %{_sysconfdir}/scl/conf
-%config %{_sysconfdir}/bash_completion.d/scl-completion.bash
+%{_sysconfdir}/scl/func_scl.csh
+%config %{_sysconfdir}/bash_completion.d/scl
 %config %{_sysconfdir}/profile.d/scl-init.sh
+%config %{_sysconfdir}/profile.d/scl-init.csh
 %{_bindir}/scl
 %{_bindir}/scl_enabled
 %{_bindir}/scl_source
@@ -75,7 +74,6 @@ rm -rf %buildroot
 %doc LICENSE
 
 %files build
-%defattr(-,root,root,-)
 %{macrosdir}/macros.scl
 %{_rpmconfigdir}/scldeps.sh
 %{_rpmconfigdir}/fileattrs/scl.attr
@@ -84,16 +82,98 @@ rm -rf %buildroot
 %{_rpmconfigdir}/brp-scl-python-bytecompile
 
 %changelog
-* Mon Mar  7 2016 Remi Collet <remi@remirepo.net> - 1:2.0.1-9
-- fix grep usage in macros.scl #1315051
+* Sat Sep  4 2021 Remi Collet <remi@remirepo.net> - 1:2.0.2-18
+- F35 rebuild
+
+* Tue Aug 18 2020 Remi Collet <remi@remirepo.net> - 1:2.0.2-17
+- use python3 by default
+
+* Wed Jul 29 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1:2.0.2-16
+- Backported upstream patches to resolve RHBZ#1728450.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 24 2020 Jeff Law <law@redhat.com> - 1:2.0.2-14
+- Use __cmake_in_source_build
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Aug 22 2019 Remi Collet <remi@remirepo.net> - 1:2.0.2-12
+- Fix error: macro %%undefine is a built-in #1744583
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jun 10 22:13:23 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:2.0.2-10
+- Rebuild for RPM 4.15
+
+* Mon Jun 10 15:42:05 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:2.0.2-9
+- Rebuild for RPM 4.15
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 24 2018 Vít Ondruch <vondruch@redhat.com> - 1:2.0.2-7
+- Don't enforce modulefile ownership.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Feb 19 2018 Panu Matilainen <pmatilai@redhat.com> - 1:2.0.2-5
+- Explicitly BuildRequire gcc and make
 
-* Sun Mar  6 2016 Remi Collet <remi@remirepo.net> - 1:2.0.1-8
-- F24 build
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
-* Fri Sep 18 2015 Remi Collet <remi@remirepo.net> - 1:2.0.1-7
-- add "rh_layout" to remove /scls/ from _sysconfdir,
-  _sharedstatedir and _localstatedir, in sync with RHEL version
-  see #1198693
+* Fri Aug 25 2017 Panu Matilainen <pmatilai@redhat.com> - 1:2.0.2-3
+- Fixup URL and Source, fedorahosted.org is no more
+
+* Fri Aug 25 2017 Panu Matilainen <pmatilai@redhat.com> - 1:2.0.2-2
+- scl-utils is not compatible with Lmod, fix the dependency (#1296383)
+
+* Fri Aug 25 2017 Panu Matilainen <pmatilai@redhat.com> - 1:2.0.2-1
+- Rebase to 2.0.2
+
+* Fri Aug 11 2017 Igor Gnatenko <ignatenko@redhat.com> - 1:2.0.1-20
+- Rebuilt after RPM update (№ 3)
+
+* Thu Aug 10 2017 Igor Gnatenko <ignatenko@redhat.com> - 1:2.0.1-19
+- Rebuilt for RPM soname bump
+
+* Thu Aug 10 2017 Igor Gnatenko <ignatenko@redhat.com> - 1:2.0.1-18
+- Rebuilt for RPM soname bump
+
+* Mon Aug  7 2017 Joe Orton <jorton@redhat.com> - 1:2.0.1-17
+- add aarch64, ppc64le to list of arches with lib64 (#1475718)
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.1-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Mar 20 2017 Panu Matilainen <pmatilai@redhat.com> - 1:2.0.1-14
+- Permit choosing environment modules implementation (#1296383)
+
+* Mon Mar 20 2017 Panu Matilainen <pmatilai@redhat.com> - 1:2.0.1-13
+- Own license directory by runtime (#1206044)
+
+* Mon Mar 20 2017 Panu Matilainen <pmatilai@redhat.com> - 1:2.0.1-12
+- Don't try to use no longer existing brp-java-repack-jars script (#1409277)
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Mar 09 2016 Lubos Kardos <lkardos@redhat.com> -1:2.0.1-10
+- apply rh layout fixes from Remi Collet (#1198693)
+
+* Mon Mar  7 2016 Remi Collet <remi@fedoraproject.org> - 1:2.0.1-9
+- fix grep usage in macros.scl #1315051
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
 * Thu Aug 27 2015 Lubos Kardos <lkardos@redhat.com> - 1:2.0.1-7
 - Fix core dumps with large input on stdin (#1257274)
@@ -104,11 +184,6 @@ rm -rf %buildroot
 * Tue Jul 07 2015 Lubos Kardos <lkardos@redhat.com> - 1:2.0.1-5
 - Honor CFLAGS passed to cmake (#1239997)
 
-* Wed Jun 24 2015 Remi Collet <remi@remirepo.net> - 1:2.0.1-3
-- add "rh_layout" to remove /scls/ from _sysconfdir,
-  _sharedstatedir and _localstatedir, in sync with RHEL version
-  see #1198693
-
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild