Author: arekm Date: Mon Nov 22 06:06:39 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.4.0; xcb is no longer optional
---- Files affected: packages/xorg-lib-libX11: xorg-lib-libX11-glibc-locale_sync.patch (1.8 -> 1.9) , xorg-lib-libX11.spec (1.68 -> 1.69) ---- Diffs: ================================================================ Index: packages/xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch diff -u packages/xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch:1.8 packages/xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch:1.9 --- packages/xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch:1.8 Mon Sep 20 08:32:56 2010 +++ packages/xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch Mon Nov 22 07:06:34 2010 @@ -1052,7 +1052,7 @@ --- libX11-1.3/nls/locale.alias.pre.orig 2009-09-03 03:12:28.000000000 +0200 +++ libX11-1.3/nls/locale.alias.pre 2009-10-04 10:34:53.228614289 +0200 -@@ -17,17 +17,31 @@ +@@ -15,18 +15,32 @@ Cextend: en_US.ISO8859-1 Cextend.en: en_US.ISO8859-1 English_United-States.437: C @@ -1066,6 +1066,7 @@ +aa_er.u...@saaho: aa_ER.UTF-8 +aa_ET: aa_ET.UTF-8 +aa_ET.utf8: aa_ET.UTF-8 + C.UTF-8: en_US.UTF-8 XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3". -a3: a3_AZ.KOI8-C -a3_AZ: a3_AZ.KOI8-C @@ -2520,21 +2521,4 @@ en_US.UTF-8/XLC_LOCALE: tr_TR.UTF-8 en_US.UTF-8/XLC_LOCALE: ts_ZA.UTF-8 en_US.UTF-8/XLC_LOCALE: tt_RU.UTF-8 ---- libX11-1.0.2/configure.ac.orig 2006-06-23 01:22:12.000000000 +0200 -+++ libX11-1.0.2/configure.ac 2006-06-29 23:06:03.183418500 +0200 -@@ -374,6 +374,7 @@ - nls/iso8859-13/Makefile - nls/iso8859-14/Makefile - nls/iso8859-15/Makefile -+ nls/iso8859-16/Makefile - nls/iso8859-2/Makefile - nls/iso8859-3/Makefile - nls/iso8859-4/Makefile -@@ -392,6 +393,7 @@ - nls/ko/Makefile - nls/koi8-c/Makefile - nls/koi8-r/Makefile -+ nls/koi8-t/Makefile - nls/koi8-u/Makefile - nls/ko_KR.UTF-8/Makefile - nls/microsoft-cp1251/Makefile + ================================================================ Index: packages/xorg-lib-libX11/xorg-lib-libX11.spec diff -u packages/xorg-lib-libX11/xorg-lib-libX11.spec:1.68 packages/xorg-lib-libX11/xorg-lib-libX11.spec:1.69 --- packages/xorg-lib-libX11/xorg-lib-libX11.spec:1.68 Sat Oct 16 11:14:00 2010 +++ packages/xorg-lib-libX11/xorg-lib-libX11.spec Mon Nov 22 07:06:34 2010 @@ -2,18 +2,17 @@ # # Conditional build: %bcond_without static_libs # don't build static library -%bcond_without xcb # XCB for low-level protocol implementation %bcond_without doc # don't package devel docs (allows bootstrapping) # Summary: Core X11 protocol client library Summary(pl.UTF-8): Podstawowa biblioteka kliencka protokoĊu X11 Name: xorg-lib-libX11 -Version: 1.3.6 -Release: 3 +Version: 1.4.0 +Release: 1 License: MIT Group: X11/Libraries Source0: http://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2 -# Source0-md5: 8e0a8a466aa78f66e09fe06cb395319f +# Source0-md5: b63d9f7493a61df51d0c0be04ac435e4 # sync locales and their encodings with glibc Patch0: %{name}-glibc-locale_sync.patch URL: http://xorg.freedesktop.org/ @@ -34,15 +33,8 @@ BuildRequires: xorg-proto-xf86bigfontproto-devel BuildRequires: xorg-proto-xproto-devel >= 7.0.13 BuildRequires: xorg-util-util-macros >= 1.6 -%if %{with xcb} BuildRequires: libxcb-devel >= 1.2 -%else -BuildRequires: xorg-lib-libXau-devel -BuildRequires: xorg-lib-libXdmcp-devel -BuildRequires: xorg-proto-bigreqsproto-devel -BuildRequires: xorg-proto-xcmiscproto-devel -%endif -%{?with_xcb:Requires: libxcb >= 1.2} +Requires: libxcb >= 1.2 Obsoletes: libX11 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -59,12 +51,7 @@ Requires: %{name} = %{version}-%{release} Requires: xorg-proto-kbproto-devel Requires: xorg-proto-xproto-devel >= 7.0.13 -%if %{with xcb} Requires: libxcb-devel >= 1.2 -%else -Requires: xorg-lib-libXau-devel -Requires: xorg-lib-libXdmcp-devel -%endif Obsoletes: libX11-devel %description devel @@ -107,8 +94,7 @@ %{__autoheader} %{__automake} %configure \ - %{!?with_static_libs:--disable-static} \ - %{!?with_xcb:--without-xcb} + %{!?with_static_libs:--disable-static} %{__make} @@ -121,6 +107,15 @@ %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libX11 +cd specs +for dir in XIM i18n/framework i18n/localedb i18n/trans libX11; do + install -d rpm-doc/$dir + cp -a $dir/*.html rpm-doc/$dir + cp -a $dir/*.svg rpm-doc/$dir || : + sed -i -e "s#$RPM_BUILD_ROOT##g" rpm-doc/$dir/*.html +done + + %clean rm -rf $RPM_BUILD_ROOT @@ -140,10 +135,8 @@ %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 @@ -222,29 +215,25 @@ %files devel %defattr(644,root,root,755) # PDF chosen - docs include pictures -%{?with_doc:%doc specs/XIM/xim.pdf specs/i18n/{Framework,LocaleDB,Trans}.pdf specs/libX11/libX11.pdf} +%{?with_doc:%doc specs/rpm-doc/*} %attr(755,root,root) %{_libdir}/libX11.so %{_libdir}/libX11.la %{_includedir}/X11/ImUtil.h %{_includedir}/X11/X*.h %{_includedir}/X11/cursorfont.h %{_pkgconfigdir}/x11.pc -%if %{with xcb} %attr(755,root,root) %{_libdir}/libX11-xcb.so %{_libdir}/libX11-xcb.la #%{_includedir}/X11/Xlib-xcb.h (already included in X*.h above) %{_pkgconfigdir}/x11-xcb.pc -%endif %{_mandir}/man3/*.3x* %if %{with static_libs} %files static %defattr(644,root,root,755) %{_libdir}/libX11.a -%if %{with xcb} %{_libdir}/libX11-xcb.a %endif -%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -252,6 +241,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.69 2010/11/22 06:06:34 arekm +- up to 1.4.0; xcb is no longer optional + 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) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-lib-libX11/xorg-lib-libX11.spec?r1=1.68&r2=1.69&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
