- add /etc/pki

- always build -debuginfo subpkg
- rel 18

Changed files:
    filesystem.spec -> 1.88

diff --git a/filesystem.spec b/filesystem.spec
index 9256698f28c6e7ed0f2655498a6b5d78d7f73cf2..bd1d273b8823f1a73b4bb0db0f739ef0c095a0f3 100644 (file)
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -2,12 +2,7 @@
 # Conditional build:
 %bcond_without debuginfo       # build without debuginfo package
 
-# disable bcond if debuginfo is disabled from rpmmacros
-%if %{expand:%%define __sip_%{?_enable_debug_packages} 1}0%{?__sip_0:1}%{expand:%%undefine __sip_%{?_enable_debug_packages}}
-%undefine      with_debuginfo
-%endif
-
-# disable rpm generated debug package in any way
+# disable rpm generated debug package, we handle it differently here
 %define                _enable_debug_packages  0
 
 # avoid rpm 4.4.9 adding rm -rf buildroot
@@ -16,7 +11,7 @@ Summary:      Common directories
 Summary(pl.UTF-8):     Wspólne katalogi
 Name:          filesystem
 Version:       3.0
-Release:       17
+Release:       18
 License:       GPL
 Group:         Base
 BuildRequires: automake
@@ -71,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d \
        $RPM_BUILD_ROOT/{initrd,selinux,sys} \
-       $RPM_BUILD_ROOT/etc/{X11/xinit/xinitrc.d,certs,security,sysconfig/wmstyle,xdg/autostart} \
+       $RPM_BUILD_ROOT/etc/{pki,X11/xinit/xinitrc.d,certs,security,sysconfig/wmstyle,xdg/autostart} \
        $RPM_BUILD_ROOT/home/{users,services} \
        $RPM_BUILD_ROOT/lib/{firmware,security} \
        $RPM_BUILD_ROOT/usr/include/security \
@@ -140,6 +135,7 @@ check_filesystem_dirs
 %attr(751,root,root) %dir /etc/security
 %dir /etc/sysconfig
 %dir /etc/sysconfig/wmstyle
+%dir /etc/pki
 %dir /etc/xdg
 %dir /etc/xdg/autostart
 %dir /home/users