up to 1.7.2

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

diff --git a/xorg-lib-libX11.spec b/xorg-lib-libX11.spec
index b74e01f4fe3a6b5031210c0946dfb92feab963da..aba0b88a9be39ed28b6bda1309b08f14dd9e5c6e 100644 (file)
--- a/xorg-lib-libX11.spec
+++ b/xorg-lib-libX11.spec
@@ -5,12 +5,12 @@
 Summary:       Core X11 protocol client library
 Summary(pl.UTF-8):     Podstawowa biblioteka kliencka protokołu X11
 Name:          xorg-lib-libX11
-Version:       1.6.9
+Version:       1.7.2
 Release:       1
 License:       MIT
 Group:         X11/Libraries
 Source0:       https://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
-# Source0-md5: 55adbfb6d4370ecac5e70598c4e7eed2
+# Source0-md5: a9a24be62503d5e34df6b28204956a7b
 # sync locales and their encodings with glibc
 Patch0:                %{name}-glibc-locale_sync.patch
 URL:           https://xorg.freedesktop.org/
@@ -29,7 +29,7 @@ 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
 Requires:      %{name}-data = %{version}-%{release}
@@ -48,9 +48,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,7 +64,7 @@ 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
+Requires:      xorg-proto-xproto-devel >= 7.0.25
 Obsoletes:     libX11-devel
 
 %description devel
@@ -138,9 +136,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 +220,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