- PLD merge

diff --git a/FHS.spec b/FHS.spec
index fc2950ded7e65eb1dd66db380aa0072a49a33f30..abafc833c67afcb2c1fef0b1f9e161b20d7dc4ef 100644 (file)
--- a/FHS.spec
+++ b/FHS.spec
@@ -12,7 +12,7 @@ Summary(pl.UTF-8):    Podstawowy układ katalogów systemu Linux zgodny z FHS 3.0
 Summary(tr.UTF-8):     Temel dosya sistemi yapısı
 Name:          FHS
 Version:       3.0
 Summary(tr.UTF-8):     Temel dosya sistemi yapısı
 Name:          FHS
 Version:       3.0

-Release:       4
+Release:       7

 License:       GPL
 Group:         Base
 URL:           http://refspecs.linuxfoundation.org/fhs.shtml
 License:       GPL
 Group:         Base
 URL:           http://refspecs.linuxfoundation.org/fhs.shtml


@@ -34,9 +34,9 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                __spec_clean_body       %{nil}
 
 # doesn't contain any files, but we're not noarch package
 %define                __spec_clean_body       %{nil}
 
 # doesn't contain any files, but we're not noarch package

-%define        no_install_post_strip   1
-%define        no_install_post_chrpath 1
-%define        no_install_post_compress_modules        1
+%define                no_install_post_strip   1
+%define                no_install_post_chrpath 1
+%define                no_install_post_compress_modules        1

 
 # we have to use numeric uids/groups. see comment above
 %define                gid_uucp        14
 
 # we have to use numeric uids/groups. see comment above
 %define                gid_uucp        14


@@ -62,6 +62,19 @@ Pakiet ten zawiera informacje o podstawowej strukturze katalogów
 systemu i praw dostępu do nich. Struktura katalogów jest zgodna z FHS
 %{version}.
 
 systemu i praw dostępu do nich. Struktura katalogów jest zgodna z FHS
 %{version}.
 

+%package debug
+Summary:       Debug information directory hierarchy
+Summary(pl.UTF-8):     Hierarchia katalogów dla informacji diagnostycznych
+Group:         Development/Debug
+
+%description debug
+This package provides directory hierarchy for debug information
+contained in debuginfo rpm packages.
+
+%description debug -l pl.UTF-8
+Ten pakiet dostarcza hierarchię katalogów dla zawarych w pakietach
+RPM debuginfo informacji pozwalających na śledzenie programów.
+

 %prep
 %setup -qcT
 cp -p %{SOURCE0} .
 %prep
 %setup -qcT
 cp -p %{SOURCE0} .


@@ -74,10 +87,10 @@ install -d \
        $RPM_BUILD_ROOT/etc/{X11,opt} \
        $RPM_BUILD_ROOT/lib/modules \
        $RPM_BUILD_ROOT/{mnt,media,proc,root/tmp,sbin,tmp} \
        $RPM_BUILD_ROOT/etc/{X11,opt} \
        $RPM_BUILD_ROOT/lib/modules \
        $RPM_BUILD_ROOT/{mnt,media,proc,root/tmp,sbin,tmp} \

-       $RPM_BUILD_ROOT/usr/{bin,games,include,lib{,exec},sbin,share,src} \
+       $RPM_BUILD_ROOT/usr/{bin,games,include,lib,libexec,sbin,share,src} \

        $RPM_BUILD_ROOT/usr/share/{color/icc,dict,doc,games,info,misc,ppd,tmac,xml} \
        $RPM_BUILD_ROOT/usr/lib/games \
        $RPM_BUILD_ROOT/usr/share/{color/icc,dict,doc,games,info,misc,ppd,tmac,xml} \
        $RPM_BUILD_ROOT/usr/lib/games \

