SPECS: filesystem.spec - add /etc/pki - always build -debuginfo su...

glen glen at pld-linux.org
Tue Mar 25 10:59:07 CET 2008


Author: glen                         Date: Tue Mar 25 09:59:07 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add /etc/pki
- always build -debuginfo subpkg
- rel 18

---- Files affected:
SPECS:
   filesystem.spec (1.87 -> 1.88) 

---- Diffs:

================================================================
Index: SPECS/filesystem.spec
diff -u SPECS/filesystem.spec:1.87 SPECS/filesystem.spec:1.88
--- SPECS/filesystem.spec:1.87	Wed Feb 20 19:07:41 2008
+++ SPECS/filesystem.spec	Tue Mar 25 10:59:02 2008
@@ -3,12 +3,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
@@ -17,7 +12,7 @@
 Summary(pl.UTF-8):	Wspólne katalogi
 Name:		filesystem
 Version:	3.0
-Release:	17
+Release:	18
 License:	GPL
 Group:		Base
 BuildRequires:	automake
@@ -72,7 +67,7 @@
 
 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 \
@@ -141,6 +136,7 @@
 %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
@@ -197,6 +193,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2008-03-25 09:59:02  glen
+- add /etc/pki
+- always build -debuginfo subpkg
+- rel 18
+
 Revision 1.87  2008-02-20 18:07:41  glen
 - revert ghost /initrd on HEAD too; rel 17
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/filesystem.spec?r1=1.87&r2=1.88&f=u



More information about the pld-cvs-commit mailing list