commit Modules for openSUSE:Factory
Hello community,
here is the log from the commit of package Modules for openSUSE:Factory checked
in at 2020-06-11 14:37:00
Comparing /work/SRC/openSUSE:Factory/Modules (Old)
and /work/SRC/openSUSE:Factory/.Modules.new.3606 (New)
Package is "Modules"
Thu Jun 11 14:37:00 2020 rev:23 rq:807492 version:4.5.0
Changes:
--- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2018-04-25
09:57:20.719661310 +0200
+++ /work/SRC/openSUSE:Factory/.Modules.new.3606/Modules.changes
2020-06-11 14:37:01.831972780 +0200
@@ -1,0 +2,13 @@
+Fri May 15 05:39:32 UTC 2020 - Egbert Eich
+
+- Update to version 4.5.0
+ Check https://github.com/cea-hpc/modules/releases/tag/v4.5.0
+ for details.
+- Install profile script to set aliases (boo#1100410)
+- Add: Remove-empty-unused-static-function.patch
+ replaces: modules-4.1.2-return.patch
+- Remove: modules-4.1.2-fix-bashisms.patch
+ BOGUS: applied to a csh context.
+- Install .vim files to /usr/share/vim/site.
+
+---
Old:
modules-4.1.2-fix-bashisms.patch
modules-4.1.2-return.patch
modules-4.1.2.tar.gz
New:
Remove-empty-unused-static-function.patch
modules-4.5.0.tar.gz
Other differences:
--
++ Modules.spec ++
--- /var/tmp/diff_new_pack.aPkl2X/_old 2020-06-11 14:37:03.047976317 +0200
+++ /var/tmp/diff_new_pack.aPkl2X/_new 2020-06-11 14:37:03.047976317 +0200
@@ -1,7 +1,7 @@
#
# spec file for package Modules
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,31 +12,28 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: Modules
BuildRequires: automake
+BuildRequires: fdupes
BuildRequires: less
BuildRequires: procps
BuildRequires: tcl-devel
# xorg-x11-devel
-Url:http://modules.sourceforge.net/
-Version:4.1.2
+URL:http://modules.sourceforge.net/
+Version:4.5.0
Release:0
Summary:Change environment at runtime
License:BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Management
Requires: tcl
Source:
https://download.sourceforge.net/project/modules/Modules/modules-%{version}/modules-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM modules-4.1.2-return.patch
-Patch1: modules-4.1.2-return.patch
-# PATCH-FIX-UPSTREAM modules-4.1.2-fix-bashisms.patch
-Patch2: modules-4.1.2-fix-bashisms.patch
+Patch1: Remove-empty-unused-static-function.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: environment-modules
-Obsoletes: environment-modules < %{version}
%if 0%{?suse_version}
Recommends: %{name}-doc
%endif
@@ -75,11 +72,15 @@
collection to supplement or replace the shared module files. The
modules environment is common on SGI/Crays and many workstation farms.
+%define vimdatadir %{_datadir}/vim/site
+
%prep
%setup -q -n modules-%{version}
-%patch1
-%patch2
-sed -i 's@/usr/bin/env bash@/bin/bash@' contrib/envml
+%patch1 -p1
+# This is debatable:
+# if the replace 'bash' consecutive calls to 'modules' would still
+# run with the original bash. Maybe not intended.
+sed -i 's@/usr/bin/env bash@/bin/bash@' script/envml
%build
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DUSE_INTERP_RESULT
-DUSE_INTERP_ERRORLINE" \
@@ -93,15 +94,32 @@
--with-etc-path="%_sysconfdir" \
--with-skel-path="%_sysconfdir/skel" \
--with-tcl=%{_libdir} \
- --without-x
-make
+ --without-x \
+ %{?!vimdatadir: --disable-vim-addons} \
+ %{?vimdatadir: --vimdatadir=%{vimdatadir}} \
+--etcdir=%{_sysconfdir}/%{name} \
+--libdir=%{_libdir}/%{name}
+make %{?_smp_mflags}
%install
-install -d $RPM_BUILD_ROOT/usr/share/modules
-install -d $RPM_BUILD_ROOT/etc/profile.d
-make DESTDIR=$RPM_BUILD_ROOT install
-install -d $RPM_BUILD_ROOT/usr/bin
-mv $RPM_BUILD_ROOT/usr/share/doc doc_dir
+install -d %{buildroot}/usr/share/modules
+install -d %{buildroot}/etc/profile.d
+make DESTDIR=%{buildroot} install
+install -d %{buildroot}/usr/bin
+mv %{buildroot}/usr/share/doc doc_dir
+%fdupes -s %{buildroot}%{_datadir}
+
+%post
+[ -e %{_sysconfdir}/profiles.d/modules.sh ] || \
+ln -sf %{_datadir}/Modules/init/profile.sh
%{_sysconfdir}/profile.d/mo
commit Modules for openSUSE:Factory
Hello community,
here is the log from the commit of package Modules for openSUSE:Factory checked
in at 2018-04-25 09:57:16
Comparing /work/SRC/openSUSE:Factory/Modules (Old)
and /work/SRC/openSUSE:Factory/.Modules.new (New)
Package is "Modules"
Wed Apr 25 09:57:16 2018 rev:22 rq:597449 version:4.1.2
Changes:
--- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2014-12-03
22:49:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2018-04-25
09:57:20.719661310 +0200
@@ -1,0 +2,19 @@
+Tue Apr 17 11:13:53 UTC 2018 - bo...@steki.net
+
+- rolled back change from /usr/share/Modules (package name) to old
+ expected behavior /usr/share/modules
+- fixed redhat/fedora builds
+
+---
+Mon Apr 16 19:24:51 UTC 2018 - bo...@steki.net
+
+- too many changes to put into changelog please read Changelog in
+ /usr/share/doc/packages/Modules-doc/ChangeLog (installed from
+ Modules-doc package)
+- removed return.patch
+- removed share.patch
+- reworked return.patch and renamed to modules-4.1.2-return.patch
+- reworked fixing-bashisms patch for current version
+ renamed modules-3.2.10-fix-bashisms.patch to modules-4.1.2-fix-bashisms.patch
+
+---
Old:
modules-3.2.10-fix-bashisms.patch
modules-3.2.10.tar.bz2
return.patch
share.patch
New:
modules-4.1.2-fix-bashisms.patch
modules-4.1.2-return.patch
modules-4.1.2.tar.gz
Other differences:
--
++ Modules.spec ++
--- /var/tmp/diff_new_pack.PGPzO4/_old 2018-04-25 09:57:26.039466161 +0200
+++ /var/tmp/diff_new_pack.PGPzO4/_new 2018-04-25 09:57:26.043466015 +0200
@@ -1,7 +1,7 @@
#
# spec file for package Modules
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,24 +18,33 @@
Name: Modules
BuildRequires: automake
+BuildRequires: less
+BuildRequires: procps
BuildRequires: tcl-devel
# xorg-x11-devel
Url:http://modules.sourceforge.net/
-Version:3.2.10
+Version:4.1.2
Release:0
-Summary:Environment Modules
-License:BSD-3-Clause and GPL-2.0+ and LGPL-2.1+
+Summary:Change environment at runtime
+License:BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Management
Requires: tcl
-Source: modules-%{version}.tar.bz2
-# PATCH-FIX-OPENSUSE share.patch
-Patch0: share.patch
-# PATCH-FIX-UPSTREAM return.patch
-Patch1: return.patch
-Patch2: modules-3.2.10-fix-bashisms.patch
+Source:
https://download.sourceforge.net/project/modules/Modules/modules-%{version}/modules-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM modules-4.1.2-return.patch
+Patch1: modules-4.1.2-return.patch
+# PATCH-FIX-UPSTREAM modules-4.1.2-fix-bashisms.patch
+Patch2: modules-4.1.2-fix-bashisms.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: environment-modules
Obsoletes: environment-modules < %{version}
+%if 0%{?suse_version}
+Recommends: %{name}-doc
+%endif
+
+%if 0%{?rhel_version} || 0%{?fedora_version}
+BuildRequires: perl(Digest::MD5)
+BuildRequires: perl(Exporter)
+%endif
%description
The Modules package provides for dynamic modification of a user's
@@ -49,44 +58,37 @@
collection to supplement or replace the shared module files. The
modules environment is common on SGI/Crays and many workstation farms.
+%package doc
+Summary:Documentation for Change environment at runtime
+Group: Documentation/Other
+BuildArch: noarch
-
-Authors:
-
-John L. Furlan
-Peter W. Osel
-Jens Hamisch
-R.K. Owen
+%description doc
+The Modules package provides for dynamic modification of a user's
+environment with module files. Each module file contains the
+information needed to configure the shell for an application. Once the
+package is initialized, the environment can be modified dynamically on
+a per-module basis using the module command that interprets module
+files. Typically, module files instruct the module command to alter or
+set shell environment variables, such as PATH or MANPATH. Module files
+may be shared by many users on a system and users may have their own
+collection to supplement or replace the shared module files. The
+modules environment is common on SGI/Crays and many workstation farms.
%prep
%setup -q -n modules-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patc
commit Modules for openSUSE:Factory
Hello community,
here is the log from the commit of package Modules for openSUSE:Factory checked
in at 2014-12-03 22:49:41
Comparing /work/SRC/openSUSE:Factory/Modules (Old)
and /work/SRC/openSUSE:Factory/.Modules.new (New)
Package is "Modules"
Changes:
--- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2014-08-29
17:42:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2014-12-03
22:49:42.0 +0100
@@ -1,0 +2,7 @@
+Sun Nov 16 20:50:00 UTC 2014 - Led
+
+- fix bashism in add.modules script
+- add patches:
+ * modules-3.2.10-fix-bashisms.patch
+
+---
New:
modules-3.2.10-fix-bashisms.patch
Other differences:
--
++ Modules.spec ++
--- /var/tmp/diff_new_pack.bqx5pd/_old 2014-12-03 22:49:43.0 +0100
+++ /var/tmp/diff_new_pack.bqx5pd/_new 2014-12-03 22:49:43.0 +0100
@@ -32,6 +32,7 @@
Patch0: share.patch
# PATCH-FIX-UPSTREAM return.patch
Patch1: return.patch
+Patch2: modules-3.2.10-fix-bashisms.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: environment-modules
Obsoletes: environment-modules < %{version}
@@ -61,6 +62,7 @@
%setup -q -n modules-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
# Remove overzealous use of "dnl" (+++), which caused
++ modules-3.2.10-fix-bashisms.patch ++
diff -Ndur modules-3.2.10/etc/add.modules.in
modules-3.2.10-fix-bashisms/etc/add.modules.in
--- modules-3.2.10/etc/add.modules.in 2012-11-02 00:22:06.0 +0200
+++ modules-3.2.10-fix-bashisms/etc/add.modules.in 2014-11-16
22:48:55.863380526 +0200
@@ -114,7 +114,7 @@
findload $1.old
/bin/cat > $1 <
commit Modules for openSUSE:Factory
Hello community,
here is the log from the commit of package Modules for openSUSE:Factory checked
in at 2014-08-29 17:42:16
Comparing /work/SRC/openSUSE:Factory/Modules (Old)
and /work/SRC/openSUSE:Factory/.Modules.new (New)
Package is "Modules"
Changes:
--- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2013-08-02
15:25:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2014-08-29
17:42:27.0 +0200
@@ -1,0 +2,7 @@
+Tue Aug 26 10:50:58 UTC 2014 - jeng...@inai.de
+
+- Resolve build failure with automake-1.14
+- Use some RPM macros instead of hardcoded paths;
+ remove redundant %clean section
+
+---
Other differences:
--
++ Modules.spec ++
--- /var/tmp/diff_new_pack.i5t0ms/_old 2014-08-29 17:42:28.0 +0200
+++ /var/tmp/diff_new_pack.i5t0ms/_new 2014-08-29 17:42:28.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package Modules
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -63,16 +63,31 @@
%patch1 -p1
%build
+# Remove overzealous use of "dnl" (+++), which caused
+# a broken "configure" (---) being generated.
+#@@ -3004,7 +3004,8 @@ to "yes", and re-run configure.
+# END
+# as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+# fi
+#-fiac_config_headers="$ac_config_headers config.h"
+#+fi
+#+ac_config_headers="$ac_config_headers config.h"
+#
+# # Check whether --enable-versioning was given.
+# if test "${enable_versioning+set}" = set; then :
+#
+perl -i -pe 's{dnl\n}{\n}gs' configure.ac
+
aclocal --force -I config
autoreconf --force --install
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DUSE_INTERP_RESULT
-DUSE_INTERP_ERRORLINE" \
./configure \
---prefix=/usr \
---with-version-path=/usr/share/modules \
---with-module-path=/usr/share/modules/modulefiles \
+--prefix="%_prefix" \
+--with-version-path="%_datadir/modules" \
+--with-module-path="%_datadir/modules/modulefiles" \
--mandir=%{_mandir} \
---with-etc-path=/etc \
---with-skel-path=/etc/skel \
+--with-etc-path="%_sysconfdir" \
+--with-skel-path="%_sysconfdir/skel" \
--with-tcl=%{_libdir} \
--without-x
make
@@ -93,9 +108,6 @@
ln -s ../share/Modules/%{version}/bin/modulecmd .
popd
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
%doc ChangeLog LICENSE.GPL NEWS README TODO
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit Modules for openSUSE:Factory
Hello community, here is the log from the commit of package Modules for openSUSE:Factory checked in at 2013-08-02 15:25:10 Comparing /work/SRC/openSUSE:Factory/Modules (Old) and /work/SRC/openSUSE:Factory/.Modules.new (New) Package is "Modules" Changes: --- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2013-02-04 20:54:38.0 +0100 +++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2013-08-02 15:25:11.0 +0200 @@ -1,0 +2,6 @@ +Thu Aug 1 14:50:06 UTC 2013 - m...@suse.com + +- Set -DUSE_INTERP_RESULT and -DUSE_INTERP_ERRORLINE" to fix build + with Tcl 8.6. + +--- Other differences: -- ++ Modules.spec ++ --- /var/tmp/diff_new_pack.h536cu/_old 2013-08-02 15:25:12.0 +0200 +++ /var/tmp/diff_new_pack.h536cu/_new 2013-08-02 15:25:12.0 +0200 @@ -65,7 +65,8 @@ %build aclocal --force -I config autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \ +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE" \ +./configure \ --prefix=/usr \ --with-version-path=/usr/share/modules \ --with-module-path=/usr/share/modules/modulefiles \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit Modules for openSUSE:Factory
Hello community,
here is the log from the commit of package Modules for openSUSE:Factory checked
in at 2013-02-04 20:54:37
Comparing /work/SRC/openSUSE:Factory/Modules (Old)
and /work/SRC/openSUSE:Factory/.Modules.new (New)
Package is "Modules", Maintainer is "mrueck...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2012-12-22
22:17:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2013-02-04
20:54:38.0 +0100
@@ -1,0 +2,5 @@
+Mon Feb 4 09:06:23 UTC 2013 - co...@suse.com
+
+- update license to new format
+
+---
Other differences:
--
++ Modules.spec ++
--- /var/tmp/diff_new_pack.ST9ONA/_old 2013-02-04 20:54:39.0 +0100
+++ /var/tmp/diff_new_pack.ST9ONA/_new 2013-02-04 20:54:39.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package Modules
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
Version:3.2.10
Release:0
Summary:Environment Modules
-License:BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+
+License:BSD-3-Clause and GPL-2.0+ and LGPL-2.1+
Group: System/Management
Requires: tcl
Source: modules-%{version}.tar.bz2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit Modules for openSUSE:Factory
binQFdvWX77RR.bin Description: Binary data
commit Modules for openSUSE:Factory
Hello community,
here is the log from the commit of package Modules for openSUSE:Factory checked
in at 2012-09-13 07:03:08
Comparing /work/SRC/openSUSE:Factory/Modules (Old)
and /work/SRC/openSUSE:Factory/.Modules.new (New)
Package is "Modules", Maintainer is "mrueck...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2011-12-30
08:46:10.0 +0100
+++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2012-09-13
07:03:09.0 +0200
@@ -1,0 +2,20 @@
+Mon Sep 10 08:30:51 UTC 2012 - kkae...@suse.com
+
+- complete the move from /usr/Modules to /usr/share/Modules
+ (bnc#778525)
+
+---
+Wed Aug 29 20:11:14 UTC 2012 - alinm.el...@gmail.com
+
+- update to 3.2.9c
+ * Fix the coexistence of load/remove flags (Martin Siegert)
+ * Fixed an overlapping string copy (Wilson Snyder & Orion Poplawski)
+ * Isolated calls to the new interpreter and get & set env.vars.
+ * Crucial bug fix of same by (Orion Poplawski).
+ * Optionally use Tcl memory check routines for malloc/realloc.
+ * Fixed the "module purge" memory corruption (Poor Yorick)
+ * Added support for Ruby (Tammo Tjarks)
+- replace defaut in the profile files with the proper version
+- make module files from /etc %config
+
+---
Old:
modules-3.2.8.patch
modules-3.2.8a.tar.bz2
New:
modules-3.2.9c.tar.bz2
return.patch
share.patch
Other differences:
--
++ Modules.spec ++
--- /var/tmp/diff_new_pack.ixdLfg/_old 2012-09-13 07:03:10.0 +0200
+++ /var/tmp/diff_new_pack.ixdLfg/_new 2012-09-13 07:03:10.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package Modules
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,19 +15,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: Modules
BuildRequires: automake
BuildRequires: tcl-devel
# xorg-x11-devel
Url:http://modules.sourceforge.net/
-Version:3.2.8
+Version:3.2.9
Release:0
Summary:Environment Modules
License:BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+
Group: System/Management
Requires: tcl
-Source: modules-%{version}a.tar.bz2
-Patch: modules-%{version}.patch
+Source: modules-%{version}c.tar.bz2
+# PATCH-FIX-OPENSUSE share.patch
+Patch0: share.patch
+# PATCH-FIX-UPSTREAM return.patch
+Patch1: return.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: environment-modules
Obsoletes: environment-modules
@@ -55,7 +59,8 @@
%prep
%setup -q -n modules-%{version}
-%patch -p1
+%patch0 -p1
+%patch1 -p1
%build
aclocal --force -I config
@@ -76,6 +81,9 @@
install -d $RPM_BUILD_ROOT/etc/profile.d
install -m 644 etc/global/profile.modules
$RPM_BUILD_ROOT/etc/profile.d/modules.sh
install -m 644 etc/global/csh.modules $RPM_BUILD_ROOT/etc/profile.d/modules.csh
+sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.sh
+sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.csh
+
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT/usr/bin
pushd $RPM_BUILD_ROOT/usr/bin
@@ -95,7 +103,7 @@
%dir /usr/share/modules
/usr/share/modules/*
%{_bindir}/*
-/etc/profile.d/modules.*
+%config /etc/profile.d/modules.*
%doc %{_mandir}/man4/*
%doc %{_mandir}/man1/*
++ modules-3.2.8a.tar.bz2 -> modules-3.2.9c.tar.bz2 ++
2864 lines of diff (skipped)
++ return.patch ++
--- a/ModuleCmd_Avail.c.old 2012-08-29 01:06:16.176859774 +0100
+++ b/ModuleCmd_Avail.c 2012-08-29 01:06:52.540527924 +0100
@@ -680,6 +680,7 @@ static int check_cache( char *dir)
static int test_version_dir( struct dirent *dp)
{
+return 0;
}
/*
** ** Function-Header * **
++ share.patch ++
diff -wruN -x '*~' ../orig-modules-3.2.9/configure ./configure
--- ../orig-modules-3.2.9/configure 2011-11-29 16:49:37.0 +0100
+++ ./configure 2012-09-10 10:12:14.088801974 +0200
@@ -1484,9 +1484,9 @@
(tclExtend.h,...) [[none]]
--with-module-path=
use module path=
- [[PREFIX/Modules/modulefiles]]
+ [[PREFIX/share/Modules/modulefiles]]
--with-version-path=
- use version path= [
commit Modules for openSUSE:Factory
Hello community,
here is the log from the commit of package Modules for openSUSE:Factory checked
in at 2011-12-30 08:46:08
Comparing /work/SRC/openSUSE:Factory/Modules (Old)
and /work/SRC/openSUSE:Factory/.Modules.new (New)
Package is "Modules", Maintainer is "mrueck...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2011-11-17
11:04:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2011-12-30
08:46:10.0 +0100
@@ -1,0 +2,5 @@
+Thu Dec 1 11:19:55 UTC 2011 - co...@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
+---
Other differences:
--
++ Modules.spec ++
--- /var/tmp/diff_new_pack.Xch3MG/_old 2011-12-30 08:46:10.0 +0100
+++ /var/tmp/diff_new_pack.Xch3MG/_new 2011-12-30 08:46:10.0 +0100
@@ -15,20 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
-
Name: Modules
+BuildRequires: automake
BuildRequires: tcl-devel
# xorg-x11-devel
Url:http://modules.sourceforge.net/
Version:3.2.8
-Release:216
+Release:0
Summary:Environment Modules
-License:BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later
+License:BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+
Group: System/Management
Requires: tcl
-AutoReqProv:on
Source: modules-%{version}a.tar.bz2
Patch: modules-%{version}.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit Modules for openSUSE:Factory
Hello community,
here is the log from the commit of package Modules for openSUSE:Factory checked
in at 2011-11-17 11:04:50
Comparing /work/SRC/openSUSE:Factory/Modules (Old)
and /work/SRC/openSUSE:Factory/.Modules.new (New)
Package is "Modules", Maintainer is "mrueck...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2011-09-23
01:50:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2011-11-17
11:04:52.0 +0100
@@ -1,0 +2,13 @@
+Tue Oct 18 12:56:41 UTC 2011 - kkae...@suse.com
+
+- move /usr/Modules to /usr/share/Modules for FHS 2.2
+
+---
+Tue Oct 18 09:44:17 UTC 2011 - kkae...@suse.com
+
+- update to 3.2.8a
+ * switched to 3.2 release
+ * lots of changes and bugfixes
+ * see NEWS for details
+
+---
Old:
modules-3.1.6.dif
modules-3.1.6.tar.bz2
modules_tmpfile.patch
New:
modules-3.2.8.patch
modules-3.2.8a.tar.bz2
Other differences:
--
++ Modules.spec ++
--- /var/tmp/diff_new_pack.PhAJDo/_old 2011-11-17 11:04:53.0 +0100
+++ /var/tmp/diff_new_pack.PhAJDo/_new 2011-11-17 11:04:53.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package Modules (Version 3.1.6)
+# spec file for package Modules
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,18 +19,18 @@
Name: Modules
-BuildRequires: tcl-devel xorg-x11-devel
+BuildRequires: tcl-devel
+# xorg-x11-devel
Url:http://modules.sourceforge.net/
-Version:3.1.6
+Version:3.2.8
Release:216
Summary:Environment Modules
License:BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later
Group: System/Management
Requires: tcl
AutoReqProv:on
-Source: modules-%{version}.tar.bz2
-Patch: modules-%{version}.dif
-Patch1: modules_tmpfile.patch
+Source: modules-%{version}a.tar.bz2
+Patch: modules-%{version}.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: environment-modules
Obsoletes: environment-modules
@@ -58,12 +58,11 @@
%prep
%setup -q -n modules-%{version}
-%patch
-%patch1 -p1
+%patch -p1
%build
-#autoreconf --force --install
-autoconf
+aclocal --force -I config
+autoreconf --force --install
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \
--prefix=/usr \
--with-version-path=/usr/share/modules \
@@ -71,30 +70,34 @@
--mandir=%{_mandir} \
--with-etc-path=/etc \
--with-skel-path=/etc/skel \
---with-tcl-libraries=/usr \
+ --with-tcl=%{_libdir} \
--without-x
make
%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/bin
install -d $RPM_BUILD_ROOT/usr/share/modules
install -d $RPM_BUILD_ROOT/etc/profile.d
install -m 644 etc/global/profile.modules
$RPM_BUILD_ROOT/etc/profile.d/modules.sh
install -m 644 etc/global/csh.modules $RPM_BUILD_ROOT/etc/profile.d/modules.csh
make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT/usr/bin/mkroot
+install -d $RPM_BUILD_ROOT/usr/bin
+pushd $RPM_BUILD_ROOT/usr/bin
+ln -s ../share/Modules/%{version}/bin/add.modules .
+ln -s ../share/Modules/%{version}/bin/mkroot .
+ln -s ../share/Modules/%{version}/bin/modulecmd .
+popd
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%doc xref/* ChangeLog LICENSE.GPL PROBLEMS README TODO doc/Modules-Paper.doc
-/usr/bin/modulecmd
+%doc ChangeLog LICENSE.GPL NEWS README TODO
+%dir %{_prefix}/share/Modules
+%{_prefix}/share/Modules/*
%dir /usr/share/modules
/usr/share/modules/*
-/usr/bin/add.modules
+%{_bindir}/*
/etc/profile.d/modules.*
%doc %{_mandir}/man4/*
%doc %{_mandir}/man1/*
++ modules-3.2.8.patch ++
diff -wruN -x '*~' ../orig-modules-3.2.8/configure.ac ./configure.ac
--- ../orig-modules-3.2.8/configure.ac 2010-10-04 17:59:50.0 +0200
+++ ./configure.ac 2011-10-18 14:50:35.0 +0200
@@ -110,10 +110,10 @@
fi
if test "$prefix" != "NONE" ; then
if test "$WANTS_VERSIONING" -eq 1 ; then
-DEFAULTPATH=$prefix/Modules/default
-NODEFAULTPATH=$prefix/Modules/$VERSION
+DEFAULTPATH=$prefix/share/Modules/default
+NODEFAULTPATH=$prefix/share/Modules/$VERSION
BASEPREFIX=$prefix
-prefix=$BASEPREFIX/Modules/$VERSION
+prefix=$BASEPREFIX/share/Modules/$VERSION
ex
