rpm/Modules
SHA256
1
0
Fork 0
forked from pool/Modules
Code Pull Requests Activity

Accepting request 246459 from home:jengelh:branches:systemsmanagement

Browse Source 
- Resolve build failure with automake-1.14

OBS-URL: https://build.opensuse.org/request/show/246459
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/Modules?expand=0&rev=19
This commit is contained in:
Klaus Kämpf 2014-08-26 11:08:49 +00:00 committed by Git OBS Bridge
parent d3917bf621
commit 71dabc222d
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 1 14:50:06 UTC 2013 - max@suse.com Thu Aug 1 14:50:06 UTC 2013 - max@suse.com

30
Modules.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package Modules # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -63,16 +63,31 @@ Authors:
%patch1 -p1 %patch1 -p1
%build %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 aclocal --force -I config
autoreconf --force --install autoreconf --force --install
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE" \ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE" \
./configure \ ./configure \
--prefix=/usr \ --prefix="%_prefix" \
--with-version-path=/usr/share/modules \ --with-version-path="%_datadir/modules" \
--with-module-path=/usr/share/modules/modulefiles \ --with-module-path="%_datadir/modules/modulefiles" \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--with-etc-path=/etc \ --with-etc-path="%_sysconfdir" \
--with-skel-path=/etc/skel \ --with-skel-path="%_sysconfdir/skel" \
--with-tcl=%{_libdir} \ --with-tcl=%{_libdir} \
--without-x --without-x
make make
@ -93,9 +108,6 @@ ln -s ../share/Modules/%{version}/bin/mkroot .
ln -s ../share/Modules/%{version}/bin/modulecmd . ln -s ../share/Modules/%{version}/bin/modulecmd .
popd popd
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc ChangeLog LICENSE.GPL NEWS README TODO %doc ChangeLog LICENSE.GPL NEWS README TODO