packages: filesystem/filesystem.spec - rel 26; merge debuginfo subpkg back

[arekm]

Author: arekm                        Date: Thu Aug 27 12:45:04 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 26; merge debuginfo subpkg back

---- Files affected:
packages/filesystem:
   filesystem.spec (1.98 -> 1.99) 

---- Diffs:

================================================================
Index: packages/filesystem/filesystem.spec
diff -u packages/filesystem/filesystem.spec:1.98 packages/filesystem/filesystem.spec:1.99
--- packages/filesystem/filesystem.spec:1.98	Mon Jun 29 00:46:09 2009
+++ packages/filesystem/filesystem.spec	Thu Aug 27 14:44:58 2009
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_without	debuginfo	# build without debuginfo package
 
 # disable rpm generated debug package, we handle it differently here
 %define		_enable_debug_packages	0
@@ -12,7 +9,7 @@
 Summary(pl.UTF-8):	Wspólne katalogi
 Name:		filesystem
 Version:	3.0
-Release:	25
+Release:	26
 License:	GPL
 Group:		Base
 BuildRequires:	automake
@@ -31,6 +28,7 @@
 %ifarch sparc64
 Provides:	browser-plugins(sparc)
 %endif
+Obsoletes:	filesystem-debuginfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # directory for "privilege separation" chroot
@@ -46,18 +44,6 @@
 Ten pakiet zawiera wspólne katalogi dla pakietów rozszerzających
 funkcjonalność programów, ale nie wymagających ich.
 
-%package debuginfo
-Summary:	Common directories for debug information
-Summary(pl.UTF-8):	Wspólne katalogi dla plików z informacjami dla debuggera
-Group:		Development/Debug
-
-%description debuginfo
-This package provides common directories for debug information.
-
-%description debuginfo -l pl.UTF-8
-Ten pakiet udostępnia wspólne katalogi dla plików z informacjami dla
-debuggera.
-
 %prep
 %setup -qcT
 
@@ -86,7 +72,6 @@
 	$RPM_BUILD_ROOT/usr/lib64/initrd
 %endif
 
-%if %{with debuginfo}
 install -d \
 	$RPM_BUILD_ROOT/usr/lib/debug/%{_lib} \
 	$RPM_BUILD_ROOT/usr/lib/debug%{_libdir} \
@@ -103,7 +88,6 @@
 find $RPM_BUILD_ROOT/usr/lib/debug -type d | while read line; do
 	echo ${line#$RPM_BUILD_ROOT}
 done > $RPM_BUILD_ROOT/usr/src/debug/%{name}-debuginfo.files
-%endif
 
 # create this for %clean
 tar -cf checkfiles.tar -C $RPM_BUILD_ROOT .
@@ -184,15 +168,12 @@
 %dir /usr/lib64/pkgconfig
 %endif
 
-%if %{with debuginfo}
-%files debuginfo
-%defattr(644,root,root,755)
+# debuginfo
 %dir /usr/lib/debug
 /usr/lib/debug/*
 
 %dir /usr/src/debug
 /usr/src/debug/filesystem-debuginfo.files
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -200,6 +181,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.99  2009/08/27 12:44:58  arekm
+- rel 26; merge debuginfo subpkg back
+
 Revision 1.98  2009/06/28 22:46:09  patrys
 - add missing dir creation
 - rel 25
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/filesystem/filesystem.spec?r1=1.98&r2=1.99&f=u