#
# Conditional build:
%bcond_without static_libs # don't build static library
-%bcond_without xcb # XCB for low-level protocol implementation
-%bcond_without docs # 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.2
-Release: 3
+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: 001d780829f936e34851ef7cd37b4dfd
+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/
+URL: https://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: cpp
-%if %{with docs}
-# ps2pdf
-BuildRequires: ghostscript
-BuildRequires: groff
-%endif
+BuildRequires: docbook-dtd43-xml
BuildRequires: libtool
+BuildRequires: libxcb-devel >= 1.11.1
+BuildRequires: perl-Encode
BuildRequires: pkgconfig >= 1:0.19
+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-xextproto-devel
-BuildRequires: xorg-proto-xf86bigfontproto-devel
-BuildRequires: xorg-proto-xproto-devel >= 7.0.13
-BuildRequires: xorg-util-util-macros >= 1.3
-%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}
-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
%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 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.UTF-8): Pliki nagłówkowe biblioteki libX11
Group: X11/Development/Libraries
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
+Requires: libxcb-devel >= 1.11.1
+# after <X11/extensions/XKBgeom.h> 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
Core X11 protocol client library.
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
Core X11 protocol client library.
%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_static_libs:--disable-static} \
- %{!?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
%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
+
+%files data
+%defattr(644,root,root,755)
+%doc AUTHORS COPYING ChangeLog README.md
%dir %{_datadir}/X11
%{_datadir}/X11/XErrorDB
-%{_datadir}/X11/XKeysymDB
+%{_datadir}/X11/Xcms.txt
%dir %{_datadir}/X11/locale
%{_datadir}/X11/locale/compose.dir
%{_datadir}/X11/locale/locale.alias
%{_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.S90
%lang(ja) %{_datadir}/X11/locale/ja.SJIS
-%lang(ja) %{_datadir}/X11/locale/ja.U90
%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(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.5x*
+%{_mandir}/man5/Compose.5*
+%{_mandir}/man5/XCompose.5*
%files devel
%defattr(644,root,root,755)
-# PDF chosen - docs include pictures
-%{?with_docs:%doc specs/XIM/xim.pdf specs/i18n/{Framework,LocaleDB,Trans}.pdf specs/libX11/libX11.pdf}
+%doc specs/rpm-doc/*
%attr(755,root,root) %{_libdir}/libX11.so
+%attr(755,root,root) %{_libdir}/libX11-xcb.so
%{_libdir}/libX11.la
+%{_libdir}/libX11-xcb.la
%{_includedir}/X11/ImUtil.h
-%{_includedir}/X11/X*.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
-%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*
+%{_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
-%endif
projects / packages / xorg-lib-libX11.git / blobdiff