SPECS (AC-branch): filesystem.spec - try #2 for filesystem for AC

glen glen at pld-linux.org
Sat Oct 28 15:13:54 CEST 2006 

Author: glen                         Date: Sat Oct 28 13:13:54 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- try #2 for filesystem for AC

---- Files affected:
SPECS:
   filesystem.spec (1.71 -> 1.71.2.1) 

---- Diffs:

================================================================
Index: SPECS/filesystem.spec
diff -u SPECS/filesystem.spec:1.71 SPECS/filesystem.spec:1.71.2.1
--- SPECS/filesystem.spec:1.71	Sat Oct 28 11:27:19 2006
+++ SPECS/filesystem.spec	Sat Oct 28 15:13:49 2006
@@ -1,12 +1,22 @@
 # $Revision$, $Date$
-
-%define		_enable_debug_packages	0
-
+# TODO
+# - move X11R6 to FHS? (or keep them here for the sake of easier maintenance)
+# - cnfl pkgconfig-0.20-1: /usr/lib/pkgconfig, /usr/share/pkgconfig
+# - cnfl automake-1.9.6-3: /usr/share/aclocal
+# - cnfl X11-6.9.0-11: /etc/X11/xinit
+# - cnfl libgnomeui-2.14.1-2: /usr/share/gnome, /usr/share/gnome/help
+# - cnfl applnk-1.9.5-20: /usr/share/applications/docklets
+# - cnfl X11-libs-6.9.0-11: /usr/share/icons, /usr/share/pixmaps,
+#        /usr/share/sounds, /usr/share/themes, /usr/share/themes/Default,
+#        /usr/share/wallpapers, /usr/share/wm-properties, /etc/xdg,
+#        /etc/sysconfig/wmstyle
+# - cnfl X11-libs-6.9.0-11: /usr/share/xsessions ?
+# - cnfl rc-scripts-0.4.0.27-1: /etc/sysconfig
 Summary:	Common directories
 Summary(pl):	Wspólne katalogi
 Name:		filesystem
-Version:	3.0
-Release:	11
+Version:	2.0
+Release:	0.2
 License:	GPL
 Group:		Base
 BuildRequires:	automake
@@ -17,6 +27,7 @@
 %define		_privsepdir	/usr/share/empty
 # directory for *.idl files (for CORBA implementations)
 %define		_idldir		/usr/share/idl
+%define		_xmandir	/usr/X11R6/man
 
 %description
 This package contains common directories for packages that extend
@@ -26,19 +37,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
@@ -50,9 +48,9 @@
 	$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,debug,pkgconfig} \
+	$RPM_BUILD_ROOT/usr/lib/{cgi-bin,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/src/{debug,examples} \
+	$RPM_BUILD_ROOT/usr/src/examples \
 	$RPM_BUILD_ROOT/var/lock/subsys \
 	$RPM_BUILD_ROOT{%{_aclocaldir},%{_desktopdir}/docklets,%{_iconsdir},%{_pixmapsdir}} \
 	$RPM_BUILD_ROOT%{_fontsdir}/{{100,75}dpi,OTF,Speedo,Type1/{afm,pfm},TTF,cyrillic,local,misc} \
@@ -64,19 +62,27 @@
 	$RPM_BUILD_ROOT/usr/lib64/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
 
 # %{_rpmfilename} is not expanded, so use
 # %{name}-%{version}-%{release}.%{buildarch}.rpm
 RPMFILE=%{name}-%{version}-%{release}.%{_target_cpu}.rpm
-RPMFILE2=%{name}-debuginfo-%{version}-%{release}.%{_target_cpu}.rpm
 TMPFILE=%{name}-%{version}.tmp$$
 # note: we must exclude from check all existing dirs belonging to FHS
 find . | sed -e 's|^\.||g' -e 's|^$||g' | 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 %{_rpmdir}/$RPMFILE %{_rpmdir}/$RPMFILE2 | grep -v '^/$' | sort | diff -uB $TMPFILE - || :
+rpm -qpl %{_rpmdir}/$RPMFILE | grep -v '^/$' | sort | diff -uB $TMPFILE - || :
 
 rm -rf $RPM_BUILD_ROOT
 
@@ -126,10 +132,13 @@
 %dir /usr/lib64/pkgconfig
 %endif
 
-%files debuginfo
-%defattr(644,root,root,755)
-%dir /usr/lib/debug
-%dir /usr/src/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
@@ -137,67 +146,6 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.71  2006/10/28 09:27:19  qboosh
-- typo
-
-Revision 1.70  2006/10/27 18:15:27  qboosh
-- moved here all dirs not covered by FHS 2.3 (from FHS.spec)
-- fixed check in clean section
-- release 11
-
-Revision 1.69  2006/09/15 07:28:43  jajcus
-- BR: automake (%{_aclocaldir} macro)
-
-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.71.2.1  2006/10/28 13:13:49  glen
+- try #2 for filesystem for AC
 
-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.71&r2=1.71.2.1&f=u

More information about the pld-cvs-commit mailing list