rpms/util-linux-ng/devel sources, 1.28, 1.29 util-linux-ng.spec, 1.79, 1.80

[kzak]

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5524

Modified Files:
	sources util-linux-ng.spec 
Log Message:
fix spec file, new tarball



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	8 Jun 2010 08:06:15 -0000	1.28
+++ sources	8 Jun 2010 10:27:29 -0000	1.29
@@ -1,2 +1,2 @@
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2
-b52575b0ce729d5e8ab50fa56877d28f  util-linux-ng-2.18-rc1.tar.bz2
+0cc60971007daec02e0e841702dc056b  util-linux-ng-2.18-rc1.tar.bz2


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- util-linux-ng.spec	8 Jun 2010 08:06:15 -0000	1.79
+++ util-linux-ng.spec	8 Jun 2010 10:27:29 -0000	1.80
@@ -78,6 +78,8 @@ Requires: pam >= 1.0.90, /etc/pam.d/syst
 Requires: audit-libs >= 1.0.6
 Requires: libuuid = %{version}-%{release}
 Requires: libblkid = %{version}-%{release}
+Requires: libmount = %{version}-%{release}
+
 %if %{include_raw}
 Requires: udev
 %endif
@@ -112,6 +114,28 @@ others, Util-linux contains the fdisk co
 program.
 
 
+%package -n libmount
+Summary: Device mounting library
+Group: Development/Libraries
+License: LGPLv2+
+Requires: libblkid = %{version}-%{release}
+
+%description -n libmount
+This is the device mounting library, part of util-linux-ng.
+
+
+%package -n libmount-devel
+Summary: Device mounting library
+Group: Development/Libraries
+License: LGPLv2+
+Requires: libmount = %{version}-%{release}
+Requires: pkgconfig
+
+%description -n libmount-devel
+This is the device mounting development library and headers,
+part of util-linux-ng.
+
+
 %package -n libblkid
 Summary: Block device ID library
 Group: Development/Libraries
@@ -308,9 +332,6 @@ ln -sf ../../sbin/hwclock ${RPM_BUILD_RO
 ln -sf hwclock ${RPM_BUILD_ROOT}/sbin/clock
 echo ".so man8/hwclock.8" > ${RPM_BUILD_ROOT}%{_mandir}/man8/clock.8
 
-# remove libtool junk  (TODO)
-#rm -f ${RPM_BUILD_ROOT}/%{_lib}/libblkid.la
-
 # install tmpfs mount helper
 pushd ${RPM_BUILD_ROOT}/sbin
 install -m 755 %{SOURCE5} ./mount.tmpfs
@@ -399,7 +420,7 @@ done
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 # remove static libs
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib{uuid,blkid}.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib{uuid,blkid,mount}.a
 
 # find MO files
 %find_lang %name
@@ -455,6 +476,9 @@ exit 0
 %post -n libuuid -p /sbin/ldconfig
 %postun -n libuuid -p /sbin/ldconfig
 
+%post -n libmount -p /sbin/ldconfig
+%postun -n libmount -p /sbin/ldconfig
+
 %pre -n uuidd
 getent group uuidd >/dev/null || groupadd -r uuidd
 getent passwd uuidd >/dev/null || \
@@ -492,6 +516,7 @@ fi
 %ghost %attr(0644,root,root)	%verify(not md5 size mtime)	/var/log/lastlog
 
 /bin/dmesg
+/bin/findmnt
 /bin/kill
 /bin/more
 /bin/taskset
@@ -505,6 +530,7 @@ fi
 /sbin/findfs
 /sbin/fsck
 /sbin/fsck.cramfs
+/sbin/fsfreeze
 /sbin/losetup
 /sbin/mkfs
 /sbin/mkfs.cramfs
@@ -512,6 +538,7 @@ fi
 /sbin/nologin
 /sbin/partx
 /sbin/pivot_root
+/sbin/swaplabel
 /sbin/swapoff
 /sbin/swapon
 /sbin/switch_root
@@ -611,7 +638,9 @@ fi
 %{_mandir}/man8/delpart.8*
 %{_mandir}/man8/fdisk.8*
 %{_mandir}/man8/findfs.8*
+%{_mandir}/man8/findmnt.8*
 %{_mandir}/man8/fsck.8*
+%{_mandir}/man8/fsfreeze.8*
 %{_mandir}/man8/isosize.8*
 %{_mandir}/man8/ldattach.8*
 %{_mandir}/man8/losetup.8*
@@ -623,6 +652,7 @@ fi
 %{_mandir}/man8/pivot_root.8*
 %{_mandir}/man8/rtcwake.8*
 %{_mandir}/man8/setarch.8*
+%{_mandir}/man8/swaplabel.8*
 %{_mandir}/man8/swapoff.8*
 %{_mandir}/man8/swapon.8*
 %{_mandir}/man8/switch_root.8*
@@ -677,12 +707,22 @@ fi
 %dir %attr(2775, uuidd, uuidd) /var/run/uuidd
 
 
+%files -n libmount
+%defattr(-,root,root)
+/%{_lib}/libmount.so.*
+
+%files -n libmount-devel
+%defattr(-,root,root)
+%{_libdir}/libmount.so
+%{_includedir}/mount
+%{_libdir}/pkgconfig/mount.pc
+
+
 %files -n libblkid
 %defattr(-,root,root)
 %dir /etc/blkid
 /%{_lib}/libblkid.so.*
 
-
 %files -n libblkid-devel
 %defattr(-,root,root)
 #%{_libdir}/libblkid.a