packages: util-linux-ng/util-linux-ng.spec - rel 2; libuuid moved here from...

arekm arekm at pld-linux.org
Sun Jul 19 06:12:25 CEST 2009 

Author: arekm                        Date: Sun Jul 19 04:12:25 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; libuuid moved here from e2fsprogs

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

---- Diffs:

================================================================
Index: packages/util-linux-ng/util-linux-ng.spec
diff -u packages/util-linux-ng/util-linux-ng.spec:1.49 packages/util-linux-ng/util-linux-ng.spec:1.50
--- packages/util-linux-ng/util-linux-ng.spec:1.49	Thu Jul 16 07:13:11 2009
+++ packages/util-linux-ng/util-linux-ng.spec	Sun Jul 19 06:12:20 2009
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# - move libuuid from e2fsprogs to here
 #
 # Conditional build:
 %bcond_without	initrd		# don't build initrd version
@@ -19,7 +17,7 @@
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux-ng
 Version:	2.16
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/%{name}-%{version}.tar.bz2
@@ -53,7 +51,6 @@
 	%else
 		%if %{with dietlibc}
 BuildRequires:	dietlibc-static
-BuildRequires:	libuuid-dietlibc
 		%else
 BuildRequires:	glibc-static
 		%endif
@@ -73,8 +70,8 @@
 Obsoletes:	sparc32
 Obsoletes:	util-linux
 Obsoletes:	util-linux-suids
+Conflicts:	e2fsprogs < 1.41.8-3
 Conflicts:	shadow-extras < 1:4.0.3-6
-Conflicts:	e2fsprogs < 1.41.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		debugcflags	-O1 -g
@@ -369,7 +366,7 @@
 Library to handle device identification and token extraction.
 
 %package -n libblkid-devel
-Summary:	Library to handle device identification and token extraction - development files.
+Summary:	Library to handle device identification and token extraction - development files
 Group:		Development/Libraries
 Requires:	libblkid = %{version}-%{release}
 Requires:	libuuid-devel
@@ -396,9 +393,95 @@
 Requires:	libuuid-dietlibc
 
 %description -n libblkid-dietlibc
-libblkid - a library to handle device identification and token extraction
+libblkid - a library to handle device identification and token
+extraction
  - static dietlibc version.
 
+%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 initrd
 Summary:	blkid - initrd version
 Summary(pl.UTF-8):	blkid - wersja dla initrd
@@ -443,12 +526,14 @@
 	--without-audit \
 	--without-ncurses
 
-%{__make} -C shlibs/blkid \
-%if %{with dietlibc}
-	CPPFLAGS="$CPPFLAGS -Dprogram_invocation_short_name=NULL" \
-	LDFLAGS="-lcompat"
+for lib in shlibs/blkid shlibs/uuid; do
+	%{__make} -C $lib \
+	%if %{with dietlibc}
+		CPPFLAGS="$CPPFLAGS -Dprogram_invocation_short_name=NULL" \
+		LDFLAGS="-lcompat"
 
-%endif
+	%endif
+done
 
 %{__make} -C misc-utils blkid findfs \
 %if %{with dietlibc}
@@ -456,6 +541,7 @@
 	LDFLAGS="-lcompat"
 
 mv -f shlibs/blkid/src/.libs/libblkid.a diet-libblkid.a
+mv -f shlibs/uuid/src/.libs/libuuid.a diet-libuuid.a
 %endif
 
 cp misc-utils/blkid blkid.initrd
@@ -487,7 +573,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security} \
-	$RPM_BUILD_ROOT{/%{_lib},/var/lock}
+	$RPM_BUILD_ROOT{/%{_lib},/var/{lock,lib/libuuid}}
 %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
 
 %{__make} install \
@@ -505,9 +591,11 @@
 :> $RPM_BUILD_ROOT/var/lock/wtmpxlock
 :> $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab
 
-mv $RPM_BUILD_ROOT%{_libdir}/libblkid.so.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libblkid.so.*.*.*) \
-	 $RPM_BUILD_ROOT%{_libdir}/libblkid.so
+for lib in blkid uuid; do
+	mv $RPM_BUILD_ROOT%{_libdir}/lib${lib}.so.* $RPM_BUILD_ROOT/%{_lib}
+	ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${lib}.so.*.*.*) \
+		 $RPM_BUILD_ROOT%{_libdir}/lib${lib}.so
+done
 
 ln -sf hwclock $RPM_BUILD_ROOT/sbin/clock
 echo '.so hwclock.8' > $RPM_BUILD_ROOT%{_mandir}/man8/clock.8
@@ -543,7 +631,10 @@
 install findfs.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/findfs
 %endif
 
-%{?with_dietlibc:install diet-libblkid.a $RPM_BUILD_ROOT%{dietlibdir}/libblkid.a}
+%if %{with dietlibc}
+install diet-libblkid.a $RPM_BUILD_ROOT%{dietlibdir}/libblkid.a
+install diet-libuuid.a $RPM_BUILD_ROOT%{dietlibdir}/libuuid.a
+%endif
 
 %find_lang %{name}
 
@@ -569,6 +660,26 @@
 %post -n libblkid -p /sbin/ldconfig
 %postun -n libblkid -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
+
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc */README.* text-utils/LICENSE.pg NEWS
@@ -1146,6 +1257,37 @@
 %{dietlibdir}/libblkid.a
 %endif
 
+%files -n libuuid
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/uuidgen
+%attr(755,root,root) /%{_lib}/libuuid.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libuuid.so.1
+%{_mandir}/man1/uuidgen.1*
+
+%files -n libuuid-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libuuid.so
+%{_libdir}/libuuid.la
+%{_includedir}/uuid
+%{_pkgconfigdir}/uuid.pc
+%{_mandir}/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*
+
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
@@ -1159,6 +1301,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2009/07/19 04:12:20  arekm
+- rel 2; libuuid moved here from e2fsprogs
+
 Revision 1.49  2009/07/16 05:13:11  arekm
 - up to 2.16 (uuid library still needs to be 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.49&r2=1.50&f=u

More information about the pld-cvs-commit mailing list