F-24: fix FTBFS (variable expansion: perhaps due to bash behavior change)

epel9
Mamoru TASAKA 9 years ago
parent c016aed4a8
commit 6eb4811824

@ -1,6 +1,6 @@
Name: libindicator
Version: 12.10.1
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Shared functions for Ayatana indicators
Group: System Environment/Libraries
@ -17,6 +17,7 @@ BuildRequires: dbus-glib-devel
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
BuildRequires: gnome-common
%description
A set of symbols and convenience functions that all Ayatana indicators are
@ -83,6 +84,28 @@ tools for the GTK+3 build of %{name}.
%prep
%setup -q
sed -i.addvar configure.ac \
-e '\@LIBINDICATOR_LIBS@s|\$LIBM| \$LIBM|'
# http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/trunk.12.10/view/head:/autogen.sh
cat > autogen.sh <<EOF
#!/bin/sh
PKG_NAME="libindicator"
which gnome-autogen.sh || {
echo "You need gnome-common from GNOME SVN"
exit 1
}
USE_GNOME2_MACROS=1 \
. gnome-autogen.sh
EOF
NOCONFIGURE=1 \
sh autogen.sh
%build
%global _configure ../configure
rm -rf build-gtk2 build-gtk3
@ -90,7 +113,7 @@ mkdir build-gtk2 build-gtk3
pushd build-gtk2
export CFLAGS="%{optflags} -Wno-error=deprecated-declarations"
%configure --with-gtk=2 --disable-static
%configure --with-gtk=2 --disable-static --disable-silent-rules
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@ -99,7 +122,7 @@ popd
pushd build-gtk3
export CFLAGS="%{optflags} -Wno-error=deprecated-declarations"
%configure --with-gtk=3 --disable-static
%configure --with-gtk=3 --disable-static --disable-silent-rules
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@ -170,6 +193,9 @@ find %{buildroot} -type f -name '*.la' -delete
%{_libexecdir}/indicator-loader3
%changelog
* Thu Feb 4 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 12.10.1-7
- F-24: fix FTBFS (variable expansion: perhaps due to bash behavior change)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

Loading…
Cancel
Save