packages: util-linux-ng/util-linux-ng.spec - rel 3; fsck also moved from e2...

[arekm]

Author: arekm                        Date: Sun Jul 19 11:48:59 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; fsck also moved from e2fsprogs

---- Files affected:
packages/util-linux-ng:
   util-linux-ng.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: packages/util-linux-ng/util-linux-ng.spec
diff -u packages/util-linux-ng/util-linux-ng.spec:1.50 packages/util-linux-ng/util-linux-ng.spec:1.51
--- packages/util-linux-ng/util-linux-ng.spec:1.50	Sun Jul 19 06:12:20 2009
+++ packages/util-linux-ng/util-linux-ng.spec	Sun Jul 19 13:48:54 2009
@@ -17,7 +17,7 @@
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux-ng
 Version:	2.16
-Release:	2
+Release:	3
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/%{name}-%{version}.tar.bz2
@@ -70,7 +70,7 @@
 Obsoletes:	sparc32
 Obsoletes:	util-linux
 Obsoletes:	util-linux-suids
-Conflicts:	e2fsprogs < 1.41.8-3
+Conflicts:	e2fsprogs < 1.41.8-5
 Conflicts:	shadow-extras < 1:4.0.3-6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -482,6 +482,17 @@
 (uuidd) gwarantującego unikalność generowania UUID-ów opartych na
 czasie nawet przy bardzo dużej częstotliwości na systemach SMP.
 
+%package -n fsck
+Summary:	Check and repair a Linux file system
+Summary(pl.UTF-8):	Sprawdzenie i naprawa linuksowego systemu plików
+Group:		Applications/System
+
+%description -n fsck
+Check and repair a Linux file system.
+
+%description -n fsck -l pl.UTF-8
+Sprawdzenie i naprawa linuksowego systemu plików.
+
 %package initrd
 Summary:	blkid - initrd version
 Summary(pl.UTF-8):	blkid - wersja dla initrd
@@ -535,6 +546,12 @@
 	%endif
 done
 
+%{__make} -C fsck \
+%if %{with dietlibc}
+	CPPFLAGS="$CPPFLAGS -Dprogram_invocation_short_name=NULL" \
+	LDFLAGS="-lcompat"
+%endif
+
 %{__make} -C misc-utils blkid findfs \
 %if %{with dietlibc}
 	CPPFLAGS="$CPPFLAGS -Dprogram_invocation_short_name=NULL" \
@@ -546,6 +563,7 @@
 
 cp misc-utils/blkid blkid.initrd
 cp misc-utils/findfs findfs.initrd
+cp fsck/fsck fsck.initrd
 %{__make} clean
 %endif
 
@@ -556,7 +574,6 @@
 	--with%{!?with_selinux:out}-selinux \
 	--disable-use-tty-group \
 	--disable-wall \
-	--disable-fsck \
 	--enable-kill \
 	--enable-login-chown-vcs \
 	--enable-login-utils \
@@ -629,6 +646,8 @@
 install -d $RPM_BUILD_ROOT%{_libdir}/initrd
 install blkid.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/blkid
 install findfs.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/findfs
+install fsck.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/fsck
+ln -s fsck $RPM_BUILD_ROOT%{_libdir}/initrd/e2fsck
 %endif
 
 %if %{with dietlibc}
@@ -1288,11 +1307,18 @@
 %attr(2775,uuidd,uuidd) /var/lib/libuuid
 %{_mandir}/man8/uuidd.8*
 
+%files -n fsck
+%defattr(644,root,root,755)
+%attr(755,root,root) /sbin/fsck
+%{_mandir}/man8/fsck.8*
+
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/initrd/blkid
 %attr(755,root,root) %{_libdir}/initrd/findfs
+%attr(755,root,root) %{_libdir}/initrd/fsck
+%attr(755,root,root) %{_libdir}/initrd/e2fsck
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -1301,6 +1327,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2009/07/19 11:48:54  arekm
+- rel 3; fsck also moved from e2fsprogs
+
 Revision 1.50  2009/07/19 04:12:20  arekm
 - rel 2; libuuid moved here from e2fsprogs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-ng.spec?r1=1.50&r2=1.51&f=u