Reset to default manifests and remove chsmack from spec file.

diff --git a/print-driver-data.manifest b/packaging/print-driver-data.manifest
similarity index 100%
rename from print-driver-data.manifest
rename to packaging/print-driver-data.manifest

diff --git a/packaging/print-service-tests.manifest b/packaging/print-service-tests.manifest
new file mode 100644 (file)
index 0000000..97e8c31
--- /dev/null
+++ b/packaging/print-service-tests.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>

diff --git a/packaging/print-service.manifest b/packaging/print-service.manifest
new file mode 100644 (file)
index 0000000..97e8c31
--- /dev/null
+++ b/packaging/print-service.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>

diff --git a/packaging/print-service.spec b/packaging/print-service.spec
index 05e703e..280c1f0 100755 (executable)
--- a/packaging/print-service.spec
+++ b/packaging/print-service.spec
@@ -7,6 +7,9 @@ Release:    1
 Group:      System/Libraries
 License:    Flora Software License
 Source0:    %{name}-%{version}.tar.gz
+Source1001: print-service.manifest
+Source1002: print-driver-data.manifest
+Source1003: print-service-tests.manifest 
 BuildRequires: cmake
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(eina)
@@ -54,6 +57,9 @@ Set of utilities for testing different parts of library
 %setup -q
 
 %build
+cp %{SOURCE1001} .
+cp %{SOURCE1002} .
+cp %{SOURCE1003} .
 %cmake . -DENABLE_OM_TESTS=On
 
 %install
@@ -83,18 +89,6 @@ then
 fi
 chown -R 5000:5000 /opt/etc/cups/ppd
 
-if [ -f /usr/lib/rpm-plugins/msm.so ]
-then
-       chsmack -a mobileprint /opt/etc/cups/ppd/
-       chsmack -a mobileprint /opt/etc/cups/ppd/hp
-       chsmack -a mobileprint /opt/etc/cups/ppd/epson
-       chsmack -a mobileprint /opt/etc/cups/ppd/samsung
-       chsmack -t /opt/etc/cups/ppd
-       chsmack -t /opt/etc/cups/ppd/hp
-       chsmack -t /opt/etc/cups/ppd/epson
-       chsmack -t /opt/etc/cups/ppd/samsung
-fi
-
 %post -n print-driver-data
 mkdir -p /usr/share/cups/model/samsung
 ln -sf /usr/share/cups/ppd/samsung/cms /usr/share/cups/model/samsung/cms
@@ -146,6 +140,7 @@ fi
 %exclude %{DATADIR}/etc/cups/ppd/samsung.list
 
 %files -n print-service-tests
+%manifest print-service-tests.manifest
 %defattr(-,root,root,-)
 %{_bindir}/getppdvalue
 %attr(0755,root,root) %{_bindir}/ppd_test.sh

diff --git a/print-service.manifest b/print-service.manifest
deleted file mode 100644 (file)
index 95577a0..0000000
--- a/print-service.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-<manifest>
-       <assign>
-               <filesystem path="/usr/lib/libprint-service.so" label="_" exec_label="_" />
-               <filesystem path="/usr/lib/libprint-service.so.1" label="_" exec_label="_" />
-               <filesystem path="/usr/lib/libprint-service.so.1.0.1" label="_" exec_label="_" />
-       </assign>
-       <request>
-               <domain name="mobileprint"/>
-       </request>
-</manifest>