[libopensync] 1:0.22-10 fix ftbfs (rhbz#716135) fix rpath

[Andreas Bierfert]

commit 339ef5ff477d60e102461ec4915a5193ca7d2e6e
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Fri Jul 1 10:00:00 2011 +0200

    1:0.22-10
    fix ftbfs (rhbz#716135)
    fix rpath

 libopensync.spec |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/libopensync.spec b/libopensync.spec
index 2936268..a1f072b 100644
--- a/libopensync.spec
+++ b/libopensync.spec
@@ -2,15 +2,15 @@
 Name:           libopensync
 Epoch:          1
 Version:        0.22
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensync.org/
 Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
-Patch0:		libopensync-wrapper-err.patch
-Patch1:		libopensync-0.22-unusedvar.patch
+Patch0:         libopensync-wrapper-err.patch
+Patch1:         libopensync-0.22-unusedvar.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -20,6 +20,7 @@ BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
 BuildRequires:  doxygen
+BuildRequires:  chrpath
 
 # For now (workaround for SWIG major-version bump)
 BuildRequires:  autoconf
@@ -64,9 +65,8 @@ find . -type f -name *.c -exec chmod 644 {} \;
 find . -type f -name *.h -exec chmod 644 {} \;
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS -Wno-error"
 %configure --disable-static
-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
 make %{?_smp_mflags}
 
 doxygen Doxyfile
@@ -82,6 +82,13 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/opensync
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync/formats
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync/{python-,}plugins
 
+# remove rpath
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/osync*
+chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/osplugin
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libosengine.so.*
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/opensync/formats/*so
+chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/_opensync.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -112,6 +119,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jul 01 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1:0.22-10
+- fix ftbfs (rhbz#716135)
+- fix rpath
+
 * Tue Feb 22 2011 Karsten Hopp <karsten at redhat.com> 0.22-9
 - fix failure with -Werror=unused-but-set-variable, libopensync-0.22-unusedvar.patch