Author: arekm Date: Sun Jul 19 04:58:20 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; uuid moved to util-linux-ng
---- Files affected:
packages/e2fsprogs:
e2fsprogs-diet.patch (1.5 -> 1.6) , e2fsprogs.spec (1.221 -> 1.222) ,
e2fsprogs-external-libuuid.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/e2fsprogs/e2fsprogs-diet.patch
diff -u packages/e2fsprogs/e2fsprogs-diet.patch:1.5
packages/e2fsprogs/e2fsprogs-diet.patch:1.6
--- packages/e2fsprogs/e2fsprogs-diet.patch:1.5 Mon Jul 13 11:31:50 2009
+++ packages/e2fsprogs/e2fsprogs-diet.patch Sun Jul 19 06:58:14 2009
@@ -22,33 +22,4 @@
struct stat64 s;
val = stat64(device, &s);
---- e2fsprogs-1.41.5/MCONFIG.in~ 2009-04-22 13:49:25.000000000 +0200
-+++ e2fsprogs-1.41.5/MCONFIG.in 2009-05-20 15:22:35.879974273 +0200
-@@ -79,7 +79,7 @@
- DEPLIBSS = $(LIB)/li...@lib_ext@
- DEPLIBCOM_ERR = $(LIB)/libcom_...@lib_ext@
- DEPLIBUUID = @DEPLIBUUID@
--DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(DEPLIBUUID)
-+DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIB)/libu...@lib_ext@
-
- STATIC_LIBSS = $(LIB)/li...@static_lib_ext@ @DLOPEN_LIB@
- STATIC_LIBCOM_ERR = $(LIB)/libcom_...@static_lib_ext@ @SEM_INIT_LIB@
-@@ -89,7 +89,7 @@
- STATIC_LIBBLKID = @STATIC_LIBBLKID@ $(STATIC_LIBUUID)
- DEPSTATIC_LIBSS = $(LIB)/li...@static_lib_ext@
- DEPSTATIC_LIBUUID = @DEPSTATIC_LIBUUID@
--DEPSTATIC_LIBBLKID = @DEPSTATIC_LIBBLKID@ $(STATIC_LIBUUID)
-+DEPSTATIC_LIBBLKID = @DEPSTATIC_LIBBLKID@ $(LIB)/libu...@static_lib_ext@
-
- PROFILED_LIBSS = $(LIB)/li...@profiled_lib_ext@ @DLOPEN_LIB@
- PROFILED_LIBCOM_ERR = $(LIB)/libcom_...@profiled_lib_ext@ @SEM_INIT_LIB@
-@@ -98,7 +98,7 @@
- PROFILED_LIBUUID = @PROFILED_LIBUUID@ @SOCKET_LIB@
- PROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID)
- DEPPROFILED_LIBUUID = @PROFILED_LIBUUID@
--DEPPROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID)
-+DEPPROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(LIB)/libu...@profiled_lib_ext@
-
- # An include directive pointing to a directory holding enough linux-like
- # include files to satisfy some programs here
================================================================
Index: packages/e2fsprogs/e2fsprogs.spec
diff -u packages/e2fsprogs/e2fsprogs.spec:1.221
packages/e2fsprogs/e2fsprogs.spec:1.222
--- packages/e2fsprogs/e2fsprogs.spec:1.221 Mon Jul 13 12:12:06 2009
+++ packages/e2fsprogs/e2fsprogs.spec Sun Jul 19 06:58:15 2009
@@ -37,7 +37,7 @@
Summary(zh_TW.UTF-8): 用於管理 ext2 檔案系統的工具程式。
Name: e2fsprogs
Version: 1.41.8
-Release: 2
+Release: 3
License: GPL v2 (with LGPL v2 and BSD parts)
Group: Applications/System
Source0: http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
@@ -51,6 +51,7 @@
Patch2: %{name}-498381.patch
Patch3: %{name}-diet.patch
Patch4: %{name}-external-libblkid.patch
+Patch5: %{name}-external-libuuid.patch
URL: http://e2fsprogs.sourceforge.net/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -59,6 +60,7 @@
BuildRequires: texinfo
BuildRequires: texinfo-texi2dvi
BuildRequires: libblkid-devel
+BuildRequires: libuuid-devel
%if %{with allstatic}
BuildRequires: glibc-static
%endif
@@ -69,6 +71,7 @@
%if %{with dietlibc}
BuildRequires: dietlibc-static
BuildRequires: libblkid-dietlibc
+BuildRequires: libuuid-dietlibc
%else
BuildRequires: glibc-static
%endif
@@ -77,7 +80,6 @@
Requires(post,postun): /sbin/ldconfig
Requires: fsck = %{version}-%{release}
Requires: libcom_err = %{version}-%{release}
-Requires: libuuid = %{version}-%{release}
Obsoletes: e2fsprogs-evms
Obsoletes: libext2fs2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -341,7 +343,7 @@
Requires: %{name}-libs = %{version}-%{release}
%endif
Requires: libcom_err-devel = %{version}-%{release}
-Requires: libuuid-devel = %{version}-%{release}
+Requires: libuuid-devel
Obsoletes: libext2fs2-devel
%description devel
@@ -514,90 +516,6 @@
%description -n libcom_err-static -l pl.UTF-8
Biblioteka opisu popularnych błędów dla uniksów - wersja statyczna.
-%package -n libuuid
-Summary: Library for accessing and manipulating UUID
-Summary(pl.UTF-8): Biblioteka umożliwiająca dostęp i zmiany UUID
-License: BSD
-Group: Libraries
-Conflicts: e2fsprogs < 1.34-3
-
-%description -n libuuid
-Library for accessing and manipulating UUID.
-
-%description -n libuuid -l pl.UTF-8
-Biblioteka umożliwiająca dostęp i zmiany UUID.
-
-%package -n libuuid-devel
-Summary: Header files for library for accessing and manipulating UUID
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki umożliwiającej dostęp i
zmiany UUID
-License: BSD
-Group: Development/Libraries
-Requires: libuuid = %{version}-%{release}
-Conflicts: e2fsprogs-devel < 1.34-3
-
-%description -n libuuid-devel
-Library for accessing and manipulating UUID - development files.
-
-%description -n libuuid-devel -l pl.UTF-8
-Biblioteka umożliwiająca dostęp i zmiany UUID - pliki dla
-programistów.
-
-%package -n libuuid-static
-Summary: Static library for accessing and manipulating UUID
-Summary(pl.UTF-8): Statyczna biblioteka umożliwiająca dostęp i zmiany UUID
-License: BSD
-Group: Development/Libraries
-Requires: libuuid-devel = %{version}-%{release}
-Conflicts: e2fsprogs-static < 1.34-3
-
-%description -n libuuid-static
-Library for accessing and manipulating UUID - static version.
-
-%description -n libuuid-static -l pl.UTF-8
-Biblioteka umożliwiająca dostęp i zmiany UUID - wersja statyczna.
-
-%package -n libuuid-dietlibc
-Summary: Static dietlibc library for accessing and manipulating UUID
-Summary(pl.UTF-8): Statyczna biblioteka dietlibc umożliwiająca dostęp i
zmiany UUID
-License: BSD
-Group: Development/Libraries
-Requires: libuuid-devel = %{version}-%{release}
-Conflicts: e2fsprogs-static < 1.34-3
-
-%description -n libuuid-dietlibc
-Library for accessing and manipulating UUID - static dietlibc version.
-
-%description -n libuuid-dietlibc -l pl.UTF-8
-Biblioteka umożliwiająca dostęp i zmiany UUID - wersja statyczna dietlibc.
-
-%package -n uuidd
-Summary: Helper daemon to guarantee uniqueness of time-based UUIDs
-Summary(pl.UTF-8): Pomocniczy demon gwarantujący unikalność UUID-ów
opartych na czasie
-License: GPL v2
-Group: Daemons
-Requires(postun): /usr/sbin/groupdel
-Requires(postun): /usr/sbin/userdel
-Requires(pre): /bin/id
-Requires(pre): /usr/bin/getgid
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/groupmod
-Requires(pre): /usr/sbin/useradd
-Requires(pre): /usr/sbin/usermod
-Requires: libuuid = %{version}-%{release}
-Provides: group(uuidd)
-Provides: user(uuidd)
-Conflicts: libuuid < 1.40.5-0.1
-
-%description -n uuidd
-The uuidd package contains a userspace daemon (uuidd) which guarantees
-uniqueness of time-based UUID generation even at very high rates on
-SMP systems.
-
-%description -n uuidd -l pl.UTF-8
-Ten pakiet zawiera działającego w przestrzeni użytkownika demona
-(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
@@ -605,7 +523,6 @@
%if %{without allstatic}
Requires: %{name}-libs = %{version}-%{release}
%endif
-Requires: libuuid = %{version}-%{release}
%description -n fsck
Check and repair a Linux file system.
@@ -635,6 +552,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
sed -i -e '/AC_SUBST(DO_TEST_SUITE/a\MKINSTALLDIRS="install
-d"\nAC_SUBST(MKINSTALLDIRS)\n' configure.in
@@ -650,6 +568,7 @@
%if %{with initrd}
%if %{with dietlibc}
# needed for syscall()
+cp -a MCONFIG.in MCONFIG.in.org
sed -i -e 's|\(^LIBUUID = .*\)|\1 -lcompat|g' \
-e 's|\(^STATIC_LIBUUID = .*\)|\1 -lcompat|g' MCONFIG.in
%endif
@@ -661,6 +580,7 @@
--with-ldopts="%{rpmldflags} -static" \
--disable-elf-shlibs \
--disable-libblkid \
+ --disable-libuuid \
--disable-nls \
--disable-testio-debug \
--disable-e2initrd-helper \
@@ -673,12 +593,8 @@
%{__make} progs
mv -f misc/mke2fs initrd-mke2fs
mv -f misc/fsck initrd-e2fsck
-%if %{with dietlibc}
-sed -i -e 's|\(^LIBUUID = .*\) -lcompat|\1|g' \
- -e 's|\(^STATIC_LIBUUID = .*\) -lcompat|\1|g' MCONFIG.in
-mv -f lib/uuid/libuuid.a diet-libuuid.a
-%endif
%{__make} clean
+%{?with_dietlibc:mv MCONFIG.in.org MCONFIG.in}
%endif
%configure \
@@ -686,6 +602,8 @@
%{!?with_nls:--disable-nls} \
%{!?with_allstatic:--enable-elf-shlibs} \
--disable-libblkid \
+ --disable-libuuid \
+ --disable-uuidd \
--enable-compression \
--enable-htree \
--enable-fsck \
@@ -704,8 +622,6 @@
%{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
export PATH=/sbin:$PATH
-install -d $RPM_BUILD_ROOT/var/lib/libuuid
-
echo "install-shlibs:" >> intl/Makefile
%{__make} install install-libs \
@@ -772,8 +688,6 @@
install initrd-mke2fs $RPM_BUILD_ROOT%{_libdir}/initrd/mke2fs
%endif
-%{?with_dietlibc:install diet-libuuid.a $RPM_BUILD_ROOT%{dietlibdir}/libuuid.a}
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -795,25 +709,6 @@
%post -n libcom_err -p /sbin/ldconfig
%postun -n libcom_err -p /sbin/ldconfig
-%post -n libuuid -p /sbin/ldconfig
-%postun -n libuuid -p /sbin/ldconfig
-
-%pre -n uuidd
-if [ "$(getgid libuuid 2>/dev/null)" = "222" ]; then
- /usr/sbin/groupmod -n uuidd libuuid
-fi
-%groupadd -g 222 uuidd
-if [ "$(id -u libuuid 2>/dev/null)" = "222" ]; then
- /usr/sbin/usermod -l uuidd libuuid
-fi
-%useradd -u 222 -r -d /var/lib/libuuid -s /bin/false -c "UUID generator helper
daemon" -g uuidd uuidd
-
-%postun -n uuidd
-if [ "$1" = "0" ]; then
- %userremove uuidd
- %groupremove uuidd
-fi
-
%post -n fsck -p /sbin/ldconfig
%postun -n fsck -p /sbin/ldconfig
@@ -1020,42 +915,6 @@
%defattr(644,root,root,755)
%{_libdir}/libcom_err.a
-%files -n libuuid
-%defattr(644,root,root,755)
-%doc lib/uuid/COPYING
-%attr(755,root,root) %{_bindir}/uuidgen
-%if %{without allstatic}
-%attr(755,root,root) /%{_lib}/libuuid.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libuuid.so.1
-%endif
-%{_mandir}/man1/uuidgen.1*
-%lang(ja) %{_mandir}/ja/man1/uuidgen.1*
-
-%files -n libuuid-devel
-%defattr(644,root,root,755)
-%{!?with_allstatic:%attr(755,root,root) %{_libdir}/libuuid.so}
-%{_includedir}/uuid
-%{_pkgconfigdir}/uuid.pc
-%{_mandir}/man3/uuid*.3*
-%lang(ja) %{_mandir}/ja/man3/libuuid.3*
-%lang(ja) %{_mandir}/ja/man3/uuid_*.3*
-
-%files -n libuuid-static
-%defattr(644,root,root,755)
-%{_libdir}/libuuid.a
-
-%if %{with dietlibc}
-%files -n libuuid-dietlibc
-%defattr(644,root,root,755)
-%{dietlibdir}/libuuid.a
-%endif
-
-%files -n uuidd
-%defattr(644,root,root,755)
-%attr(6755,uuidd,uuidd) %{_sbindir}/uuidd
-%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
@@ -1078,6 +937,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.222 2009/07/19 04:58:15 arekm
+- rel 3; uuid moved to util-linux-ng
+
Revision 1.221 2009/07/13 10:12:06 arekm
- rel 2
================================================================
Index: packages/e2fsprogs/e2fsprogs-external-libuuid.patch
diff -u /dev/null packages/e2fsprogs/e2fsprogs-external-libuuid.patch:1.1
--- /dev/null Sun Jul 19 06:58:20 2009
+++ packages/e2fsprogs/e2fsprogs-external-libuuid.patch Sun Jul 19 06:58:15 2009
@@ -0,0 +1,48 @@
+diff -urN e2fsprogs-1.41.8.org/configure.in e2fsprogs-1.41.8/configure.in
+--- e2fsprogs-1.41.8.org/configure.in 2009-07-04 14:38:20.000000000 +0200
++++ e2fsprogs-1.41.8/configure.in 2009-07-19 06:37:21.032338841 +0200
+@@ -411,39 +411,12 @@
+ PROFILED_LIBUUID=
+ DEPPROFILED_LIBUUID=
+ UUID_CMT=
+-AC_ARG_ENABLE([libuuid],
+-[ --disable-libuuid do not build private uuid library],
+-if test "$enableval" = "no"
+-then
+- if test -z "$PKG_CONFIG"; then
+- AC_MSG_ERROR([pkg-config not installed; please install it.])
+- fi
+
+- AC_CHECK_LIB(uuid, uuid_generate,
+- [LIBUUID=`$PKG_CONFIG --libs uuid`;
+- STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
+- [AC_MSG_ERROR([external uuid library not found])],
+- [$LIBUUID])
+- UUID_CMT=#
+- AC_MSG_RESULT([Disabling private uuid library])
+-else
+- LIBUUID='$(LIB)/libuuid'$LIB_EXT
+- DEPLIBUUID=$LIBUUID
+- STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT
+- DEPSTATIC_LIBUUID=$STATIC_LIBUUID
+- PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT
+- DEPPROFILED_LIBUUID=$PROFILED_LIBUUID
+- AC_MSG_RESULT([Enabling private uuid library])
+-fi
+-,
+-LIBUUID='$(LIB)/libuuid'$LIB_EXT
+-DEPLIBUUID=$LIBUUID
+-STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT
+-DEPSTATIC_LIBUUID=$STATIC_LIBUUID
+-PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT
+-DEPPROFILED_LIBUUID=$PROFILED_LIBUUID
+-AC_MSG_RESULT([Enabling private uuid library by default])
+-)
++LIBUUID="-luuid"
++DEPLIBUUID=$LIBUUID
++STATIC_LIBUUID="-luuid"
++DEPSTATIC_LIBUUID=$STATIC_LIBUUID
++UUID_CMT='#'
+ AC_SUBST(LIBUUID)
+ AC_SUBST(DEPLIBUUID)
+ AC_SUBST(STATIC_LIBUUID)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/e2fsprogs/e2fsprogs-diet.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/e2fsprogs/e2fsprogs.spec?r1=1.221&r2=1.222&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
