- updated to 1.8.9

[packages/xorg-lib-libX11.git] / xorg-lib-libX11.spec

diff --git a/xorg-lib-libX11.spec b/xorg-lib-libX11.spec
index 6b700a25712c934abe4bdf016a1a68cbbbded2cc..20a0311dd914d2e9b0dc5256850f507ea8ed9b45 100644 (file)
--- a/xorg-lib-libX11.spec
+++ b/xorg-lib-libX11.spec
@@ -1,20 +1,20 @@
 #
 # Conditional build:
-%bcond_without static_libs     # don't build static library
+%bcond_without static_libs     # static libraries
 
 Summary:       Core X11 protocol client library
 Summary(pl.UTF-8):     Podstawowa biblioteka kliencka protokołu X11
 Name:          xorg-lib-libX11
-Version:       1.6.10
+Version:       1.8.9
 Release:       1
 License:       MIT
 Group:         X11/Libraries
-Source0:       https://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
-# Source0-md5: a2711ecb4dff08221286dd524194efb9
+Source0:       https://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.xz
+# Source0-md5: b006876e5b749d82801fe9450d700daf
 # sync locales and their encodings with glibc
 Patch0:                %{name}-glibc-locale_sync.patch
 URL:           https://xorg.freedesktop.org/
-BuildRequires: autoconf >= 2.60
+BuildRequires: autoconf >= 2.70
 BuildRequires: automake
 BuildRequires: cpp
 BuildRequires: docbook-dtd43-xml
@@ -22,19 +22,22 @@ 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 >= 1.2.0
-BuildRequires: xorg-proto-xproto-devel >= 7.0.21
+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
+Obsoletes:     libX11 < 6.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,9 +51,7 @@ 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
-%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
-%endif
 
 %description data
 Data files for libX11 library.
@@ -66,8 +67,8 @@ Requires:     %{name} = %{version}-%{release}
 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.21
-Obsoletes:     libX11-devel
+Requires:      xorg-proto-xproto-devel >= 7.0.25
+Obsoletes:     libX11-devel < 6.3
 
 %description devel
 Core X11 protocol client library.
@@ -86,7 +87,7 @@ Summary:      Static libX11 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.
@@ -128,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libX11
 
 cd specs
-for dir in XIM i18n/framework i18n/localedb i18n/trans libX11; do
+for dir in XIM XKB i18n/compose 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 || :
@@ -138,9 +139,6 @@ done
 # for xorg-app-x11perf and possibly others
 install -d $RPM_BUILD_ROOT%{_libdir}/X11
 
-# obsolete locale (rename to sr_RS / sr_ME?)
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/X11/locale/sr_CS.UTF-8
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -225,6 +223,7 @@ fi
 %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