F35 rebuild

1 files changed, 109 insertions, 34 deletions

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