- cleanups, pl, BR: libuuid-devel

Changed files:
    devlabel.spec -> 1.4

diff --git a/devlabel.spec b/devlabel.spec
index 3eb872b6bd8e4df1ccd86a187fd60bd00be0f35c..55b8a4d41bf810037da4633fede48af2e2c58869 100644 (file)
--- a/devlabel.spec
+++ b/devlabel.spec
@@ -1,17 +1,25 @@
 Summary:       Consistent/persistent storage device access through symlinking
+Summary(pl):   Spójny/sta³y dostêp do urz±dzeñ z danymi poprzez symlinki
 Name:          devlabel
 Version:       0.48.01
 Release:       1
 License:       GPL
-Group:         System Environment/Base
 Group:         Applications/System
 Source0:       http://linux.dell.com/devlabel/permalink/%{name}-%{version}.tar.gz
 # Source0-md5: 1a4032b942d8b47544da1957374a9786
-Requires:      sed grep awk textutils fileutils diffutils coreutils mktemp
-Requires:      initscripts > 6.97-1
+BuildRequires: libuuid-devel
+Requires:      awk
+Requires:      coreutils
+Requires:      diffutils
+Requires:      grep
+Requires:      mktemp
+Requires:      rc-scripts
+Requires:      sed
 Requires:      util-linux
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _sbindir        /sbin
+
 %description
 This package contains the devlabel implementation. It allows for
 consistent mounting of devices. This is accomplished through tagging a
@@ -19,13 +27,19 @@ unique identifier to each device/symlink combination and confirming
 that the identifier still matches the device name before it allows the
 symlink mapping to proceed.
 
-%prep
+%description -l pl
+Ten pakiet zawiera implementacjê devlabel. Umo¿liwia spójne montowanie
+urz±dzeñ. Osi±ga to poprzez oznaczanie unikalnymi identyfikatorami
+ka¿dej kombinacji urz±dzenie/symlink i potwierdzanie, ¿e dany
+identyfikator nadal pasuje do nazwy urz±dzenia przed umo¿liwieniem
+odwzorowania dowi±zania symbolicznego.
 
+%prep
 %setup -q
 
 %build
-gcc $RPM_OPT_FLAGS -o scsi_unique_id scsi_unique_id.c
-gcc $RPM_OPT_FLAGS -o partition_uuid -luuid partition_uuid.c
+%{__cc} %{rpmcflags} -o scsi_unique_id scsi_unique_id.c
+%{__cc} %{rpmcflags} -o partition_uuid -luuid partition_uuid.c
 
 %pre
 [ -d /var/lib/devlabel ] && rm -rf /var/lib/devlabel >/dev/null 2>&1
@@ -36,9 +50,9 @@ if [ -e /etc/sysconfig/devlabel ]; then
        version_minor=`echo $devlabel_version | awk {'print $2'} | cut -d '.' -f 2-2`
        [ -z "$version_minor" ] && old_format="true"
        [ -z "$old_format" ] && [ "$version_major" -eq 0 ] && [ "$version_minor" -lt 37 ] && old_format="true"
-        if [ -n "$old_format" ]; then
-                /sbin/devlabel restart >/dev/null 2>&1 || :
-        fi
+       if [ -n "$old_format" ]; then
+               /sbin/devlabel restart >/dev/null 2>&1 || :
+       fi
 fi
 
 %triggerpostun -- devlabel <= 0.38.07-1
@@ -48,29 +62,25 @@ fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-if [ "$RPM_BUILD_ROOT" != "/" ]; then
-       rm -rf $RPM_BUILD_ROOT
-fi
-install -d $RPM_BUILD_ROOT/{sbin,usr/bin,usr/share/man/man8,etc/sysconfig,etc/sysconfig/devlabel.d}
-install -m 755 devlabel $RPM_BUILD_ROOT/sbin/devlabel
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_mandir}/man8,/etc/sysconfig/devlabel.d}
+
+install -m 755 devlabel $RPM_BUILD_ROOT%{_sbindir}/devlabel
 install -m 755 scsi_unique_id $RPM_BUILD_ROOT%{_bindir}
 install -m 755 partition_uuid $RPM_BUILD_ROOT%{_bindir}
-install devlabel.8.gz $RPM_BUILD_ROOT%{_mandir}/man8
+gzip -dc devlabel.8.gz > $RPM_BUILD_ROOT%{_mandir}/man8/devlabel.8
 install sysconfig.devlabel $RPM_BUILD_ROOT/etc/sysconfig/devlabel
 install ignore_list $RPM_BUILD_ROOT/etc/sysconfig/devlabel.d
 install ignore_list $RPM_BUILD_ROOT/etc/sysconfig/devlabel.d/proc_partitions
 
 %clean
-if [ "$RPM_BUILD_ROOT" != "/" ]; then
-       rm -rf $RPM_BUILD_ROOT
-fi
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS
 %attr(755,root,root) %{_sbindir}/devlabel
 %attr(755,root,root) %{_bindir}/scsi_unique_id
 %attr(755,root,root) %{_bindir}/partition_uuid
 /etc/sysconfig/devlabel.d
 %config(noreplace) /etc/sysconfig/devlabel
 %{_mandir}/man8/devlabel.8*
-%doc AUTHORS COPYING