packages: util-linux-ng/util-linux-ng.spec - build libblkid as we want it t...

[patrys]

Author: patrys                       Date: Fri May 15 13:24:26 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build libblkid as we want it to replace the one shipped with e2fsprogs
- rel 2

---- Files affected:
packages/util-linux-ng:
   util-linux-ng.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: packages/util-linux-ng/util-linux-ng.spec
diff -u packages/util-linux-ng/util-linux-ng.spec:1.33 packages/util-linux-ng/util-linux-ng.spec:1.34
--- packages/util-linux-ng/util-linux-ng.spec:1.33	Thu May  7 22:40:13 2009
+++ packages/util-linux-ng/util-linux-ng.spec	Fri May 15 15:24:20 2009
@@ -15,7 +15,7 @@
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux-ng
 Version:	2.15
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/%{name}-%{version}.tar.bz2
@@ -339,6 +339,24 @@
 %description -n agetty -l pl.UTF-8
 agetty jest prostym linuksowym getty z obsługą portu szeregowego.
 
+%package devel
+Summary:	util-linux-ng libraries and headers
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+This package contains the libraries and header files needed to
+develop programs using util-linux-ng libraries.
+
+%package static
+Summary:	util-linux-ng static libraries
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static libraries needed to develop programs using util-linux-ng
+libraries.
+
 %prep
 %setup -q -a1
 %patch0 -p1
@@ -354,6 +372,7 @@
 %configure \
 	--bindir=/bin \
 	--sbindir=/sbin \
+	--libdir=/%{_lib} \
 	--with%{?with_uClibc:out}-pam \
 	--with%{!?with_selinux:out}-selinux \
 	--disable-use-tty-group \
@@ -365,7 +384,7 @@
 	--enable-rdev \
 	--enable-write \
 	--with-audit \
-	--with-fsprobe=blkid
+	--with-fsprobe=builtin
 
 %{__make}
 
@@ -454,14 +473,23 @@
 %lang(ja) %{_mandir}/ja/man8/clock.8*
 %lang(ja) %{_mandir}/ja/man8/hwclock.8*
 
+%attr(755,root,root) /sbin/blkid
+%attr(755,root,root) /sbin/findfs
+
+%attr(755,root,root) /%{_lib}/libblkid.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libblkid.so.1
+%{_mandir}/man3/libblkid.3*
+%{_mandir}/man8/blkid.8*
+%{_mandir}/man8/findfs.8*
+
 %attr(755,root,root) /bin/dmesg
 %attr(755,root,root) /bin/kill
 %{!?with_uClibc:%attr(755,root,root) /bin/more}
-%attr(755,root,root) /sbin/mkfs
-%attr(755,root,root) /sbin/mkswap
-%attr(755,root,root) /sbin/ctrlaltdel
 %attr(755,root,root) /sbin/addpart
+%attr(755,root,root) /sbin/ctrlaltdel
 %attr(755,root,root) /sbin/delpart
+%attr(755,root,root) /sbin/mkfs
+%attr(755,root,root) /sbin/mkswap
 %attr(755,root,root) /sbin/partx
 %attr(755,root,root) %{_bindir}/cal
 %attr(755,root,root) %{_bindir}/chrt
@@ -504,7 +532,6 @@
 %attr(755,root,root) %{_bindir}/x86_64
 %{_mandir}/man8/x86_64*
 %endif
-%{_mandir}/man8/i386*
 %endif
 %ifarch ppc ppc64
 %attr(755,root,root) %{_bindir}/ppc*
@@ -1002,12 +1029,27 @@
 %lang(es) %{_mandir}/es/man8/agetty.8*
 %lang(ja) %{_mandir}/ja/man8/agetty.8*
 
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/libblkid.so
+/%{_lib}/libblkid.la
+%{_includedir}/blkid
+%{_pkgconfigdir}/blkid.pc
+
+%files static
+%defattr(644,root,root,755)
+/%{_lib}/libblkid.a
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2009/05/15 13:24:20  patrys
+- build libblkid as we want it to replace the one shipped with e2fsprogs
+- rel 2
+
 Revision 1.33  2009/05/07 20:40:13  adamg
 - updated to 2.15
 
================================================================

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