update for beta universally

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index 22ef4a9..7b59ce3 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -7,10 +7,10 @@ License:    Apache2.0
 Source0:    cert-svc-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires:   ca-certificates
 
 BuildRequires: cmake
 
-BuildRequires: pkgconfig(dnet)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(openssl)
 
@@ -33,29 +33,58 @@ Certification service  (developement files)
 
 %build
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-
-
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
-
+# make certificate store directory
+mkdir -p %{buildroot}/usr/share/cert-svc/ca-certs/code-signing/java/operator
+mkdir -p %{buildroot}/usr/share/cert-svc/ca-certs/code-signing/java/manufacture
+mkdir -p %{buildroot}/usr/share/cert-svc/ca-certs/code-signing/java/thirdparty
+mkdir -p %{buildroot}/usr/share/cert-svc/ca-certs/code-signing/debian
+mkdir -p %{buildroot}/usr/share/cert-svc/ca-certs/code-signing/wac
+
+mkdir -p %{buildroot}/opt/share/cert-svc/certs/code-signing/java/operator
+mkdir -p %{buildroot}/opt/share/cert-svc/certs/code-signing/java/manufacture
+mkdir -p %{buildroot}/opt/share/cert-svc/certs/code-signing/java/thirdparty
+mkdir -p %{buildroot}/opt/share/cert-svc/certs/code-signing/wac
+mkdir -p %{buildroot}/opt/share/cert-svc/certs/sim/operator
+mkdir -p %{buildroot}/opt/share/cert-svc/certs/sim/thirdparty
+mkdir -p %{buildroot}/opt/share/cert-svc/certs/ssl
+mkdir -p %{buildroot}/opt/share/cert-svc/certs/user
+mkdir -p %{buildroot}/opt/share/cert-svc/certs/trusteduser
+mkdir -p %{buildroot}/opt/share/cert-svc/certs/mdm/security/cert
+
+ln -s /opt/etc/ssl/certs/ %{buildroot}/usr/share/cert-svc/ca-certs/ssl
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root,-)
-/usr/bin/dpkg-pki-sig
+/usr/share/cert-svc/ca-certs/code-signing/java/operator
+/usr/share/cert-svc/ca-certs/code-signing/java/manufacture
+/usr/share/cert-svc/ca-certs/code-signing/java/thirdparty
+/usr/share/cert-svc/ca-certs/code-signing/debian
+/usr/share/cert-svc/ca-certs/code-signing/wac
+/usr/share/cert-svc/ca-certs/ssl
+
+%dir %attr(0775,root,use_cert)/opt/share/cert-svc/certs/code-signing/java/operator
+%dir %attr(0775,root,use_cert)/opt/share/cert-svc/certs/code-signing/java/manufacture
+%dir %attr(0775,root,use_cert)/opt/share/cert-svc/certs/code-signing/java/thirdparty
+%dir %attr(0775,root,use_cert)/opt/share/cert-svc/certs/code-signing/wac
+%dir %attr(0775,root,use_cert)/opt/share/cert-svc/certs/sim/operator
+%dir %attr(0775,root,use_cert)/opt/share/cert-svc/certs/sim/thirdparty
+%dir %attr(0775,root,use_cert)/opt/share/cert-svc/certs/ssl
+%dir %attr(0775,root,use_cert)/opt/share/cert-svc/certs/user
+%dir %attr(0775,root,use_cert)/opt/share/cert-svc/certs/trusteduser
 /opt/share/cert-svc/targetinfo
+/usr/bin/dpkg-pki-sig
 /usr/lib/libcert-svc.so.1
 /usr/lib/libcert-svc.so.1.0.0
 
 %files devel
-%defattr(-,root,root,-)
 /usr/lib/pkgconfig/cert-svc.pc
 /usr/lib/libcert-svc.so
 /usr/include/cert-service.h