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 "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2011-09-23 01:50:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2011-11-17 11:04:52.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Oct 18 12:56:41 UTC 2011 - [email protected] + +- move /usr/Modules to /usr/share/Modules for FHS 2.2 + +------------------------------------------------------------------- +Tue Oct 18 09:44:17 UTC 2011 - [email protected] + +- 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.000000000 +0100 +++ /var/tmp/diff_new_pack.PhAJDo/_new 2011-11-17 11:04:53.000000000 +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.000000000 +0200 +++ ./configure.ac 2011-10-18 14:50:35.000000000 +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 export prefix else DEFAULTPATH=$prefix/Modules @@ -125,10 +125,10 @@ PREFIX=$prefix else if test "$WANTS_VERSIONING" -eq 1 ; then - DEFAULTPATH=$ac_default_prefix/Modules/default - NODEFAULTPATH=$ac_default_prefix/Modules/$VERSION + DEFAULTPATH=$ac_default_prefix/share/Modules/default + NODEFAULTPATH=$ac_default_prefix/share/Modules/$VERSION BASEPREFIX=$ac_default_prefix - ac_default_prefix=$BASEPREFIX/Modules/$VERSION + ac_default_prefix=$BASEPREFIX/share/Modules/$VERSION export ac_default_prefix else DEFAULTPATH=$ac_default_prefix/Modules diff -wruN -x '*~' ../orig-modules-3.2.8/ModuleCmd_Avail.c ./ModuleCmd_Avail.c --- ../orig-modules-3.2.8/ModuleCmd_Avail.c 2010-07-27 21:09:05.000000000 +0200 +++ ./ModuleCmd_Avail.c 2011-10-18 12:21:15.000000000 +0200 @@ -680,6 +680,7 @@ static int test_version_dir( struct dirent *dp) { + return 0; } /*++++ ** ** Function-Header ***************************************************** ** ++++++ modules-3.1.6.tar.bz2 -> modules-3.2.8a.tar.bz2 ++++++ ++++ 77682 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
