[undertaker] Rebuild to fix python dependencies. Drop unnecessary BRs. Ensure correct LDFLAGS.

[Jerry James]

commit 3b96792cb685373996edb9afc3dcaf3012141080
Author: Jerry James <loganjerry at gmail.com>
Date:   Tue Jan 10 08:34:13 2012 -0700

    Rebuild to fix python dependencies.
    Drop unnecessary BRs.
    Ensure correct LDFLAGS.

 undertaker.spec |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/undertaker.spec b/undertaker.spec
index 94f3f63..9e82fd9 100644
--- a/undertaker.spec
+++ b/undertaker.spec
@@ -1,6 +1,6 @@
 Name:           undertaker
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Find always-on and always-off conditional C code
 
 Group:          Development/Languages
@@ -9,12 +9,11 @@ URL:            http://vamos.informatik.uni-erlangen.de/trac/undertaker
 Source0:        http://vamos.informatik.uni-erlangen.de/files/%{name}-%{version}.tar.gz
 
 BuildRequires:  boost-devel
-BuildRequires:  emacs-nox
-BuildRequires:  emacs-el
+BuildRequires:  emacs
 BuildRequires:  ncurses-devel
 BuildRequires:  picosat-devel
 BuildRequires:  python2-devel
-BuildRequires:  xemacs-devel
+BuildRequires:  xemacs
 BuildRequires:  xemacs-packages-extra
 
 # Needed for undertaker-calc-coverage
@@ -77,6 +76,12 @@ sed -i 's|picosat/picosat.h|picosat.h|' undertaker/SatChecker.h
 sed -i "s|^PYTHONPATH=.*|PYTHONPATH=\""%{_python_sitelib}"\"|" \
     rsf2model/undertaker-kconfigdump.in
 
+# Fix a python dependency
+sed 's|env python|python|' undertaker/undertaker-calc-coverage > foo
+chmod a+x foo
+touch -r undertaker/undertaker-calc-coverage foo
+mv -f foo undertaker/undertaker-calc-coverage
+
 # Use the right flags when building and linking
 sed -e "s|-Wall -Wextra -O2|$RPM_OPT_FLAGS|" \
     -e "s|^LDFLAGS =.*|LDFLAGS = $RPM_OPT_FLAGS|" \
@@ -108,11 +113,8 @@ done
 %build
 # FIXME: building with %%{?_smp_mflags} sometimes fails
 make PREFIX=%{_prefix} LIBDIR=%{_libdir} \
-  HOSTCFLAGS="${RPM_OPT_FLAGS}" HOSTCXXFLAGS="${RPM_OPT_FLAGS}"
-
-# Relink one binary to eliminate an unused shared library dependency
-gcc $RPM_OPT_FLAGS -o scripts/kconfig/dumpconf scripts/kconfig/dumpconf.o \
-    scripts/kconfig/zconf.tab.o
+  HOSTCFLAGS="${RPM_OPT_FLAGS}" HOSTCXXFLAGS="${RPM_OPT_FLAGS}" \
+  HOSTLDFLAGS="${RPM_LD_FLAGS} -Wl,--as-needed"
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}
@@ -157,6 +159,11 @@ cd $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
 %{_xemacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Tue Jan 10 2012 Jerry James <loganjerry at gmail.com> - 1.2-4
+- Rebuild to fix python dependencies
+- Drop unnecessary BRs
+- Ensure correct LDFLAGS
+
 * Mon Jan  6 2012 Jerry James <loganjerry at gmail.com> - 1.2-3
 - Rebuild for GCC 4.7