SPECS: e2fsprogs.spec - updated to 1.39, removed obsolete ea-segfa...

qboosh qboosh at pld-linux.org
Wed Jun 7 22:00:51 CEST 2006


Author: qboosh                       Date: Wed Jun  7 20:00:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.39, removed obsolete ea-segfault patch
- enabled device-mapper support

---- Files affected:
SPECS:
   e2fsprogs.spec (1.146 -> 1.147) 

---- Diffs:

================================================================
Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.146 SPECS/e2fsprogs.spec:1.147
--- SPECS/e2fsprogs.spec:1.146	Mon Dec 12 23:58:13 2005
+++ SPECS/e2fsprogs.spec	Wed Jun  7 22:00:46 2006
@@ -29,24 +29,30 @@
 Summary(zh_CN):	šÜŔíľÚśţŔŠŐšŁ¨ext2ŁŠÎÄźţϾͳľÄš¤žßĄŁ
 Summary(zh_TW):	ĽÎŠóşŢ˛z ext2 ŔɎרt˛ÎŞş¤u¨ăľ{ŚĄĄC
 Name:		e2fsprogs
-Version:	1.38
-Release:	2
+Version:	1.39
+Release:	1
 License:	GPL
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5:	d774d4412bfb80d12cf3a4fdfd59de5a
+# Source0-md5:	06f7806782e357797fad1d34b7ced0c6
 Source1:	e2compr-0.4.texinfo.gz
 # Source1-md5:	c3c59ff37e49d8759abb1ef95a8d3abf
 Source2:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source2-md5:	992a37783bd42a897232972917e8ca7d
 Patch0:		%{name}-info.patch
 Patch1:		e2compr-info.patch
-Patch2:		%{name}-ea-segfault.patch
 URL:		http://e2fsprogs.sourceforge.net/
 BuildRequires:	automake
 BuildRequires:	autoconf
+BuildRequires:	device-mapper-devel
 BuildRequires:	gettext-devel >= 0.11
 BuildRequires:	texinfo
+%if %{with static}
+BuildRequires:	device-mapper-static
+BuildRequires:	glibc-static
+BuildRequires:	libsepol-static
+BuildRequires:	libselinux-static
+%endif
 Requires(post,postun):	/sbin/ldconfig
 Requires:	fsck = %{version}-%{release}
 Requires:	libcom_err = %{version}-%{release}
@@ -521,9 +527,11 @@
 %patch0 -p1
 gunzip < %{SOURCE1} > doc/e2compr.texinfo
 %patch1 -p1
-%patch2 -p1
 
-chmod u+w configure aclocal.m4 po/LINGUAS po/Makefile.in.in intl/Makefile.in
+sed -i -e "
+	s,DEVMAPPER_REQ='libselinux libsepol',DEVMAPPER_REQ=,;
+	s,DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol',DEVMAPPER_LIBS='-ldevmapper',;
+	s,STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a',STATIC_DEVMAPPER_LIBS='/usr/%{_lib}/libdevmapper.a /usr/%{_lib}/libselinux.a /usr/%{_lib}/libsepol.a'," configure.in
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -532,10 +540,9 @@
 %{__autoconf}
 %configure \
 	--with-root-prefix="" \
-	%{?with_nls:--enable-nls} \
 	%{!?with_nls:--disable-nls} \
-	%{?with_allstatic:--disable-elf-shlibs} \
 	%{!?with_allstatic:--enable-elf-shlibs} \
+	--enable-blkid-devmapper \
 	--enable-compression \
 	--enable-htree \
 	%{!?with_static:--enable-dynamic-e2fsck} \
@@ -574,6 +581,8 @@
 
 install doc/e2compr.info $RPM_BUILD_ROOT%{_infodir}
 
+touch $RPM_BUILD_ROOT/etc/e2fsck.conf
+
 bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/{mkfs,fsck}.ext[23].8*
@@ -632,8 +641,12 @@
 %attr(755,root,root) /%{_lib}/libss.so.*.*
 %endif
 %attr(755,root,root) %{_libdir}/e2initrd_helper
+%config(noreplace) %verify(not md5 mtime size) /etc/e2fsck.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/mke2fs.conf
 %{_mandir}/man1/*attr.1*
 %{_mandir}/man1/mk_cmds.1*
+%{_mandir}/man5/e2fsck.conf.5*
+%{_mandir}/man5/mke2fs.conf.5*
 %{_mandir}/man8/*
 %lang(fi) %{_mandir}/fi/man[18]/*
 %lang(fr) %{_mandir}/fr/man[18]/*
@@ -732,6 +745,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.147  2006/06/07 20:00:46  qboosh
+- updated to 1.39, removed obsolete ea-segfault patch
+- enabled device-mapper support
+
 Revision 1.146  2005/12/12 22:58:13  arekm
 - rel 2; [BUGFIX]: E2fsck will segfault on disconnected inode with extended attribute(s)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/e2fsprogs.spec?r1=1.146&r2=1.147&f=u



More information about the pld-cvs-commit mailing list