X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=filesystem.spec;h=d178c7ad022226124b4760c507569e27a2f0db2f;hb=c248f03339baccca3c1d4e722e90cc918fadf804;hp=2afdd2cbbb127ced7224ef713d5140c90e67205f;hpb=a5f8293e885cd2da439a06ff0d4102386a7e74b2;p=packages%2Ffilesystem.git

diff --git a/filesystem.spec b/filesystem.spec
index 2afdd2c..d178c7a 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -1,96 +1,247 @@
-Summary:	Basic filesystem layout
-Summary(de):	Grundlegende Dateisystemstruktur
-Summary(fr):	Arborescence de base du système de fichiers
-Summary(pl):	Podstawa uk³ad katalogów systemu Linux
-Summary(tr):	Temel dosya sistemi yapýsý
+
+# disable rpm generated debug package, we handle it differently here
+%define		_enable_debug_packages	0
+
+# avoid rpm 4.4.9 adding rm -rf buildroot
+%define		__spec_clean_body	%{nil}
+Summary:	Common directories
+Summary(pl.UTF-8):	Wspólne katalogi
 Name:		filesystem
-Version:	1.5
-Release:	5
-Copyright:	Public Domain
+Version:	3.0
+Release:	51
+License:	GPL
 Group:		Base
-Group(pl):	Podstawowe
+BuildRequires:	automake
+BuildRequires:	mktemp
+BuildRequires:	rpm >= 4.4.9-56
+Requires:	FHS >= 2.3-15
+Provides:	browser-plugins(%{_target_base_arch})
+%ifarch %{x8664}
+Provides:	browser-plugins(i386)
+%endif
+%ifarch ppc64
+Provides:	browser-plugins(ppc)
+%endif
+%ifarch s390x
+Provides:	browser-plugins(s390)
+%endif
+%ifarch sparc64
+Provides:	browser-plugins(sparc)
+%endif
+Provides:	filesystem-debuginfo = %{version}-%{release}
+Obsoletes:	filesystem-debuginfo < 3.0-36
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Prereq:		setup
-Buildarch:	noarch
+
+# Adapter: This file does not like to be adapterized!
+
+# directory for "privilege separation" chroot
+%define		_privsepdir	/usr/share/empty
+# directory for *.idl files (for CORBA implementations)
+%define		_idldir		/usr/share/idl
 
 %description
-This package contains the basic directory layout for a Linux system, 
-including the proper permissions for the directories. This layout conforms
-to the Filesystem Hierarchy Standard (FHS) 2.0.
-
-%description -l de
-Dieses Paket enthält die grundlegende Verzeichnisstruktur eines Linux-Systems,
-einschließlich der entsprechenden Zugriffsrechte. Diese Struktur entspricht
-dem Filesystem Hierarchy Standard (FHS) 2.0.
-
-%description -l fr
-Ce package contient l'arborescence type pour système linux
-y compris les permissions adéquates pour les répertoires. Cette
-arborescence est conforme au standard \"Filesystem Hierarchy Standard\"
-(FHS) 2.0.
-
-%description -l pl
-Pakiet ten zawiera informacje o podstawowej strukturze katalogów systemu i
-praw dostêpu do nich.
- 
-%description -l tr
-Bu paket GNU makro iþleme dilini içerir. Mantýksal olarak ayrýþtýrýlabilen
-metin dosyalarý yazýmý için yararlýdýr.
+This package contains common directories for packages that extend some
+programs functionality, but don't require them themselves.
+
+%description -l pl.UTF-8
+Ten pakiet zawiera wspólne katalogi dla pakietów rozszerzających
+funkcjonalność programów, ale nie wymagających ich.
 
 %prep
