[libbluedevil/f18] fixup the failed merge

Lukas Tinkl ltinkl at fedoraproject.org
Wed Sep 4 16:07:40 UTC 2013


commit fd3ea197abeb7b06fa3c9667f3362b8bc23a0e36
Author: Lukáš Tinkl <lukas at kde.org>
Date:   Wed Sep 4 18:07:11 2013 +0200

    fixup the failed merge

 libbluedevil.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/libbluedevil.spec b/libbluedevil.spec
index 4f0b4c1..1e698da 100644
--- a/libbluedevil.spec
+++ b/libbluedevil.spec
@@ -1,6 +1,4 @@
 
-%define snap 20130323
-
 Name:           libbluedevil
 Version:        1.9.4
 Release:        1%{?dist}
@@ -26,7 +24,7 @@ BuildRequires:  qt4-devel
 BuildRequires:  automoc4
 BuildRequires:  cmake
 
-Requires:       bluez >= 5
+Requires:       bluez
 
 %description
 %{name} is Qt-based library written handle all Bluetooth functionality.
@@ -54,16 +52,23 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
+rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
+%clean
+rm -rf %{buildroot}
+
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%{_libdir}/libbluedevil.so.2*
+%defattr(-,root,root,-)
+%{_libdir}/libbluedevil.so.1*
 
 %files devel
+%defattr(-,root,root,-)
 %doc HACKING
 %{_includedir}/bluedevil/
 %{_libdir}/libbluedevil.so


More information about the scm-commits mailing list