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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2014-08-29 17:42:27.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 26 10:50:58 UTC 2014 - jengelh@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.000000000 +0200 +++ /var/tmp/diff_new_pack.i5t0ms/_new 2014-08-29 17:42:28.000000000 +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+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de