-       $RPM_BUILD_ROOT/usr/local/{bin,etc,games,include,lib{,exec},sbin,share/{color/icc,doc,info,man},src} \
+       $RPM_BUILD_ROOT/usr/local/{bin,etc,games,include,lib,libexec,sbin,share/{color/icc,doc,info,man},src} \

        $RPM_BUILD_ROOT/var/{cache,crash,db,games,lib/{color/icc,misc},local,lock,log,mail,opt,run,spool,tmp,yp}
 
 %if %{with lib64}
        $RPM_BUILD_ROOT/var/{cache,crash,db,games,lib/{color/icc,misc},local,lock,log,mail,opt,run,spool,tmp,yp}
 
 %if %{with lib64}


@@ -87,6 +100,10 @@ install -d $RPM_BUILD_ROOT{/lib64,/usr/lib64/games,/usr/local/lib64}
 install -d $RPM_BUILD_ROOT/usr/share/man/man{1,2,3,4,5,6,7,8}
 install -d $RPM_BUILD_ROOT/usr/local/share/man/man{1,2,3,4,5,6,7,8}
 
 install -d $RPM_BUILD_ROOT/usr/share/man/man{1,2,3,4,5,6,7,8}
 install -d $RPM_BUILD_ROOT/usr/local/share/man/man{1,2,3,4,5,6,7,8}
 

+for i in $(seq 0 255); do
+       install -d "$RPM_BUILD_ROOT$(printf '/usr/lib/.build-id/%02x' $i)"
+done
+

 > %{name}.lang
 for mloc in $(cat locale-dirs); do
        echo "%%lang($mloc) %dir /usr/share/man/${mloc}" >> %{name}.lang
 > %{name}.lang
 for mloc in $(cat locale-dirs); do
        echo "%%lang($mloc) %dir /usr/share/man/${mloc}" >> %{name}.lang


@@ -100,11 +117,11 @@ done
 cd $RPM_BUILD_ROOT
 
 check_filesystem_dirs() {
 cd $RPM_BUILD_ROOT
 
 check_filesystem_dirs() {

-       RPMFILE=%{name}-%{version}-%{release}.%{_target_cpu}.rpm
+       RPMFILES="%{_rpmdir}/%{name}-%{version}-%{release}.%{_target_cpu}.rpm %{_rpmdir}/%{name}-debug-%{version}-%{release}.%{_target_cpu}.rpm"

        TMPFILE=$(mktemp)
        find | sed -e 's|^\.||g' -e '/^$/d' | LC_ALL=C sort > $TMPFILE
 
        TMPFILE=$(mktemp)
        find | sed -e 's|^\.||g' -e '/^$/d' | LC_ALL=C sort > $TMPFILE
 

-       if rpm -qpl %{_rpmdir}/$RPMFILE | grep -v '^/$' | LC_ALL=C sort | diff -u $TMPFILE - ; then
+       if rpm -qpl $RPMFILES | grep -v '^/$' | LC_ALL=C sort | diff -u $TMPFILE - ; then

                rm -rf $RPM_BUILD_ROOT
        else
                echo -e "\nNot so good, some directories are not included in package\n"
                rm -rf $RPM_BUILD_ROOT
        else
                echo -e "\nNot so good, some directories are not included in package\n"


@@ -146,7 +163,7 @@ posix.chown("/var/lock", 0, %{gid_uucp})
 %dir /run
 %dir /sbin
 %dir %attr(755,root,root) /srv
 %dir /run
 %dir /sbin
 %dir %attr(755,root,root) /srv

-%dir /sys
+%dir %attr(555,root,root) /sys

 %dir %attr(1777,root,root) /tmp
 %dir /usr
 %dir /usr/bin
 %dir %attr(1777,root,root) /tmp
 %dir /usr
 %dir /usr/bin


@@ -210,3 +227,8 @@ posix.chown("/var/lock", 0, %{gid_uucp})
 %dir /usr/lib64/games
 %dir /usr/local/lib64
 %endif
 %dir /usr/lib64/games
 %dir /usr/local/lib64
 %endif

+
+%files debug
+%defattr(644,root,root,755)
+%dir /usr/lib/.build-id
+%dir /usr/lib/.build-id/[0-9a-f][0-9a-f]