X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xorg-lib-libX11.spec;h=59f0dcab3ce43bbb393615e40b240b4596f079ef;hb=791d9d4;hp=af870221a3e0f2ac8d43ae3e729938de50bf1bf5;hpb=0414a82efe8bbc7e82558d805d959f79ed790cd1;p=packages%2Fxorg-lib-libX11.git diff --git a/xorg-lib-libX11.spec b/xorg-lib-libX11.spec index af87022..59f0dca 100644 --- a/xorg-lib-libX11.spec +++ b/xorg-lib-libX11.spec @@ -1,144 +1,304 @@ # # Conditional build: -%bcond_with xcb # use XCB for low-level protocol implementation -# -Summary: X11 Base library -Summary(pl): Podstawowa biblioteka X11 +%bcond_without static_libs # don't build static library + +Summary: Core X11 protocol client library +Summary(pl.UTF-8): Podstawowa biblioteka kliencka protokołu X11 Name: xorg-lib-libX11 -Version: 1.0.99.2 -Release: 2 +Version: 1.8.1 +Release: 1 License: MIT Group: X11/Libraries -Source0: http://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2 -# Source0-md5: dd6926633daaf267ef39ad4f23622529 +Source0: https://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.xz +# Source0-md5: 6b20033f88f0be3d870449c47f1e10a8 +# sync locales and their encodings with glibc Patch0: %{name}-glibc-locale_sync.patch -URL: http://xorg.freedesktop.org/ -BuildRequires: autoconf >= 2.57 +URL: https://xorg.freedesktop.org/ +BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: cpp +BuildRequires: docbook-dtd43-xml BuildRequires: libtool -%{?with_xcb:BuildRequires: libxcb-devel >= 0.9.92} +BuildRequires: libxcb-devel >= 1.11.1 +BuildRequires: perl-Encode BuildRequires: pkgconfig >= 1:0.19 -BuildRequires: xorg-proto-bigreqsproto-devel +BuildRequires: rpm-build >= 4.6 +BuildRequires: sed >= 4.0 +BuildRequires: tar >= 1:1.22 +BuildRequires: xmlto >= 0.0.22 +BuildRequires: xorg-lib-xtrans-devel BuildRequires: xorg-proto-inputproto-devel BuildRequires: xorg-proto-kbproto-devel -BuildRequires: xorg-proto-xcmiscproto-devel BuildRequires: xorg-proto-xextproto-devel -BuildRequires: xorg-proto-xf86bigfontproto-devel -BuildRequires: xorg-proto-xproto-devel >= 7.0.6 -BuildRequires: xorg-lib-libXdmcp-devel -BuildRequires: xorg-lib-libXau-devel -BuildRequires: xorg-lib-xtrans-devel -BuildRequires: xorg-util-util-macros >= 1.1.0 -Obsoletes: libX11 +BuildRequires: xorg-proto-xf86bigfontproto-devel >= 1.2.0 +BuildRequires: xorg-proto-xproto-devel >= 7.0.25 +BuildRequires: xorg-sgml-doctools >= 1.10 +BuildRequires: xorg-util-util-macros >= 1.15 +BuildRequires: xz +Requires: %{name}-data = %{version}-%{release} +Requires: libxcb >= 1.11.1 +Obsoletes: libX11 < 6.3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -X11 Base library. +Core X11 protocol client library. + +%description -l pl.UTF-8 +Podstawowa biblioteka kliencka protokołu X11. + +%package data +Summary: Data files for libX11 library +Summary(pl.UTF-8): Pliki danych biblioteki libX11 +Group: X11/Libraries +Conflicts: xorg-lib-libX11 < 1.6.3-2 +BuildArch: noarch -%description -l pl -Podstawowa biblioteka X11. +%description data +Data files for libX11 library. + +%description data -l pl.UTF-8 +Pliki danych biblioteki libX11. %package devel Summary: Header files for libX11 library -Summary(pl): Pliki nag³ówkowe biblioteki libX11 +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libX11 Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -%{?with_xcb:Requires: libxcb-devel >= 0.9.92} -Requires: xorg-lib-libXau-devel -Requires: xorg-lib-libXdmcp-devel -Requires: xorg-proto-kbproto-devel -Requires: xorg-proto-xproto-devel >= 7.0.6 -Obsoletes: libX11-devel +Requires: libxcb-devel >= 1.11.1 +# after removal +Requires: xorg-proto-kbproto-devel >= 1.0.7-2019.1.3 +Requires: xorg-proto-xproto-devel >= 7.0.25 +Obsoletes: libX11-devel < 6.3 %description devel -X11 Base library. +Core X11 protocol client library. This package contains the header files needed to develop programs that use libX11. -%description devel -l pl -Podstawowa biblioteka X11. +%description devel -l pl.UTF-8 +Podstawowa biblioteka kliencka protokołu X11. -Pakiet zawiera pliki nag³ówkowe niezbêdne do kompilowania programów -u¿ywaj±cych biblioteki libX11. +Pakiet zawiera pliki nagłówkowe niezbędne do kompilowania programów +używających biblioteki libX11. %package static Summary: Static libX11 library -Summary(pl): Biblioteka statyczna libX11 +Summary(pl.UTF-8): Biblioteka statyczna libX11 Group: X11/Development/Libraries Requires: %{name}-devel = %{version}-%{release} -Obsoletes: libX11-static +Obsoletes: libX11-static < 6.3 %description static -X11 Base library. +Core X11 protocol client library. This package contains the static libX11 library. -%description static -l pl -Podstawowa biblioteka X11. +%description static -l pl.UTF-8 +Podstawowa biblioteka kliencka protokołu X11. -Pakiet zawiera statyczn± bibliotekê libX11. +Pakiet zawiera statyczną bibliotekę libX11. %prep %setup -q -n libX11-%{version} +# do we need this patch for anything? (aka is any pld user in need for these new locales) +# https://bugs.freedesktop.org/show_bug.cgi?id=7415 %patch0 -p1 +# support __libmansuffix__ and __filemansuffix__ with "x" suffix (per FHS 2.3) +%{__sed} -i -e 's,\.so man__libmansuffix__/,.so man3/,' \ + -e 's,\.so man__filemansuffix__/,.so man5/,' man/*.man + %build %{__libtoolize} -%{__aclocal} +%{__aclocal} -I m4 %{__autoconf} %{__autoheader} %{__automake} %configure \ - %{!?with_xcb:--without-xcb} + %{!?with_static_libs:--disable-static} %{__make} %install rm -rf $RPM_BUILD_ROOT - %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - pkgconfigdir=%{_pkgconfigdir} - + INSTALL="install -p" \ + DESTDIR=$RPM_BUILD_ROOT + +%{__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 + +# for xorg-app-x11perf and possibly others +install -d $RPM_BUILD_ROOT%{_libdir}/X11 + %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%pretrans +# this needs to be a dir +if [ -L %{_libdir}/X11 ]; then + umask 022 + mv -f %{_libdir}/X11{,.rpmsave} + mkdir %{_libdir}/X11 +fi + %files %defattr(644,root,root,755) -%doc AUTHORS COPYING ChangeLog README %attr(755,root,root) %{_libdir}/libX11.so.*.*.* -%if %{with xcb} +%attr(755,root,root) %ghost %{_libdir}/libX11.so.6 %attr(755,root,root) %{_libdir}/libX11-xcb.so.*.*.* -%endif +%attr(755,root,root) %ghost %{_libdir}/libX11-xcb.so.1 %dir %{_libdir}/X11 -%{_libdir}/X11/Xcms.txt + +%files data +%defattr(644,root,root,755) +%doc AUTHORS COPYING ChangeLog README.md %dir %{_datadir}/X11 %{_datadir}/X11/XErrorDB -%{_datadir}/X11/XKeysymDB -%{_datadir}/X11/locale +%{_datadir}/X11/Xcms.txt +%dir %{_datadir}/X11/locale +%{_datadir}/X11/locale/compose.dir +%{_datadir}/X11/locale/locale.alias +%{_datadir}/X11/locale/locale.dir +%{_datadir}/X11/locale/C +%{_datadir}/X11/locale/en_US.UTF-8 + +# encodings, not really lang taggable +%{_datadir}/X11/locale/armscii-8 +%{_datadir}/X11/locale/georgian-academy +%{_datadir}/X11/locale/georgian-ps +%{_datadir}/X11/locale/ibm-cp1133 +%{_datadir}/X11/locale/iscii-dev +%{_datadir}/X11/locale/isiri-3342 +%{_datadir}/X11/locale/iso8859-1 +%{_datadir}/X11/locale/iso8859-10 +%{_datadir}/X11/locale/iso8859-11 +%{_datadir}/X11/locale/iso8859-13 +%{_datadir}/X11/locale/iso8859-14 +%{_datadir}/X11/locale/iso8859-15 +%{_datadir}/X11/locale/iso8859-16 +%{_datadir}/X11/locale/iso8859-2 +%{_datadir}/X11/locale/iso8859-3 +%{_datadir}/X11/locale/iso8859-4 +%{_datadir}/X11/locale/iso8859-5 +%{_datadir}/X11/locale/iso8859-6 +%{_datadir}/X11/locale/iso8859-7 +%{_datadir}/X11/locale/iso8859-8 +%{_datadir}/X11/locale/iso8859-9 +%{_datadir}/X11/locale/iso8859-9e +%{_datadir}/X11/locale/koi8-c +%{_datadir}/X11/locale/koi8-r +%{_datadir}/X11/locale/koi8-t +%{_datadir}/X11/locale/koi8-u +%{_datadir}/X11/locale/microsoft-cp1251 +%{_datadir}/X11/locale/microsoft-cp1255 +%{_datadir}/X11/locale/microsoft-cp1256 +%{_datadir}/X11/locale/mulelao-1 +%{_datadir}/X11/locale/nokhchi-1 +%{_datadir}/X11/locale/tatar-cyr +%{_datadir}/X11/locale/tscii-0 + +%lang(am) %{_datadir}/X11/locale/am_ET.UTF-8 +%lang(cs) %{_datadir}/X11/locale/cs_CZ.UTF-8 +%lang(el) %{_datadir}/X11/locale/el_GR.UTF-8 +%lang(fi) %{_datadir}/X11/locale/fi_FI.UTF-8 +%lang(ja) %{_datadir}/X11/locale/ja +%lang(ja) %{_datadir}/X11/locale/ja.JIS +%lang(ja) %{_datadir}/X11/locale/ja.SJIS +%lang(ja) %{_datadir}/X11/locale/ja_JP.UTF-8 +%lang(km) %{_datadir}/X11/locale/km_KH.UTF-8 +%lang(ko) %{_datadir}/X11/locale/ko +%lang(ko) %{_datadir}/X11/locale/ko_KR.UTF-8 +%lang(pt_BR) %{_datadir}/X11/locale/pt_BR.UTF-8 +%lang(pt) %{_datadir}/X11/locale/pt_PT.UTF-8 +%lang(ru) %{_datadir}/X11/locale/ru_RU.UTF-8 +%lang(sr) %{_datadir}/X11/locale/sr_RS.UTF-8 +%lang(th) %{_datadir}/X11/locale/th_TH +%lang(th) %{_datadir}/X11/locale/th_TH.UTF-8 +%lang(vi) %{_datadir}/X11/locale/vi_VN.tcvn +%lang(vi) %{_datadir}/X11/locale/vi_VN.viscii +%lang(zh_CN) %{_datadir}/X11/locale/zh_CN +%lang(zh_CN) %{_datadir}/X11/locale/zh_CN.UTF-8 +%lang(zh_CN) %{_datadir}/X11/locale/zh_CN.gb18030 +%lang(zh_CN) %{_datadir}/X11/locale/zh_CN.gbk +%lang(zh_HK) %{_datadir}/X11/locale/zh_HK.UTF-8 +%lang(zh_HK) %{_datadir}/X11/locale/zh_HK.big5 +%lang(zh_HK) %{_datadir}/X11/locale/zh_HK.big5hkscs +%lang(zh_TW) %{_datadir}/X11/locale/zh_TW +%lang(zh_TW) %{_datadir}/X11/locale/zh_TW.UTF-8 +%lang(zh_TW) %{_datadir}/X11/locale/zh_TW.big5 +%{_mandir}/man5/Compose.5* +%{_mandir}/man5/XCompose.5* %files devel %defattr(644,root,root,755) +%doc specs/rpm-doc/* %attr(755,root,root) %{_libdir}/libX11.so -%{_libdir}/libX11.la -%{_includedir}/X11/*.h -%{_pkgconfigdir}/x11.pc -%if %{with xcb} %attr(755,root,root) %{_libdir}/libX11-xcb.so +%{_libdir}/libX11.la %{_libdir}/libX11-xcb.la -#%{_includedir}/X11/Xlib-xcb.h (already included in *.h above) +%{_includedir}/X11/ImUtil.h +%{_includedir}/X11/XKBlib.h +%{_includedir}/X11/Xcms.h +%{_includedir}/X11/Xlib.h +%{_includedir}/X11/Xlib-xcb.h +%{_includedir}/X11/XlibConf.h +%{_includedir}/X11/Xlibint.h +%{_includedir}/X11/Xlocale.h +%{_includedir}/X11/Xregion.h +%{_includedir}/X11/Xresource.h +%{_includedir}/X11/Xutil.h +%{_includedir}/X11/cursorfont.h +%{_includedir}/X11/extensions/XKBgeom.h +%{_pkgconfigdir}/x11.pc %{_pkgconfigdir}/x11-xcb.pc -%endif -%{_mandir}/man3/*.3x* +%{_mandir}/man3/AllPlanes.3* +%{_mandir}/man3/Bitmap*.3* +%{_mandir}/man3/BlackPixel*.3* +%{_mandir}/man3/CellsOfScreen.3* +%{_mandir}/man3/ClientWhitePointOfCCC.3* +%{_mandir}/man3/ConnectionNumber.3* +%{_mandir}/man3/Default*.3* +%{_mandir}/man3/Display*.3* +%{_mandir}/man3/DoesBackingStore.3* +%{_mandir}/man3/DoesSaveUnders.3* +%{_mandir}/man3/EventMaskOfScreen.3* +%{_mandir}/man3/HeightMMOfScreen.3* +%{_mandir}/man3/HeightOfScreen.3* +%{_mandir}/man3/ImageByteOrder.3* +%{_mandir}/man3/Is*Key.3* +%{_mandir}/man3/LastKnownRequestProcessed.3* +%{_mandir}/man3/MaxCmapsOfScreen.3* +%{_mandir}/man3/MinCmapsOfScreen.3* +%{_mandir}/man3/NextRequest.3* +%{_mandir}/man3/PlanesOfScreen.3* +%{_mandir}/man3/ProtocolRevision.3* +%{_mandir}/man3/ProtocolVersion.3* +%{_mandir}/man3/QLength.3* +%{_mandir}/man3/RootWindow*.3* +%{_mandir}/man3/Screen*.3* +%{_mandir}/man3/ServerVendor.3* +%{_mandir}/man3/VendorRelease.3* +%{_mandir}/man3/VisualOfCCC.3* +%{_mandir}/man3/WhitePixel*.3* +%{_mandir}/man3/WidthMMOfScreen.3* +%{_mandir}/man3/WidthOfScreen.3* +%{_mandir}/man3/X*.3* +%if %{with static_libs} %files static %defattr(644,root,root,755) %{_libdir}/libX11.a -%if %{with xcb} %{_libdir}/libX11-xcb.a %endif