SPECS (AC-branch): filesystem.spec - AC-branch started

Wed Sep 6 00:37:21 CEST 2006

Author: glen                         Date: Tue Sep  5 22:37:21 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- AC-branch started

---- Files affected:
SPECS:
   filesystem.spec (1.68 -> 1.68.2.1) 

---- Diffs:

================================================================
Index: SPECS/filesystem.spec
diff -u SPECS/filesystem.spec:1.68 SPECS/filesystem.spec:1.68.2.1

--- SPECS/filesystem.spec:1.68	Fri Sep  1 23:40:13 2006
+++ SPECS/filesystem.spec	Wed Sep  6 00:37:16 2006
@@ -1,20 +1,26 @@
 # $Revision$, $Date$
+# TODO
+# - move here from FHS.spec all dirs not covered by FHS, update descs
+# - cnfl /usr/share/pkgconfig, /usr/lib/pkgconfig
+# - cnfl /usr/share/aclocal
+# - cnfl /etc/X11/xinit
+# - cnfl /usr/share/gnome, /usr/share/gnome/help
+# - cnfl /usr/share/applications/docklets
+# - cnfl /etc/sysconfig/wmstyle
+# - cnfl /usr/share/xsessions ?
 #
-# TODO: move here from FHS.spec all dirs not covered by FHS, update descs
-#
-
-%define		_enable_debug_packages	0
-
 Summary:	Common directories
 Summary(pl):	Wspólne katalogi
 Name:		filesystem
-Version:	3.0
-Release:	10
+Version:	2.0
+Release:	0.1
 License:	GPL
 Group:		Base
 Requires:	FHS >= 2.3-14.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_xmandir	/usr/X11R6/man
+
 %description
 This package contains common directories for packages that extend
 some programs functionality, but don't require them themselves.
@@ -23,19 +29,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):	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.
-
-%description debuginfo -l pl
-Ten pakiet udostępnia wspólne katalogi dla plików z informacjami dla
-debuggera.
-
 %prep
 
 %install
@@ -43,8 +36,6 @@
 
 install -d $RPM_BUILD_ROOT/etc/{sysconfig,xdg/autostart} \
 	$RPM_BUILD_ROOT%{_prefix}/share/{gnome/help,icons,pixmaps,pkgconfig,sounds,themes/Default,wallpapers,wm-properties,xsessions} \
-	$RPM_BUILD_ROOT%{_prefix}/lib/debug \
-	$RPM_BUILD_ROOT%{_usrsrc}/debug \
 	$RPM_BUILD_ROOT{%{_aclocaldir},%{_pkgconfigdir}} \
 	$RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d \
 	$RPM_BUILD_ROOT%{_desktopdir}/docklets \
@@ -54,6 +45,15 @@
 install -d $RPM_BUILD_ROOT/usr/lib/pkgconfig
 %endif
 
+# X11
+install -d $RPM_BUILD_ROOT/usr/X11R6/share
+for manp in man{1,2,3,4,5,6,7,8} ; do
+	install -d $RPM_BUILD_ROOT%{_xmandir}/${manp}
+	for mloc in it ko pl; do
+		install -d $RPM_BUILD_ROOT%{_xmandir}/${mloc}/${manp}
+	done
+done
+
 %clean
 cd $RPM_BUILD_ROOT
 
@@ -94,10 +94,13 @@
 %dir /usr/share/wm-properties
 %dir /usr/share/xsessions
 
-%files debuginfo
-%defattr(644,root,root,755)
-%dir %{_prefix}/lib/debug
-%dir %{_usrsrc}/debug
+%dir /usr/X11R6
+%dir %{_xmandir}
+%{_xmandir}/man*
+%lang(it) %{_xmandir}/it
+%lang(ko) %{_xmandir}/ko
+%lang(pl) %{_xmandir}/pl
+%dir /usr/X11R6/share
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -105,56 +108,6 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.68  2006/09/01 21:40:13  grzegol
-- added /etc/xdg/autostart directory; rel. 10
-
-Revision 1.67  2006/08/23 19:08:40  havner
-- /etc/sysconfig/wmstyle really added now
-
-Revision 1.66  2006/08/23 18:43:52  havner
-- /etc/sysconfig/wmstyle and /usr/share/xsessions only moved to
-  filesystem.spec as it already contains xinitrc related dirs
-- rel up
-
-Revision 1.65  2006/08/23 10:07:16  havner
-- desktopdir/docklets
-
-Revision 1.64  2006/08/20 18:40:18  freetz
-- install dirs / sorting
-
-Revision 1.63  2006/08/20 18:35:33  freetz
-- rel.6
-
-Revision 1.62  2006/08/19 19:05:46  freetz
-- added gnome directories, shared between gnome and non-gnome apps
-  (like gtk-doc)
-
-Revision 1.61  2006/07/12 20:33:05  freetz
-- systemwide shared /etc/X11/xinit/xinitrc.d added, rel.5
-
-Revision 1.60  2006/07/01 11:12:29  qboosh
-- pl for -debuginfo
-
-Revision 1.59  2006/06/30 22:12:01  pluto
-- debuginfo subpackage added, release 4.1.
-
-Revision 1.58  2006/06/28 05:08:31  freetz
-- removed bogus debug dirs, rel.4
-
-Revision 1.57  2006/06/27 17:51:37  freetz
-- rel.3
-
-Revision 1.56  2006/06/27 17:51:16  freetz
-- rpm debug dirs
-
-Revision 1.55  2006/05/26 10:30:04  arekm
-- rel 2
-
-Revision 1.54  2006/05/25 18:40:02  qboosh
-- added pkgconfig and aclocal
-
-Revision 1.53  2006/05/25 15:26:57  wolf
-- removed url
+Revision 1.68.2.1  2006/09/05 22:37:16  glen
+- AC-branch started
 
-Revision 1.52  2006/05/25 15:25:08  wolf
-- filesystem with common directories
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/filesystem.spec?r1=1.68&r2=1.68.2.1&f=u

