summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libresourceqt.pro2
-rw-r--r--libresourceqt.spec24
-rw-r--r--libresourceqt.yaml29
-rwxr-xr-xtests/test-dbus-qeventloop-runner.sh3
4 files changed, 31 insertions, 27 deletions
diff --git a/libresourceqt.pro b/libresourceqt.pro
index 5df04cd..69f18bb 100644
--- a/libresourceqt.pro
+++ b/libresourceqt.pro
@@ -24,8 +24,6 @@ TEMPLATE = subdirs
SUBDIRS = libdbus-qeventloop \
libresourceqt \
- libmediaoverridesqt \
resourceqt-client \
- mediaoverrider \
tests
diff --git a/libresourceqt.spec b/libresourceqt.spec
index f3297ee..b57d7a9 100644
--- a/libresourceqt.spec
+++ b/libresourceqt.spec
@@ -12,13 +12,15 @@ Release: 1
Group: System/Libraries
License: LGPLv2.1
URL: http://meego.gitorious.org/maemo-multimedia/libresourceqt/
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}.tar.gz
Source100: libresourceqt.yaml
+Requires: libdbus-qeventloop = %{version}-%{release}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(QtCore) >= 4.6.0
BuildRequires: pkgconfig(libresource0)
BuildRequires: pkgconfig(dbus-1)
+BuildRequires: libdbus-qeventloop-devel
%description
@@ -34,20 +36,17 @@ Requires: %{name} = %{version}-%{release}
Description: %{summary}
%package -n libdbus-qeventloop
-Summary: Library that runs the low level D-Bus insie QEventloop
+Summary: Library that runs the low level D-Bus inside QEventloop
Group: System/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libresource
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%description -n libdbus-qeventloop
-This library ennable Qt applications to run the D-Bus low- level api in the Qt Eventloop.
+This library enables Qt applications to run the D-Bus low-level api in the Qt Eventloop.
%package -n libdbus-qeventloop-devel
Summary: Development files for libdbus-qeventloop
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
%description -n libdbus-qeventloop-devel
Description: %{summary}
@@ -64,6 +63,7 @@ Description: %{summary}
Summary: Unit-tests for %{name}
Group: System/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: libdbus-qeventloop = %{version}-%{release}
%description tests
Description: %{summary}
@@ -120,7 +120,7 @@ make INSTALL_ROOT=%{buildroot} install
%files
%defattr(-,root,root,-)
-%{_libdir}/libresource.so.*
+%{_libdir}/libresourceqt.so.*
# >> files
# << files
@@ -136,16 +136,16 @@ make INSTALL_ROOT=%{buildroot} install
%files -n libdbus-qeventloop
%defattr(-,root,root,-)
%{_libdir}/libdbus-qeventloop.so.*
-# >> files -n libdbus-qeventloop
-# << files -n libdbus-qeventloop
+# >> files libdbus-qeventloop
+# << files libdbus-qeventloop
%files -n libdbus-qeventloop-devel
%defattr(-,root,root,-)
%{_includedir}/dbusconnectioneventloop.h
%{_libdir}/libdbus-qeventloop.so
%{_libdir}/pkgconfig/libdbus-qeventloop1.pc
-# >> files -n libdbus-qeventloop-devel
-# << files -n libdbus-qeventloop-devel
+# >> files libdbus-qeventloop-devel
+# << files libdbus-qeventloop-devel
%files client
%defattr(-,root,root,-)
@@ -157,7 +157,7 @@ make INSTALL_ROOT=%{buildroot} install
%defattr(-,root,root,-)
%{_libdir}/libresourceqt-tests/*
%{_datadir}/%{name}-tests/tests.xml
-%{_sysconfdir}/dbus-1/system.d/test-dbus-qeventloop.conf
+%config %{_sysconfdir}/dbus-1/system.d/test-dbus-qeventloop.conf
# >> files tests
# << files tests
diff --git a/libresourceqt.yaml b/libresourceqt.yaml
index ddf6797..41b90ed 100644
--- a/libresourceqt.yaml
+++ b/libresourceqt.yaml
@@ -6,19 +6,22 @@ Group: System/Libraries
License: LGPLv2.1
URL: http://meego.gitorious.org/maemo-multimedia/libresourceqt/
Sources:
- - "%{name}-%{version}.tar.bz2"
+ - "%{name}-%{version}.tar.gz"
Description: Qt library for Resource Policy.
-
+Requires:
+ - libdbus-qeventloop = %{version}-%{release}
PkgConfigBR:
- QtCore >= 4.6.0
- libresource0
- dbus-1
+PkgBR:
+ - libdbus-qeventloop-devel
Configure: none
Builder: none
Files:
- - "%{_libdir}/libresource.so.*"
+ - "%{_libdir}/libresourceqt.so.*"
SubPackages:
-
@@ -30,23 +33,25 @@ SubPackages:
- "%{_libdir}/pkgconfig/libresourceqt1.pc"
Group: Development/Libraries
-
- Name: -n libdbus-qeventloop
- Summary: Library that runs the low level D-Bus insie QEventloop
- Requires:
- - libresource
+ Name: libdbus-qeventloop
+ Summary: Library that runs the low level D-Bus inside QEventloop
Files:
- "%{_libdir}/libdbus-qeventloop.so.*"
Group: System/Libraries
- Description: This library ennable Qt applications to run the D-Bus low-
- level api in the Qt Eventloop.
+ Description: This library enables Qt applications to run the D-Bus
+ low-level api in the Qt Eventloop.
+ AsWholeName: yes
+ AutoDepend: no
-
- Name: -n libdbus-qeventloop-devel
+ Name: libdbus-qeventloop-devel
Summary: Development files for libdbus-qeventloop
Files:
- "%{_includedir}/dbusconnectioneventloop.h"
- "%{_libdir}/libdbus-qeventloop.so"
- "%{_libdir}/pkgconfig/libdbus-qeventloop1.pc"
Group: Development/Libraries
+ AsWholeName: yes
+ AutoDepend: no
-
Name: client
Summary: Test client to test %{name}
@@ -59,6 +64,8 @@ SubPackages:
Files:
- "%{_libdir}/libresourceqt-tests/*"
- "%{_datadir}/%{name}-tests/tests.xml"
- - "%{_sysconfdir}/dbus-1/system.d/test-dbus-qeventloop.conf"
+ - "%config %{_sysconfdir}/dbus-1/system.d/test-dbus-qeventloop.conf"
Group: System/Libraries
+ Requires:
+ - libdbus-qeventloop = %{version}-%{release}
diff --git a/tests/test-dbus-qeventloop-runner.sh b/tests/test-dbus-qeventloop-runner.sh
index 1f9d09a..d3299b2 100755
--- a/tests/test-dbus-qeventloop-runner.sh
+++ b/tests/test-dbus-qeventloop-runner.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
##############################################################################
# This file is part of libresourceqt #
# #
@@ -19,8 +20,6 @@
# USA. #
##############################################################################
-#!/bin/sh
-
# Source and export D-Bus session info
. /tmp/session_bus_address.user