packages: open-vm-tools/open-vm-tools.spec - fixed libraries packaging - ad...

[megabajt]

Author: megabajt                     Date: Fri Feb 19 00:02:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed libraries packaging
- added missing ldconfig calls
- added -static subpackage
- release 5

---- Files affected:
packages/open-vm-tools:
   open-vm-tools.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: packages/open-vm-tools/open-vm-tools.spec
diff -u packages/open-vm-tools/open-vm-tools.spec:1.35 packages/open-vm-tools/open-vm-tools.spec:1.36
--- packages/open-vm-tools/open-vm-tools.spec:1.35	Mon Feb 15 16:27:00 2010
+++ packages/open-vm-tools/open-vm-tools.spec	Fri Feb 19 01:02:14 2010
@@ -8,7 +8,7 @@
 %define		snap	2009.12.16
 %define		rev	217847
 %define		modsrc	modules/linux
-%define		rel	4
+%define		rel	5
 Summary:	VMWare guest utilities
 Summary(pl.UTF-8):	Narzędzia dla systemu-gościa dla VMware
 Name:		open-vm-tools
@@ -22,7 +22,7 @@
 Source2:	%{name}-modprobe.d
 Source3:	%{name}-init
 Source4:	%{name}-vmware-user.desktop
-Patch0:     %{name}-libpng.patch
+Patch0:		%{name}-libpng.patch
 URL:		http://open-vm-tools.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.453
 %if %{with userspace}
@@ -74,6 +74,18 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe open-vm-tools.
 
+%package static
+Summary:	Static open-vm-tools libraries
+Summary(pl.UTF-8):	Statyczne biblioteki open-vm-tools
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static open-vm-tools libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki open-vm-tools.
+
 %package gui
 Summary:	VMware guest utitities
 Summary(pl.UTF-8):	Narzędzia dla systemu-gościa dla VMware.
@@ -299,7 +311,7 @@
 
 rm $RPM_BUILD_ROOT/sbin/mount.vmhgfs
 ln -sf %{_sbindir}/mount.vmhgfs $RPM_BUILD_ROOT/sbin/mount.vmhgfs
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/open-vm-tools/plugins/common/*.la
 
 install -d $RPM_BUILD_ROOT/etc/{modprobe.d,rc.d/init.d,xdg/autostart}
 cp %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/%{name}.conf
@@ -311,6 +323,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/ldconfig
 /sbin/chkconfig --add open-vm-tools
 %service open-vm-tools restart "Open Virtual Machine"
 
@@ -320,6 +333,8 @@
 	/sbin/chkconfig --del open-vm-tools
 fi
 
+%postun	-p /sbin/ldconfig
+
 %post	-n kernel%{_alt_kernel}-misc-pvscsi
 %depmod %{_kernel_ver}
 
@@ -366,8 +381,11 @@
 %attr(755,root,root) %{_bindir}/vmware-xferlogs
 %attr(755,root,root) %{_bindir}/vmware-vmblock-fuse
 %attr(755,root,root) %{_sbindir}/mount.vmhgfs
+%attr(755,root,root) %{_libdir}/libguestlib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libguestlib.so.0
+%attr(755,root,root) %{_libdir}/libvmtools.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvmtools.so.0
 %dir %{_libdir}/open-vm-tools
-%attr(755,root,root) %{_libdir}/lib*.so*
 %dir %{_libdir}/open-vm-tools/plugins
 %dir %{_libdir}/open-vm-tools/plugins/common
 %attr(755,root,root) %{_libdir}/open-vm-tools/plugins/common/libhgfsServer.so
@@ -384,6 +402,20 @@
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 /etc/modprobe.d/%{name}.conf
 
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libguestlib.so
+%attr(755,root,root) %{_libdir}/libvmtools.so
+%{_libdir}/libguestlib.la
+%{_libdir}/libvmtools.la
+%{_includedir}/vmGuestLib
+%{_pkgconfigdir}/vmguestlib.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libguestlib.a
+%{_libdir}/libvmtools.a
+
 %files gui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/vmware-toolbox
@@ -431,18 +463,18 @@
 /lib/modules/%{_kernel_ver}/misc/vsock.ko*
 %endif
 
-%files devel
-%defattr(644,root,root,755)
-%{_includedir}/vmGuestLib
-%{_pkgconfigdir}/vmguestlib.pc
-%{_libdir}/open-vm-tools/plugins/common/lib*.la
-
 %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.36  2010/02/19 00:02:14  megabajt
+- fixed libraries packaging
+- added missing ldconfig calls
+- added -static subpackage
+- release 5
+
 Revision 1.35  2010/02/15 15:27:00  megabajt
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/open-vm-tools/open-vm-tools.spec?r1=1.35&r2=1.36&f=u