[compat-telepathy-farstream] drop Conflicts, make truly parallel-installable
Rex Dieter
rdieter at fedoraproject.org
Wed Oct 31 20:17:50 UTC 2012
commit 362c38cb84063322e8b26228da2bf7ee9eac630a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Oct 31 15:17:53 2012 -0500
drop Conflicts, make truly parallel-installable
compat-telepathy-farstream.spec | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/compat-telepathy-farstream.spec b/compat-telepathy-farstream.spec
index 15bf127..66fbdac 100644
--- a/compat-telepathy-farstream.spec
+++ b/compat-telepathy-farstream.spec
@@ -1,7 +1,7 @@
Name: compat-telepathy-farstream
Version: 0.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Telepathy client library to handle Call channels
License: LGPLv2+
@@ -38,12 +38,24 @@ developing applications that use %{name}.
--disable-python \
--disable-gtk-doc-html
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
%install
make install DESTDIR=%{buildroot}
+# HACK to make parallel-installable
+mv %{buildroot}%{_includedir}/telepathy-1.0 \
+ %{buildroot}%{_includedir}/telepathy-1.0-compat
+mv %{buildroot}%{_libdir}/libtelepathy-farstream.so \
+ %{buildroot}%{_libdir}/libtelepathy-farstream-0.4.so
+mv %{buildroot}%{_libdir}/pkgconfig/telepathy-farstream.pc \
+ %{buildroot}%{_libdir}/pkgconfig/telepathy-farstream-0.4.pc
+sed -i \
+ -e 's|-ltelepathy-farstream|-ltelepathy-farstream-0.4|' \
+ -e 's|-I${includedir}/telepathy-1.0|-I${includedir}/telepathy-1.0-compat|' \
+ %{buildroot}%{_libdir}/pkgconfig/telepathy-farstream-0.4.pc
+
## unpackaged files
rm -fv %{buildroot}%{_libdir}/lib*.la
rm -rfv %{buildroot}%{_datadir}/gtk-doc/
@@ -57,12 +69,16 @@ rm -rfv %{buildroot}%{_datadir}/gtk-doc/
%{_libdir}/libtelepathy-farstream.so.2*
%files devel
-%{_libdir}/libtelepathy-farstream.so
-%{_libdir}/pkgconfig/telepathy-farstream.pc
-%{_includedir}/telepathy-1.0/telepathy-farstream/
+%{_libdir}/libtelepathy-farstream-0.4.so
+%{_libdir}/pkgconfig/telepathy-farstream-0.4.pc
+%dir %{_includedir}/telepathy-1.0-compat
+%{_includedir}/telepathy-1.0-compat/telepathy-farstream/
%changelog
+* Wed Oct 31 2012 Rex Dieter <rdieter at fedoraproject.org> 0.4.0-4
+- drop Conflicts, make truly parallel-installable
+
* Fri Oct 05 2012 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-3
- compat telepathy-farstream-0.4 pkg
More information about the scm-commits
mailing list