Accepting request 81534 from GNOME:Factory

Pushing most of G:F

OBS-URL: https://build.opensuse.org/request/show/81534
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/p11-kit?expand=0&rev=3

p11-kit.spec

@@ -18,7 +18,7 @@
 
 
 Name:           p11-kit
-Version:        0.3
+Version:        0.5
 Release:        1
 Summary:        Library to work with PKCS#11 modules
 License:        BSD3c
@@ -77,6 +77,10 @@ make %{?_smp_mflags}
 # Create pkcs11 config directory
 test ! -e %{buildroot}%{_sysconfdir}/pkcs11/modules
 install -d %{buildroot}%{_sysconfdir}/pkcs11/modules
+# Remove sample config away to doc folder. Having the sample there would conflict
+# with future versions of the library on file level. As replacement, we package
+# the file as documentation file.
+rm %{buildroot}%{_sysconfdir}/pkcs11/pkcs11.conf.example
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 
 %clean
@@ -88,8 +92,11 @@ rm -rf %{buildroot}
 
 %files -n libp11-kit0
 %defattr(-,root,root)
+# Package the example conf file as documentation. Like this we're sure that we will
+# not introduce conflicts with this version of the library and future ones.
+%doc p11-kit/pkcs11.conf.example
 %doc AUTHORS ChangeLog COPYING NEWS README
-%dir %{_sysconfdir}/pkcs11/
+%dir %{_sysconfdir}/pkcs11
 %dir %{_sysconfdir}/pkcs11/modules/
 %{_libdir}/libp11-kit.so.*
 %{_libdir}/p11-kit-proxy.so