+# NOTE: when updating spec, adjust particular proto versions!
+
# whole package version
-%define ver 2018.2
+%define ver 2019.1
+# package release
+%define rel 3
# subpackage versions (see .pc files) # last standalone spec EVR as comment
%define applewm_ver 1.4.2 # 1.2.0-1
%define bigreqs_ver 1.1.2 # 1.1.2-2
%define damage_ver 1.2.1 # 1.2.1-2
%define dmx_ver 2.3.1 # 2.3.1-2
%define dri2_ver 2.8 # 2.8-2
-%define dri3_ver 1.0 # 1.0-2
+%define dri3_ver 1.2 # 1.0-2
%define evie_ver 1.1.1 # evieext-1.1.1-2
%define fixes_ver 5.0 # 5.0-2
%define fontcache_ver 0.1.3 # 0.1.3-2
%define input_ver 2.3.2 # 2.3.2-1
%define kb_ver 1.0.7 # 1.0.7-1
%define lg3d_ver 5.0 # (none)
-%define present_ver 1.1 # 1.1-1
+%define present_ver 1.2 # 1.1-1
%define print_ver 1.0.5 # 1.0.5-2
-%define randr_ver 1.5.0 # 1.5.0-1
+%define randr_ver 1.6.0 # 1.5.0-1
%define record_ver 1.14.2 # 1.14.2-2
%define render_ver 0.11.1 # 0.11.1-2
%define resource_ver 1.2.0 # 1.2.0-2
-%define scrnsaver_ver 1.2.2 # 1.2.2-2
+%define scrnsaver_ver 1.2.3 # 1.2.2-2
%define trap_ver 3.4.3 # 3.4.3-3
%define video_ver 2.3.3 # 2.3.3-1
%define windowswm_ver 1.0.4 # 1.0.4-2
%define xproxymng_ver 1.0.3 # xproxymanagementprotocol-1.0.3-3
# Conditional build:
-%bcond_with foreign # foreign OS protocols (applewm, windowswm)
+%bcond_without foreign # foreign OS protocols (applewm, windowswm)
%bcond_without legacy # legacy protocols (XCalibrate, evie, fontcache, lg3d, print, xf86rush)
Summary: Header files of X Window System Unified Protocol
Summary(pl.UTF-8): Pliki nagłówkowe zunifikowanego protokołu systemu X Window
Name: xorg-proto-xorgproto
-Version: 2018.2
-# bump release on updates unless all subpackage versions are increased!
-Release: 4
+Version: %{ver}
+Release: %{ver}.%{rel}
License: MIT
Group: X11/Development/Libraries
Source0: https://xorg.freedesktop.org/releases/individual/proto/xorgproto-%{ver}.tar.bz2
-# Source0-md5: 490677ddbc649b177eda7ddb8d3e2074
+# Source0-md5: 802ccb9e977ba3cf94ba798ddb2898a4
URL: https://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: docbook-dtd43-xml
+BuildRequires: libxslt-progs
BuildRequires: xmlto >= 0.0.22
BuildRequires: xorg-sgml-doctools >= 1.8
BuildRequires: xorg-util-util-macros >= 1.12
Summary: Composite extension headers
Summary(pl.UTF-8): Pliki nagłówkowe rozszerzenia Composite
Version: %{composite_ver}
-Requires: xorg-proto-fixesproto-devel = %{x_ver}-%{release}
+Requires: xorg-proto-fixesproto-devel = %{fixes_ver}-%{release}
Obsoletes: compositeext
%description -n xorg-proto-compositeproto-devel
Summary(pl.UTF-8): Pliki nagłówkowe rozszerzenia Damage
Version: %{damage_ver}
Group: X11/Development/Libraries
-Requires: xorg-proto-fixesproto-devel = %{damage_ver}-%{release}
+Requires: xorg-proto-fixesproto-devel = %{fixes_ver}-%{release}
Obsoletes: damageext
%description -n xorg-proto-damageproto-devel
rozszerzenia WindowsWM do protokołu X11, służącego do współpracy
między serwerem X11 a natywnym zarządcą okien Microsoft Windows.
+%package -n xorg-proto-xcalibrateproto-devel
+Summary: XCalibrate extension headers
+Summary(pl.UTF-8): Pliki nagłówkowe rozszerzenia XCalibrate
+Version: %{xcalibrate_ver}
+Group: X11/Development/Libraries
+# just for dirs
+Requires: xorg-proto-xproto-devel = %{x_ver}-%{release}
+
+%description -n xorg-proto-xcalibrateproto-devel
+XCalibrate extension headers.
+
+%description -n xorg-proto-xcalibrateproto-devel -l pl.UTF-8
+Pliki nagłówkowe rozszerzenia XCalibrate.
+
%package -n xorg-proto-xcmiscproto-devel
Summary: XCMisc extension headers
Summary(pl.UTF-8): Pliki nagłówkowe rozszerzenia XCMisc
%package -n xorg-proto-xf86driproto-devel
Summary: XF86DRI extension headers
Summary(pl.UTF-8): Pliki nagłówkowe rozszerzenia XF86DRI
+Version: %{xf86dri_ver}
Group: X11/Development/Libraries
Requires: libdrm-devel
Requires: xorg-proto-xproto-devel = %{x_ver}-%{release}
--build=%{_host} \
%endif
%{?with_legacy:--enable-legacy} \
- --disable-specs \
--without-fop
%{__make}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# moved to libX11 >= 1.6.9
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/X11/extensions/XKBgeom.h
+# moved to libXvMC >= 1.0.12
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/X11/extensions/vldXvMC.h
+
%if %{without foreign}
%{__rm} $RPM_BUILD_ROOT%{_includedir}/X11/extensions/{applewm,windowswm}*.h
%{__rm} $RPM_BUILD_ROOT%{_npkgconfigdir}/{applewmproto,windowswmproto}.pc
%endif
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/{bigreqsproto,fontsproto,kbproto,recordproto,scrnsaverproto,xcmiscproto,xextproto,xorgproto,xproto}
+
%clean
rm -rf $RPM_BUILD_ROOT
%files -n xorg-proto-bigreqsproto-devel
%defattr(644,root,root,755)
-%doc COPYING-bigreqsproto
+%doc COPYING-bigreqsproto specs/bigreqsproto/bigreq.html
%{_includedir}/X11/extensions/bigreqs*.h
%{_npkgconfigdir}/bigreqsproto.pc
%files -n xorg-proto-fontcacheproto-devel
%defattr(644,root,root,755)
%doc COPYING-fontcacheproto
-%{_includedir}/X11/extensions/fontcache*.h
+%{_includedir}/X11/extensions/fontcach*.h
%{_npkgconfigdir}/fontcacheproto.pc
%endif
%files -n xorg-proto-fontsproto-devel
%defattr(644,root,root,755)
-%doc COPYING-fontsproto
+%doc COPYING-fontsproto specs/fontsproto/fsproto.html
%dir %{_includedir}/X11/fonts
%{_includedir}/X11/fonts/FS.h
%{_includedir}/X11/fonts/FSproto.h
%files -n xorg-proto-inputproto-devel
%defattr(644,root,root,755)
%doc COPYING-inputproto
+# specs/{XIproto.txt,XI2proto.txt}
%{_includedir}/X11/extensions/XI.h
%{_includedir}/X11/extensions/XIproto.h
%{_includedir}/X11/extensions/XI2.h
%files -n xorg-proto-kbproto-devel
%defattr(644,root,root,755)
-%doc COPYING-kbproto
+%doc COPYING-kbproto specs/kbproto/{XKBproto-*.svg,xkbproto.html}
%{_includedir}/X11/extensions/XKB.h
-%{_includedir}/X11/extensions/XKBgeom.h
%{_includedir}/X11/extensions/XKBproto.h
%{_includedir}/X11/extensions/XKBsrv.h
%{_includedir}/X11/extensions/XKBstr.h
%if %{with legacy}
%files -n xorg-proto-printproto-devel
%defattr(644,root,root,755)
-%doc COPYING-printproto
+%doc COPYING-printproto specs/printproto/xp_proto.ps
%{_includedir}/X11/extensions/Print*.h
%{_npkgconfigdir}/printproto.pc
+%{_mandir}/man7/Xprint.7*
%endif
%files -n xorg-proto-randrproto-devel
%files -n xorg-proto-recordproto-devel
%defattr(644,root,root,755)
-%doc COPYING-recordproto
+%doc COPYING-recordproto specs/recordproto/record.html
%{_includedir}/X11/extensions/record*.h
%{_npkgconfigdir}/recordproto.pc
%files -n xorg-proto-scrnsaverproto-devel
%defattr(644,root,root,755)
-%doc COPYING-scrnsaverproto
+%doc COPYING-scrnsaverproto specs/scrnsaverproto/saver.html
%{_includedir}/X11/extensions/saver*.h
%{_npkgconfigdir}/scrnsaverproto.pc
%{_includedir}/X11/extensions/Xvproto.h
%{_includedir}/X11/extensions/XvMC.h
%{_includedir}/X11/extensions/XvMCproto.h
-%{_includedir}/X11/extensions/vldXvMC.h
%{_npkgconfigdir}/videoproto.pc
%if %{with foreign}
%{_npkgconfigdir}/windowswmproto.pc
%endif
+%if %{with legacy}
+%files -n xorg-proto-xcalibrateproto-devel
+%defattr(644,root,root,755)
+%{_includedir}/X11/extensions/xcalibrate*.h
+%{_npkgconfigdir}/xcalibrateproto.pc
+%endif
+
%files -n xorg-proto-xcmiscproto-devel
%defattr(644,root,root,755)
-%doc COPYING-xcmiscproto
+%doc COPYING-xcmiscproto specs/xcmiscproto/xc-misc.html
%{_includedir}/X11/extensions/xcmisc*.h
%{_npkgconfigdir}/xcmiscproto.pc
%files -n xorg-proto-xextproto-devel
%defattr(644,root,root,755)
-%doc COPYING-xextproto
+%doc COPYING-xextproto specs/xextproto/{appgrp,dbe,dpms,evi,geproto,lbx,multibuf,security,shape,shm,sync,tog-cup,xtest}.html
%{_includedir}/X11/extensions/EVI*.h
%{_includedir}/X11/extensions/ag*.h
%{_includedir}/X11/extensions/cup*.h
%files -n xorg-proto-xproto-devel
%defattr(644,root,root,755)
-%doc AUTHORS COPYING-x11proto README
-# specs/*.html specs/SIAddresses/{IPv6,hostname,localuser}.txt
+%doc AUTHORS COPYING-x11proto README.md specs/SIAddresses/{IPv6,hostname,localuser}.txt specs/xproto/x11protocol.html
%{_includedir}/X11/DECkeysym.h
%{_includedir}/X11/HPkeysym.h
%{_includedir}/X11/Sunkeysym.h