orion pushed to python-rfc3986 (el6). "cleanup spec (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-11-30 18:55:31 UTC
From 2f51139ffd4291764521afd039c56feef5e1832d Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec(a)redhat.com>
Date: Sep 17 2014 22:30:21 +0000
Subject: cleanup spec
TODO improve pyp2rpm template
---
diff --git a/python-rfc3986.spec b/python-rfc3986.spec
index 13ea1ae..c1ef3ce 100644
--- a/python-rfc3986.spec
+++ b/python-rfc3986.spec
@@ -6,38 +6,16 @@ Version: 0.2.0
Release: 1%{?dist}
Summary: Validating URI References per RFC 3986
-License: ASL %(TODO: version)s
+License: ASL 2.0
URL: https://rfc3986.rtfd.org
Source0: https://pypi.python.org/packages/source/r/%{pypi_name}/%{pypi_name}-%{ver...
BuildArch: noarch
-
-BuildRequires: python-devel
+BuildRequires: python2-devel
-%description
-rfc3986
-=======
-
-A Python implementation of `RFC 3986`_ including validation
-and authority
-parsing. Coming soon: `Reference Resolution
-<http://tools.ietf.org/html/rfc3986#section-5>`_.
-
-Installation
-------------
-Simply use pip to install ``rfc3986`` like so::
-
- pip install rfc3986
-License
--------
-
-`Apache License Version 2.0`_
-Example Usage
--------------
-
-To
-parse a URI into a convenient ...
+%description
+A Python implementation of RFC 3986 including validation and authority parsing.
%prep
@@ -46,7 +24,6 @@ parse a URI into a convenient ...
rm -rf %{pypi_name}.egg-info
-
%build
%{__python2} setup.py build
@@ -55,12 +32,11 @@ rm -rf %{pypi_name}.egg-info
%{__python2} setup.py install --skip-build --root %{buildroot}
-
%files
%doc README.rst LICENSE
%{python2_sitelib}/%{pypi_name}
%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
%changelog
-* Mon Sep 15 2014 Alan <apevec(a)gmail.com> - 0.2.0-1
+* Mon Sep 15 2014 Alan Pevec <apevec(a)redhat.com> - 0.2.0-1
- Initial package.
https://src.fedoraproject.org/rpms/python-rfc3986/c/2f51139ffd4291764521a...
3Â years, 3Â months
orion pushed to python-rfc3986 (el6). "Updated to upstream version
0.3.1 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-11-30 18:55:31 UTC
From b33887c31042ed83331e9c51268d9270d1c146c0 Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena(a)redhat.com>
Date: Jun 20 2016 13:45:07 +0000
Subject: Updated to upstream version 0.3.1
- Added python3 subpackage
---
diff --git a/.gitignore b/.gitignore
index ff0332c..ce5dd90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/rfc3986-0.2.0.tar.gz
+/rfc3986-0.3.1.tar.gz
diff --git a/python-rfc3986.spec b/python-rfc3986.spec
index 213949d..360add7 100644
--- a/python-rfc3986.spec
+++ b/python-rfc3986.spec
@@ -1,9 +1,13 @@
# Created by pyp2rpm-1.1.0b
+%if 0%{?fedora}
+%global with_python3 1
+%endif
+
%global pypi_name rfc3986
Name: python-%{pypi_name}
-Version: 0.2.0
-Release: 3%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
Summary: Validating URI References per RFC 3986
License: ASL 2.0
@@ -11,7 +15,27 @@ URL: https://pypi.python.org/pypi/rfc3986
Source0: https://pypi.python.org/packages/source/r/%{pypi_name}/%{pypi_name}-%{ver...
BuildArch: noarch
+%package -n python2-%{pypi_name}
+Summary: Validating URI References per RFC 3986
+%{?python_provide:%python_provide python2-%{pypi_name}}
+
BuildRequires: python2-devel
+BuildRequires: python-setuptools
+
+%description -n python2-%{pypi_name}
+A Python implementation of RFC 3986 including validation and authority parsing.
+
+%if 0%{?with_python3}
+%package -n python3-%{pypi_name}
+Summary: Validating URI References per RFC 3986
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+
+%description -n python3-%{pypi_name}
+A Python implementation of RFC 3986 including validation and authority parsing.
+%endif
%description
@@ -23,21 +47,38 @@ A Python implementation of RFC 3986 including validation and authority parsing.
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
-
%build
-%{__python2} setup.py build
+%py2_build
+%if 0%{?with_python3}
+%py3_build
+%endif
%install
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%py2_install
+%if 0%{?with_python3}
+%py3_install
+%endif
-%files
+%files -n python2-%{pypi_name}
%doc README.rst LICENSE
%{python2_sitelib}/%{pypi_name}
%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%if 0%{?with_python3}
+%files -n python3-%{pypi_name}
+%doc README.rst LICENSE
+%{python3_sitelib}/%{pypi_name}
+%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+
+%endif
+
%changelog
+* Mon Jun 20 2016 Javier Peña <jpena(a)redhat.com> - 0.3.1-4
+- Updated to upstream version 0.3.1
+- Added python3 subpackage
+
* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources
index 550a24e..4d6884a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a80b964a92c3a40e57ec95f7c0d68fa9 rfc3986-0.2.0.tar.gz
+4a0cc842d0e1b061f1b5202917095340 rfc3986-0.3.1.tar.gz
https://src.fedoraproject.org/rpms/python-rfc3986/c/b33887c31042ed83331e9...
3Â years, 3Â months
orion pushed to python-rfc3986 (el6). "Fix build on EL6"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-11-30 18:55:31 UTC
From 94db4c768d9c5896183bcaebd40e22c5a72566cd Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar(a)fedoraproject.org>
Date: Mar 11 2015 11:28:54 +0000
Subject: Fix build on EL6
---
diff --git a/python-rfc3986.spec b/python-rfc3986.spec
index a34dcad..84138e0 100644
--- a/python-rfc3986.spec
+++ b/python-rfc3986.spec
@@ -1,4 +1,9 @@
-# Created by pyp2rpm-1.1.0b
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{!?__python2: %global __python2 /usr/bin/python2}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
%global pypi_name rfc3986
Name: python-%{pypi_name}
https://src.fedoraproject.org/rpms/python-rfc3986/c/94db4c768d9c5896183bc...
3Â years, 3Â months
orion pushed to python-rfc3986 (el6). "initial package created by
pyp2rpm-1.1.0b"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-11-30 18:55:31 UTC
From 4104e4cd445e8a1f0d1c41eeb4ab37e2cb8093e6 Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec(a)redhat.com>
Date: Sep 17 2014 22:30:21 +0000
Subject: initial package created by pyp2rpm-1.1.0b
---
diff --git a/.gitignore b/.gitignore
index e69de29..ff0332c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/rfc3986-0.2.0.tar.gz
diff --git a/python-rfc3986.spec b/python-rfc3986.spec
new file mode 100644
index 0000000..13ea1ae
--- /dev/null
+++ b/python-rfc3986.spec
@@ -0,0 +1,66 @@
+# Created by pyp2rpm-1.1.0b
+%global pypi_name rfc3986
+
+Name: python-%{pypi_name}
+Version: 0.2.0
+Release: 1%{?dist}
+Summary: Validating URI References per RFC 3986
+
+License: ASL %(TODO: version)s
+URL: https://rfc3986.rtfd.org
+Source0: https://pypi.python.org/packages/source/r/%{pypi_name}/%{pypi_name}-%{ver...
+BuildArch: noarch
+
+BuildRequires: python-devel
+
+
+%description
+rfc3986
+=======
+
+A Python implementation of `RFC 3986`_ including validation
+and authority
+parsing. Coming soon: `Reference Resolution
+<http://tools.ietf.org/html/rfc3986#section-5>`_.
+
+Installation
+------------
+Simply use pip to install ``rfc3986`` like so::
+
+ pip install rfc3986
+License
+-------
+
+`Apache License Version 2.0`_
+
+Example Usage
+-------------
+
+To
+parse a URI into a convenient ...
+
+
+%prep
+%setup -q -n %{pypi_name}-%{version}
+# Remove bundled egg-info
+rm -rf %{pypi_name}.egg-info
+
+
+
+%build
+%{__python2} setup.py build
+
+
+%install
+%{__python2} setup.py install --skip-build --root %{buildroot}
+
+
+
+%files
+%doc README.rst LICENSE
+%{python2_sitelib}/%{pypi_name}
+%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+
+%changelog
+* Mon Sep 15 2014 Alan <apevec(a)gmail.com> - 0.2.0-1
+- Initial package.
diff --git a/sources b/sources
index e69de29..550a24e 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a80b964a92c3a40e57ec95f7c0d68fa9 rfc3986-0.2.0.tar.gz
https://src.fedoraproject.org/rpms/python-rfc3986/c/4104e4cd445e8a1f0d1c4...
3Â years, 3Â months
orion pushed to Lmod (epel7). "Update to 8.2.7 (bz#1777262) (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-11-30 18:50:39 UTC
From c84a9d074ff64260dd584a5a12117271d92139e8 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)nwra.com>
Date: Nov 30 2019 18:50:33 +0000
Subject: Update to 8.2.7 (bz#1777262)
Make 00-modulepath.sh return 0
Make sure /etc/profile.d/modules.sh has $MODULEPATH (#1461656)
---
diff --git a/.gitignore b/.gitignore
index 013633f..67529a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,4 @@
/Lmod-7.8.6.tar.gz
/Lmod-7.8.9.tar.gz
/Lmod-7.8.16.tar.gz
+/Lmod-8.2.7.tar.gz
diff --git a/Lmod.spec b/Lmod.spec
index dcebb47..77d47af 100644
--- a/Lmod.spec
+++ b/Lmod.spec
@@ -3,22 +3,23 @@
%global debug_package %{nil}
Name: Lmod
-Version: 7.8.16
+Version: 8.2.7
Release: 1%{?dist}
Summary: Environmental Modules System in Lua
# Lmod-5.3.2/tools/base64.lua is LGPLv2
License: MIT and LGPLv2
URL: https://www.tacc.utexas.edu/tacc-projects/lmod
-Source0: https://github.com/TACC/Lmod/archive/%{version}.tar.gz#/Lmod-%{version}.t...
+Source0: https://github.com/TACC/Lmod/archive/%{version}/Lmod-%{version}.tar.gz
Source1: macros.%{name}
BuildRequires: gcc
+BuildRequires: lua-devel
BuildRequires: lua-filesystem
BuildRequires: lua-json
BuildRequires: lua-posix
BuildRequires: lua-term
-BuildRequires: tcl
+BuildRequires: tcl-devel
BuildRequires: zsh
Requires: lua-filesystem
Requires: lua-json
@@ -29,7 +30,7 @@ Requires: /bin/ps
%else
Requires: /usr/bin/ps
%endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
Requires(post): coreutils
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
@@ -48,8 +49,8 @@ where the library and header files can be found.
%prep
%setup -q
sed -i -e 's,/usr/bin/env ,/usr/bin/,' src/*.tcl
-# Remove bundled lua-term
-rm -r pkgs tools/json.lua
+# Remove bundled lua-filesystem and lua-term
+rm -r pkgs/{luafilesystem,term} tools/json.lua
#sed -i -e 's, pkgs , ,' Makefile.in
# Remove unneeded shbangs
sed -i -e '/^#!/d' init/*.in
@@ -67,22 +68,34 @@ sed -i -e '/^#!/d' init/*.in
%install
%make_install
# init scripts are sourced
-chmod -x %{buildroot}%{_datadir}/lmod/%{version}/init/*
+find %{buildroot}%{_datadir}/lmod/%{version}/init -type f -exec chmod -x {} +
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
mkdir -p %{buildroot}%{_datadir}/modulefiles
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
# Setup for alternatives on Fedora
touch %{buildroot}%{_sysconfdir}/profile.d/modules.{csh,sh}
%endif
# Fedora defaults
-echo '[ -z "$MODULEPATH" ] && [ "$(readlink /etc/alternatives/modules.sh)" = "/usr/share/lmod/lmod/init/profile" -o -f /etc/profile.d/z00_lmod.sh ] && export MODULEPATH=%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles' > %{buildroot}%{_sysconfdir}/profile.d/00-modulepath.sh
+cat <<'EOF' > %{buildroot}%{_sysconfdir}/profile.d/00-modulepath.sh
+[ -z "$MODULEPATH" ] &&
+ [ "$(readlink /etc/alternatives/modules.sh)" = "/usr/share/lmod/lmod/init/profile" -o -f /etc/profile.d/z00_lmod.sh ] &&
+ export MODULEPATH=%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles || :
+EOF
+
cat << 'EOF' > %{buildroot}%{_sysconfdir}/profile.d/00-modulepath.csh
if (! $?MODULEPATH && ( `readlink /etc/alternatives/modules.csh` == /usr/share/lmod/lmod/init/cshrc || -f /etc/profile.d/z00_lmod.csh ) ) then
setenv MODULEPATH %{_sysconfdir}/modulefiles:%{_datadir}/modulefiles
endif
EOF
-%if 0%{?rhel}
+
+# Add a snippet to make sure that the 00-modulepath.* is included, when
+# the user calls /etc/profile.d/modules.sh directly, just below
+# the shbang line.
+sed -i '2i\. /etc/profile.d/00-modulepath.sh\n' \
+ %{buildroot}%{_datadir}/lmod/lmod/init/profile
+
+%if 0%{?rhel} && 0%{?rhel} < 8
# Install profile links to override environment-modules
ln -s %{_datadir}/lmod/lmod/init/profile %{buildroot}%{_sysconfdir}/profile.d/z00_lmod.sh
ln -s %{_datadir}/lmod/lmod/init/cshrc %{buildroot}%{_sysconfdir}/profile.d/z00_lmod.csh
@@ -92,7 +105,7 @@ install -Dpm 644 %{SOURCE1} %{buildroot}/%{macrosdir}/macros.%{name}
# TODO - contrib
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
%post
# Cleanup from pre-alternatives
[ ! -L %{_sysconfdir}/profile.d/modules.sh ] && rm -f %{_sysconfdir}/profile.d/modules.sh
@@ -113,7 +126,7 @@ fi
%{_sysconfdir}/modulefiles
%config(noreplace) %{_sysconfdir}/profile.d/00-modulepath.csh
%config(noreplace) %{_sysconfdir}/profile.d/00-modulepath.sh
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
%ghost %{_sysconfdir}/profile.d/modules.csh
%ghost %{_sysconfdir}/profile.d/modules.sh
%else
@@ -126,6 +139,11 @@ fi
%changelog
+* Sat Nov 30 2019 Orion Poplawski <orion(a)nwra.com> - 8.2.7-1
+- Update to 8.2.7 (bz#1777262)
+- Make 00-modulepath.sh return 0
+- Make sure /etc/profile.d/modules.sh has $MODULEPATH (#1461656)
+
* Sat Feb 2 2019 Orion Poplawski <orion(a)cora.nwra.com> - 7.8.16-1
- Update to 7.8.16
diff --git a/sources b/sources
index 6eb8c53..2614fed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Lmod-7.8.16.tar.gz) = 666352410af32286abd43bd3c8ad537d3188354a70d9bfd29a2d2b707b77310cff2250ab80a23d730278147ea2c467a3b2ab2bf71e774040e2cff7f8225042dd
+SHA512 (Lmod-8.2.7.tar.gz) = bebc6dab3516d997226c07afd5fb5d8cfeb8f754cbee2f836bedb37077105657a9d9fe62ffcd2adc108d17aba4baa7d7983833bb4c743a5cedb93bf3a34bc8c1
https://src.fedoraproject.org/rpms/Lmod/c/c84a9d074ff64260dd584a5a1211727...
3Â years, 3Â months