[telepathy-ring] Improve packaging a bit.

2 files changed, 16 insertions, 5 deletions

diff --git a/rpm/telepathy-ring.spec b/rpm/telepathy-ring.spec
index cbe55e4..2361405 100644
--- a/rpm/telepathy-ring.spec
+++ b/rpm/telepathy-ring.spec
@@ -51,7 +51,7 @@ Requires:   %{name} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}
 
 # >> setup
 # << setup
@@ -79,23 +79,23 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-# >> files
 %{_datadir}/dbus-1/services/*
 %{_datadir}/telepathy/managers/*
 %{_libexecdir}/*
 %{_libdir}/mission-control-plugins.0/mcp-account-manager-ring.so
 %doc %{_mandir}/man8/telepathy-ring.8.gz
+# >> files
 # << files
 
 %files tests
 %defattr(-,root,root,-)
-# >> files tests
 %{_libdir}/tests/*
+# >> files tests
 # << files tests
 
 %files devel
 %defattr(-,root,root,-)
-# >> files devel
 %{_libdir}/*.a
 %{_includedir}/*
+# >> files devel
 # << files devel
diff --git a/rpm/telepathy-ring.yaml b/rpm/telepathy-ring.yaml
index 3546bf1..11b9fcd 100644
--- a/rpm/telepathy-ring.yaml
+++ b/rpm/telepathy-ring.yaml
@@ -26,14 +26,25 @@ PkgConfigBR:
     - mission-control-plugins
 Configure: reconfigure
 Builder: make
+Files:
+    - "%{_datadir}/dbus-1/services/*"
+    - "%{_datadir}/telepathy/managers/*"
+    - "%{_libexecdir}/*"
+    - "%{_libdir}/mission-control-plugins.0/mcp-account-manager-ring.so"
+    - "%doc %{_mandir}/man8/telepathy-ring.8.gz"
+
 SubPackages:
     - Name: tests
       Summary: Tests for %{name}
       Group: System/Libraries
       Description: "%{summary}."
+      Files:
+        - "%{_libdir}/tests/*"
 
     - Name: devel
       Summary: Development files for %{name}
       Group: Development/Libraries
       Description: "%{summary}."
-
+      Files:
+        - "%{_libdir}/*.a"
+        - "%{_includedir}/*"