+%setup -qcT
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/{bin,boot,home/users,opt} \
-	$RPM_BUILD_ROOT/etc/{X11,profile.d,security,opt} \
-	$RPM_BUILD_ROOT/lib/{modules,security} \
-	$RPM_BUILD_ROOT/{mnt/{floppy,cdrom},proc,root,sbin,tmp} \
-	$RPM_BUILD_ROOT/usr/{bin,src,games,lib,include,sbin,share} \
-	$RPM_BUILD_ROOT/usr/share/{dict,doc,info,man,misc,games,tmac} \
-	$RPM_BUILD_ROOT/usr/local/{bin,games,share/{info,doc,man},lib,sbin,src} \
-	$RPM_BUILD_ROOT/var/{lock/subsys,log,mail,run,spool} \
-	$RPM_BUILD_ROOT/var/{games,state/misc,tmp,db,opt,crash,cache,account} \
-	$RPM_BUILD_ROOT/var/cache \
-	$RPM_BUILD_ROOT/usr/X11R6/share/applnk
-
-ln -sf share/man 	$RPM_BUILD_ROOT/usr/man
-ln -sf share/info 	$RPM_BUILD_ROOT/usr/info
-ln -sf state		$RPM_BUILD_ROOT/var/lib
-ln -sf share/doc 	$RPM_BUILD_ROOT/usr/doc
-ln -sf share/doc 	$RPM_BUILD_ROOT/usr/local/doc
-ln -sf share/dict 	$RPM_BUILD_ROOT/usr/dict
+install -d \
+	$RPM_BUILD_ROOT/{initrd,selinux,run,sys} \
+	$RPM_BUILD_ROOT/etc/{pki,X11/xinit/xinitrc.d,certs,default,logrotate.d,security,sysconfig,tmpwatch,xdg/autostart,init,NetworkManager/dispatcher.d} \
+	$RPM_BUILD_ROOT/home/{users,services} \
+	$RPM_BUILD_ROOT/lib/{firmware,security,udev/rules.d} \
+	$RPM_BUILD_ROOT/usr/include/{security,X11} \
+	$RPM_BUILD_ROOT/usr/lib/{cgi-bin,browser-plugins,mozilla/extensions,pkgconfig,initrd,ConsoleKit/run-session.d} \
+	$RPM_BUILD_ROOT/usr/share/{augeas/lenses/tests,backgrounds,cmake/Modules,color/icc,gnome/help,man/man{n,l},man/pl/mann,pkgconfig,sound{,font}s,themes/Default,vala/vapi,wallpapers,xsessions} \
+	$RPM_BUILD_ROOT/usr/src/examples \
+	$RPM_BUILD_ROOT/var/lib/color/icc \
+	$RPM_BUILD_ROOT/var/lock/subsys \
+	$RPM_BUILD_ROOT/var/log/archive \
+	$RPM_BUILD_ROOT{%{_aclocaldir},%{_desktopdir}/docklets,%{_iconsdir},%{_pixmapsdir}} \
+	$RPM_BUILD_ROOT%{_fontsdir}/{{100,75}dpi,OTF,Speedo,Type1/{afm,pfm},TTF,cyrillic,local,misc} \
+	$RPM_BUILD_ROOT{%{_idldir},%{_privsepdir}}
+
+
+> %{name}.lang
+install -d $RPM_BUILD_ROOT/usr/share/help/C
+
+for lang in ar ca cs da de el en_GB es eu fi fr gl he hi hr hu id it ja lt nb nl oc pl ps pt_BR ru sl sr sr@latin sv th tr vi zh_CN zh_TW; do
+	install -d $RPM_BUILD_ROOT/usr/share/help/${lang}
+	echo "%%lang($lang) %dir /usr/share/help/${lang}" >> %{name}.lang
+done
+
+%if "%{_lib}" == "lib64"
+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/mozilla/extensions \
+	$RPM_BUILD_ROOT/usr/lib64/initrd
+%endif
+
+%if "%{pld_release}" == "ac"
+rmdir $RPM_BUILD_ROOT/usr/include/X11
+# 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/usr/X11R6/man/$manp
+	for mloc in it ko pl; do
+		install -d $RPM_BUILD_ROOT/usr/X11R6/man/$mloc/$manp
+	done
+done
+install -d $RPM_BUILD_ROOT/usr/share/wm-properties
+%endif
+
+install -d \
+	$RPM_BUILD_ROOT/usr/lib/debug/%{_lib} \
+	$RPM_BUILD_ROOT/usr/lib/debug%{_libdir} \
+	$RPM_BUILD_ROOT/usr/lib/debug/{bin,sbin} \
+	$RPM_BUILD_ROOT/usr/lib/debug/usr/{bin,sbin} \
+	$RPM_BUILD_ROOT/usr/lib/debug/lib/security \
+	$RPM_BUILD_ROOT/usr/src/debug
+
+%if "%{_lib}" == "lib64"
+install -d \
+	$RPM_BUILD_ROOT/usr/lib/debug/lib64/security
+%endif
+
+# create this for %clean
+tar -cf checkfiles.tar -C $RPM_BUILD_ROOT .
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT
+tar -xf checkfiles.tar -C $RPM_BUILD_ROOT
+cd $RPM_BUILD_ROOT
+
+check_filesystem_dirs() {
+	RPMFILE=%{_rpmdir}/%{name}-%{version}-%{release}.%{_target_cpu}.rpm
+	RPMFILE2=%{?with_debuginfo:%{_rpmdir}/%{name}-debuginfo-%{version}-%{release}.%{_target_cpu}.rpm}
+	TMPFILE=$(mktemp)
+	# note: we must exclude from check all existing dirs belonging to FHS
+	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/lib|var/lock|var/log)$' > $TMPFILE
+
+	# find finds also '.', so use option -B for diff
+	rpm -qpl $RPMFILE $RPMFILE2 | grep -v '^/$' | LC_ALL=C sort | diff -uB - $TMPFILE || :
+
+	rm -f $TMPFILE
+}
+
+check_filesystem_dirs
+
+%if "%{pld_release}" != "ac"
+%pretrans -p <lua>
+-- this needs to be a dir
+if posix.stat("/usr/include/X11", "type") == "link" then
+	-- feel free to write in pure lua, but success on first install is not important.
+	os.execute("umask 022; mv -f /usr/include/X11{,.rpmsave}; mkdir -m755 -p /usr/include/X11 && mv -f /usr/include/X11.rpmsave/* /usr/include/X11")
+end
+%endif
+
+%files -f %{name}.lang
+%defattr(644,root,root,755)
+%dir /etc/X11/xinit
+%dir /etc/X11/xinit/xinitrc.d
+%attr(751,root,root) %dir /etc/certs
+%dir /etc/default
+%dir /etc/init
+%dir /etc/logrotate.d
+%attr(751,root,root) %dir /etc/security
+%dir /etc/sysconfig
+%dir /etc/tmpwatch
+%dir /etc/pki
+%dir /etc/xdg
+%dir /etc/xdg/autostart
+%dir /etc/NetworkManager
+%dir /etc/NetworkManager/dispatcher.d
+%dir /home/users
+%dir /home/services
+%dir /initrd
+%dir /lib/firmware
+%dir /lib/security
+%dir /lib/udev
+%dir /lib/udev/rules.d
+%dir /run
+%dir /selinux
+%dir /sys
+%if "%{pld_release}" != "ac"
+%dir /usr/include/X11
+%endif
+%dir /usr/include/security
+%dir /usr/lib/ConsoleKit
+%dir /usr/lib/ConsoleKit/run-session.d
+%dir /usr/lib/browser-plugins
+%dir /usr/lib/mozilla
+%dir /usr/lib/mozilla/extensions
+%dir /usr/lib/cgi-bin
+%dir /usr/lib/initrd
+%dir /usr/lib/pkgconfig
+%dir /usr/share/augeas
+%dir /usr/share/augeas/lenses
+%dir /usr/share/augeas/lenses/tests
+%dir /usr/share/backgrounds
+%dir /usr/share/cmake
+%dir /usr/share/cmake/Modules
+%dir /usr/share/color
+%dir /usr/share/color/icc
+%dir /usr/share/gnome
+%dir /usr/share/gnome/help
+%dir /usr/share/help
+%dir /usr/share/help/C
+%dir /usr/share/man/man[nl]
+%lang(pl) %dir /usr/share/man/pl/mann
+%dir /usr/share/pkgconfig
+%dir /usr/share/soundfonts
+%dir /usr/share/sounds
+%dir /usr/share/themes
+%dir /usr/share/themes/Default
+%dir /usr/share/vala
+%dir /usr/share/vala/vapi
+%dir /usr/share/wallpapers
+%dir /usr/share/xsessions
+%dir /usr/src/examples
+%dir /var/lib/color
+%dir /var/lib/color/icc
+%attr(700,root,root) %dir /var/lock/subsys
+%attr(750,root,logs) %dir /var/log/archive
+%dir %{_aclocaldir}
+%dir %{_desktopdir}
+%dir %{_desktopdir}/docklets
+%dir %{_iconsdir}
+%dir %{_pixmapsdir}
+%{_fontsdir}
+%dir %{_idldir}
+%dir %{_privsepdir}
+%if "%{_lib}" == "lib64"
+%dir /lib64/security
+%dir /usr/lib64/browser-plugins
+%dir /usr/lib64/mozilla
+%dir /usr/lib64/mozilla/extensions
+%dir /usr/lib64/initrd
+%dir /usr/lib64/pkgconfig
+%endif
+
+%if "%{pld_release}" == "ac"
+%dir /usr/X11R6
+%dir /usr/X11R6/man
+/usr/X11R6/man/man*
+%lang(it) /usr/X11R6/man/it
+%lang(ko) /usr/X11R6/man/ko
+%lang(pl) /usr/X11R6/man/pl
+%dir /usr/X11R6/share
+
+%dir /usr/share/wm-properties
+%endif
+
+# debuginfo
+%dir /usr/lib/debug
+/usr/lib/debug/*
 
-%files
-%defattr(755,root,root,755)
-/bin
-%attr(700,root,root) /boot
-%dir /etc
-%attr(750,root,root) %dir /etc/security
-%dir /etc/profile.d
-%dir /etc/opt
-%dir /etc/X11
-/home
-/lib
-/mnt
-/opt
-%attr(555,root,root) /proc
-%attr(700,root,root) /root
-%dir /sbin
-%attr(1777,root,root) /tmp
-/usr
-%dir /var
-%dir /var/db
-%dir /var/account
-%dir /var/games
-/var/lock
-%attr(751,root,root) /var/log
-%dir /var/run
-%dir /var/crash
-/var/cache
-%dir /var/state
-%dir /var/opt
-%attr(1777,root,root) %dir /var/tmp
+%dir /usr/src/debug