rpms/util-linux-ng/devel .cvsignore, 1.23, 1.24 sources, 1.23, 1.24 util-linux-ng.spec, 1.69, 1.70

[kzak]

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10683

Modified Files:
	.cvsignore sources util-linux-ng.spec 
Log Message:
* Thu Jan  8 2010 Karel Zak <kzak at redhat.com> 2.17-1
- upgrade to the final 2.17
  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-ReleaseNotes
  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-ChangeLog
- fix #545147 - util-linux-ng : Violation of the Packaging Guidelines
  (remove uuid and blkid static libs)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	9 Dec 2009 12:52:55 -0000	1.23
+++ .cvsignore	8 Jan 2010 11:22:22 -0000	1.24
@@ -1,2 +1,2 @@
-util-linux-ng-2.17-rc2.tar.bz2
+util-linux-ng-2.17.tar.bz2
 floppy-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	9 Dec 2009 12:52:55 -0000	1.23
+++ sources	8 Jan 2010 11:22:22 -0000	1.24
@@ -1,2 +1,2 @@
-e8410e61fced33c6978c86c5b409f8c8  util-linux-ng-2.17-rc2.tar.bz2
+11cc8a0138019e7060dd275d47dbc096  util-linux-ng-2.17.tar.bz2
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- util-linux-ng.spec	14 Dec 2009 11:50:10 -0000	1.69
+++ util-linux-ng.spec	8 Jan 2010 11:22:22 -0000	1.70
@@ -1,14 +1,14 @@
-%define upstream_version %{version}-rc2
-
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.17
-Release: 0.6%{?dist}
+Release: 1%{?dist}
 License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
 
+%define upstream_version %{version}
+
 ### Features
 %if 0%{?rhel}
 %define include_raw 1
@@ -43,7 +43,7 @@ Source5: mount.tmpfs
 Source8: nologin.c
 Source9: nologin.8
 Source10: uuidd.init
-Source11: http://download.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.bz2
+Source11: http://sourceforge.net/projects/floppyutil/files/floppy/%{floppyver}/floppy-%{floppyver}.tar.bz2
 
 ### Obsoletes & Conflicts & Provides
 %ifarch alpha
@@ -397,6 +397,8 @@ done
 # omit info/dir file
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
+# remove static libs
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib{uuid,blkid}.a
 
 # find MO files
 %find_lang %name
@@ -682,7 +684,7 @@ fi
 
 %files -n libblkid-devel
 %defattr(-,root,root)
-%{_libdir}/libblkid.a
+#%{_libdir}/libblkid.a
 %{_libdir}/libblkid.so
 %{_includedir}/blkid
 %{_mandir}/man3/libblkid.3*
@@ -695,7 +697,7 @@ fi
 
 %files -n libuuid-devel
 %defattr(-,root,root)
-%{_libdir}/libuuid.a
+#%{_libdir}/libuuid.a
 %{_libdir}/libuuid.so
 %{_includedir}/uuid
 %{_mandir}/man3/uuid.3*
@@ -713,6 +715,13 @@ fi
 
 
 %changelog
+* Thu Jan  8 2010 Karel Zak <kzak at redhat.com> 2.17-1
+- upgrade to the final 2.17
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-ReleaseNotes
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-ChangeLog
+- fix #545147 - util-linux-ng : Violation of the Packaging Guidelines
+  (remove uuid and blkid static libs)
+
 * Mon Dec 14 2009 Karel Zak <kzak at redhat.com> 2.17-0.6
 - minor fixes in spec file (fix URL, add Requires, add LGPLv2+)