X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=filesystem.spec;h=e07d7e3be8f79db20e31875d98f27a1f09e0a5ca;hb=c09a789cd404d37f9987104201aef0ade47d8be3;hp=9256698f28c6e7ed0f2655498a6b5d78d7f73cf2;hpb=7bee3fbe166565914b69ca0ee725600bbea5897d;p=packages%2Ffilesystem.git

diff --git a/filesystem.spec b/filesystem.spec
index 9256698..e07d7e3 100644
--- 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:	25
 License:	GPL
 Group:		Base
 BuildRequires:	automake
@@ -54,7 +49,6 @@ funkcjonalność programów, ale nie wymagających ich.
 Summary:	Common directories for debug information
 Summary(pl.UTF-8):	Wspólne katalogi dla plików z informacjami dla debuggera
 Group:		Development/Debug
-Requires:	%{name} = %{version}-%{release}
 
 %description debuginfo
 This package provides common directories for debug information.
@@ -71,12 +65,12 @@ 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,default,logrotate.d,security,sysconfig/wmstyle,tmpwatch,xdg/autostart} \
 	$RPM_BUILD_ROOT/home/{users,services} \
 	$RPM_BUILD_ROOT/lib/{firmware,security} \
 	$RPM_BUILD_ROOT/usr/include/security \
-	$RPM_BUILD_ROOT/usr/lib/{cgi-bin,browser-plugins,pkgconfig} \
-	$RPM_BUILD_ROOT/usr/share/{gnome/help,man/man{n,l},man/pl/mann,pkgconfig,sounds,themes/Default,wallpapers,wm-properties,xsessions} \
+	$RPM_BUILD_ROOT/usr/lib/{cgi-bin,browser-plugins,pkgconfig,initrd,ConsoleKit/run-session.d} \
+	$RPM_BUILD_ROOT/usr/share/{gnome/{help,wm-properties},man/man{n,l},man/pl/mann,pkgconfig,sounds,themes/Default,wallpapers,xsessions} \
 	$RPM_BUILD_ROOT/usr/src/examples \
 	$RPM_BUILD_ROOT/var/lock/subsys \
 	$RPM_BUILD_ROOT{%{_aclocaldir},%{_desktopdir}/docklets,%{_iconsdir},%{_pixmapsdir}} \
@@ -87,7 +81,8 @@ install -d \
 install -d \
 	$RPM_BUILD_ROOT/lib64/security \
 	$RPM_BUILD_ROOT/usr/lib64/pkgconfig \
-	$RPM_BUILD_ROOT/usr/lib64/browser-plugins
+	$RPM_BUILD_ROOT/usr/lib64/browser-plugins \
+	$RPM_BUILD_ROOT/usr/lib64/initrd
 %endif
 
 %if %{with debuginfo}
@@ -125,7 +120,7 @@ check_filesystem_dirs() {
 	find | sed -e 's|^\.||g' -e 's|^$||g' | LC_ALL=C sort | grep -v $TMPFILE | grep -E -v '^/(etc|etc/X11|home|lib|lib64|usr|usr/include|usr/lib|usr/lib64|usr/share|usr/share/man|usr/share/man/pl|usr/src|var|var/lock)$' > $TMPFILE
 
 	# find finds also '.', so use option -B for diff
-	rpm -qpl $RPMFILE $RPMFILE2 | grep -v '^/$' | LC_ALL=C sort | diff -uB $TMPFILE - || :
+	rpm -qpl $RPMFILE $RPMFILE2 | grep -v '^/$' | LC_ALL=C sort | diff -uB - $TMPFILE || :
 
 	rm -f $TMPFILE
 }
@@ -137,9 +132,13 @@ check_filesystem_dirs
 %dir /etc/X11/xinit
 %dir /etc/X11/xinit/xinitrc.d
 %attr(751,root,root) %dir /etc/certs
+%dir /etc/default
 %attr(751,root,root) %dir /etc/security
+%dir /etc/logrotate.d
 %dir /etc/sysconfig
 %dir /etc/sysconfig/wmstyle
+%dir /etc/tmpwatch
+%dir /etc/pki
 %dir /etc/xdg
 %dir /etc/xdg/autostart
 %dir /home/users
@@ -150,11 +149,15 @@ check_filesystem_dirs
 %dir /selinux
 %dir /sys
 %dir /usr/include/security
+%dir /usr/lib/ConsoleKit
+%dir /usr/lib/ConsoleKit/run-session.d
 %dir /usr/lib/browser-plugins
 %dir /usr/lib/cgi-bin
+%dir /usr/lib/initrd
 %dir /usr/lib/pkgconfig
 %dir /usr/share/gnome
 %dir /usr/share/gnome/help
+%dir /usr/share/gnome/wm-properties
 %dir /usr/share/man/man[nl]
 %lang(pl) %dir /usr/share/man/pl/mann
 %dir /usr/share/pkgconfig
@@ -162,7 +165,6 @@ check_filesystem_dirs
 %dir /usr/share/themes
 %dir /usr/share/themes/Default
 %dir /usr/share/wallpapers
-%dir /usr/share/wm-properties
 %dir /usr/share/xsessions
 %dir /usr/src/examples
 %attr(700,root,root) %dir /var/lock/subsys
@@ -176,8 +178,9 @@ check_filesystem_dirs
 %dir %{_privsepdir}
 %if "%{_lib}" == "lib64"
 %dir /lib64/security
-%dir /usr/lib64/pkgconfig
 %dir /usr/lib64/browser-plugins
+%dir /usr/lib64/initrd
+%dir /usr/lib64/pkgconfig
 %endif
 
 %if %{with debuginfo}