packages: xorg-lib-libX11/xorg-lib-libX11.spec - rel 3; revert latest chang...

[arekm]

Author: arekm                        Date: Sat Oct 16 09:14:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; revert latest change as it is not needed in multilib environment (just make sure you install the same package versions of botch arch)

---- Files affected:
packages/xorg-lib-libX11:
   xorg-lib-libX11.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: packages/xorg-lib-libX11/xorg-lib-libX11.spec
diff -u packages/xorg-lib-libX11/xorg-lib-libX11.spec:1.67 packages/xorg-lib-libX11/xorg-lib-libX11.spec:1.68
--- packages/xorg-lib-libX11/xorg-lib-libX11.spec:1.67	Fri Oct 15 11:46:16 2010
+++ packages/xorg-lib-libX11/xorg-lib-libX11.spec	Sat Oct 16 11:14:00 2010
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Podstawowa biblioteka kliencka protokołu X11
 Name:		xorg-lib-libX11
 Version:	1.3.6
-Release:	2
+Release:	3
 License:	MIT
 Group:		X11/Libraries
 Source0:	http://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
@@ -42,7 +42,8 @@
 BuildRequires:	xorg-proto-bigreqsproto-devel
 BuildRequires:	xorg-proto-xcmiscproto-devel
 %endif
-Requires:	%{name}-libs = %{version}-%{release}
+%{?with_xcb:Requires:	libxcb >= 1.2}
+Obsoletes:	libX11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,20 +52,6 @@
 %description -l pl.UTF-8
 Podstawowa biblioteka kliencka protokołu X11.
 
-%package libs
-Summary:	libX11 library itself
-Summary(pl.UTF-8):	Sama biblioteka libX11
-Group:		Libraries
-Requires(post,postun):	/sbin/ldconfig
-%{?with_xcb:Requires:	libxcb >= 1.2}
-Obsoletes:	libX11
-
-%description libs
-libX11 library itself.
-
-%description libs -l pl.UTF-8
-Sama biblioteka libX11.
-
 %package devel
 Summary:	Header files for libX11 library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libX11
@@ -137,10 +124,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	libs -p /sbin/ldconfig
-%postun	libs -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
-%pretrans libs
+%pretrans
 # this needs to be a dir
 if [ -L %{_libdir}/X11 ]; then
 	umask 022
@@ -151,6 +138,14 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog README
+%attr(755,root,root) %{_libdir}/libX11.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libX11.so.6
+%if %{with xcb}
+%attr(755,root,root) %{_libdir}/libX11-xcb.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libX11-xcb.so.1
+%endif
+%dir %{_libdir}/X11
+%{_libdir}/X11/Xcms.txt
 %dir %{_datadir}/X11
 %{_datadir}/X11/XErrorDB
 %dir %{_datadir}/X11/locale
@@ -224,17 +219,6 @@
 %lang(zh_TW) %{_datadir}/X11/locale/zh_TW.big5
 %{_mandir}/man5/*Compose.5x*
 
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libX11.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libX11.so.6
-%if %{with xcb}
-%attr(755,root,root) %{_libdir}/libX11-xcb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libX11-xcb.so.1
-%endif
-%dir %{_libdir}/X11
-%{_libdir}/X11/Xcms.txt
-
 %files devel
 %defattr(644,root,root,755)
 # PDF chosen - docs include pictures
@@ -268,6 +252,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2010/10/16 09:14:00  arekm
+- rel 3; revert latest change as it is not needed in multilib environment (just make sure you install the same package versions of botch arch)
+
 Revision 1.67  2010/10/15 09:46:16  baggins
 - rel 2
 - moved libraries to -libs package for multiarch installs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-lib-libX11/xorg-lib-libX11.spec?r1=1.67&r2=1.68&f=u