Author: arekm                        Date: Sun Feb 27 19:08:58 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 2.12q

---- Files affected:
SPECS:
   util-linux.spec (1.254 -> 1.255) 

---- Diffs:

================================================================
Index: SPECS/util-linux.spec
diff -u SPECS/util-linux.spec:1.254 SPECS/util-linux.spec:1.255
--- SPECS/util-linux.spec:1.254 Thu Feb 17 01:53:19 2005
+++ SPECS/util-linux.spec       Sun Feb 27 20:08:50 2005
@@ -2,7 +2,6 @@
 #
 # Conditional build:
 %bcond_with    uClibc  # don't build few utilities
-%bcond_without selinux         # build without SELinux support
 #
 # TODO:
 # - move raw to /sbin (potentially can be used before mount partitions)??
@@ -18,13 +17,13 @@
 Summary(tr):   Temel sistem araçlarý
 Summary(uk):   îÁÂŚŇ ÂÁÚĎ×ÉČ ÓÉÓÔĹÍÎÉČ ŐÔÉĚŚÔ ÄĚŃ Linux
 Name:          util-linux
-Version:       2.12
-Release:       15
+Version:       2.12q
+Release:       1
 License:       distributable
 Group:         Applications/System
 # devel versions at ftp://ftp.kernel.org/pub/linux/utils/util-linux/testing
 Source0:       
ftp://ftp.kernel.org/pub/linux/utils/util-linux/%{name}-%{version}.tar.gz
-# Source0-md5: 997adf78b98d9d1c5db4f37ea982acff
+# Source0-md5: 004b971441ef89e0b93076c21806cc7d
 #Source1:      
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 81bbcc9a820512ecde87a8f31de0b745
@@ -46,14 +45,10 @@
 Patch12:       %{name}-ppc-hwclock.patch
 Patch13:       %{name}-no_multiline.patch
 Patch14:       %{name}-amd64.patch
-#Patch15:      %{name}-crypto-debian.patch
 Patch15:       %{name}-dm_crypt.patch
-Patch16:       %{name}-dev_t.patch
-Patch17:       %{name}-selinux.patch
-Patch18:       %{name}-blk.patch
-Patch19:       %{name}-io.patch
-Patch20:       %{name}-managed.patch
-Patch21:       %{name}-fdisk-sunlabel.patch
+Patch16:       %{name}-blk.patch
+Patch17:       %{name}-managed.patch
+Patch18:       %{name}-page.patch
 BuildRequires: cryptsetup-devel
 BuildRequires: gettext-devel
 BuildRequires: grep
@@ -361,11 +356,8 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%{?with_selinux:%patch17 -p1}
+%patch17 -p1
 %patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p0
 
 %build
 CC="%{__cc}"
@@ -517,6 +509,7 @@
 %attr(755,root,root) %{_bindir}/column
 %attr(755,root,root) %{_bindir}/ddate
 %attr(755,root,root) %{_bindir}/fdformat
+%attr(755,root,root) %{_bindir}/flock
 %attr(755,root,root) %{_bindir}/getopt
 %attr(755,root,root) %{_bindir}/hexdump
 %attr(755,root,root) %{_bindir}/ipcrm
@@ -548,6 +541,7 @@
 %{_mandir}/man1/colrm.1*
 %{_mandir}/man1/column.1*
 %{_mandir}/man1/ddate.1*
+%{_mandir}/man1/flock.1*
 %{_mandir}/man1/getopt.1*
 %{_mandir}/man1/hexdump.1*
 %{_mandir}/man1/kill.1*
@@ -1035,11 +1029,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.255  2005/02/27 19:08:50  arekm
+- up to 2.12q
+
 Revision 1.254  2005/02/17 00:53:19  gj
 fix race cond in fdisk-sunlabel, causing in some cases new created label NOT 
be saved on the media.
 Btw, can someone finally do 2 things:
-* upgrade trunk util-linu to 2.12q
-* add this letter at the end of version number. It is important!
+- upgrade trunk util-linu to 2.12q
+- add this letter at the end of version number. It is important!
 Thank you.
 
 Revision 1.253  2005/01/08 12:26:34  mmazur
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/util-linux.spec?r1=1.254&r2=1.255&f=u


_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to