- group packages by server kind, separated xorg-xserver-common with common files...

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index adaae839b5fec04f0b3c18bf71a9fb55b20523ec..bcd189257f6f3de2a6ee40dea1e65462d757b2d8 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -35,7 +35,7 @@ Summary:      X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
 Version:       1.20.11
-Release:       1
+Release:       2
 License:       MIT
 Group:         X11/Servers
 Source0:       https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -164,6 +164,8 @@ Requires:   xorg-app-xkbcomp
 Requires:      xorg-lib-libXfont2 >= 2.0.0
 Requires:      xorg-lib-libpciaccess >= 0.12.901
 Requires:      xorg-lib-libxshmfence >= 1.1
+# for protocol.txt
+Requires:      xorg-xserver-common = %{version}-%{release}
 Suggests:      dbus-x11 >= 1.0
 %{?with_hal:Suggests:  hal}
 Suggests:      udev-acl >= 1:143
@@ -204,6 +206,73 @@ It requires proper driver for your display hardware.
 Serwer Xorg to podstawowy serwer X wyświetlający obraz na karcie
 graficznej. Do działania wymaga odpowiedniego sterownika.
 
+%package devel
+Summary:       Header files for X.org server
+Summary(pl.UTF-8):     Pliki nagłówkowe dla serwera X.org
+Group:         X11/Development/Libraries
+Requires:      Mesa-libGL-devel >= 7.8.0
+Requires:      libdrm-devel >= 2.4.89
+Requires:      pixman-devel >= %{pixman_ver}
+Requires:      xorg-lib-libXfont2-devel >= 2.0.0
+Requires:      xorg-lib-libpciaccess-devel >= 0.12.901
+Requires:      xorg-lib-libxkbfile-devel
+%{?with_dri2:Requires: xorg-proto-dri2proto-devel >= 2.8}
+%{?with_dri3:Requires: xorg-proto-dri3proto-devel >= 1.0}
+Requires:      xorg-proto-dri3proto-devel >= 1.0
+Requires:      xorg-proto-fontsproto-devel >= 2.1.3
+Requires:      xorg-proto-glproto-devel >= 1.4.17
+Requires:      xorg-proto-inputproto-devel >= 2.3
+Requires:      xorg-proto-kbproto-devel >= 1.0.3
+Requires:      xorg-proto-presentproto-devel >= 1.1
+Requires:      xorg-proto-randrproto-devel >= 1.6.0
+Requires:      xorg-proto-renderproto-devel >= 0.11
+Requires:      xorg-proto-resourceproto-devel >= 1.2.0
+Requires:      xorg-proto-scrnsaverproto-devel >= 1.1
+Requires:      xorg-proto-videoproto-devel
+Requires:      xorg-proto-xextproto-devel >= 1:7.3.0
+Requires:      xorg-proto-xf86driproto-devel >= 2.1.0
+Requires:      xorg-proto-xineramaproto-devel
+Requires:      xorg-proto-xproto-devel >= 7.0.31
+Obsoletes:     X11-Xserver-devel < 1:7.0.0
+Obsoletes:     XFree86-Xserver-devel < 1:7.0.0
+%{?with_glamor:Obsoletes:      glamor-devel}
+
+%description devel
+Header files for X.org server.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe dla serwera X.org.
+
+%package source
+Summary:       X.org server source code
+Summary(pl.UTF-8):     Pliki źródłowe dla serwera X.org
+Group:         X11/Development/Libraries
+
+%description source
+X.org server source code.
+
+%description source -l pl.UTF-8
+Pliki źródłowe dla serwera X.org.
+
+%package -n xorg-xserver-libglx
+Summary:       GLX extension library for X.org server
+Summary(pl.UTF-8):     Biblioteka rozszerzenia GLX dla serwera X.org
+Group:         X11/Servers
+Requires:      %{name} = %{version}-%{release}
+Requires:      Mesa-libGL >= 7.1.0
+%{?with_dri2:Requires: Mesa-libGL >= 9.2.0}
+# Mesa version glapi tables in glx/ dir come from
+Provides:      xorg-xserver-libglx(glapi) = 7.1.0
+Provides:      xorg-xserver-module(glx)
+Obsoletes:     X11-OpenGL-core < 1:7.0.0
+Obsoletes:     XFree86-OpenGL-core < 1:7.0.0
+
+%description -n xorg-xserver-libglx
+GLX extension library for X.org server.
+
+%description -n xorg-xserver-libglx -l pl.UTF-8
+Biblioteka rozszerzenia GLX dla serwera X.org.
+
 %package -n xorg-xserver-Xdmx
 Summary:       Xdmx - distributed multi-head X server
 Summary(pl.UTF-8):     Xdmx - rozproszony, wielomonitorowy serwer X
@@ -221,6 +290,33 @@ Xdmx - distributed multi-head X server.
 %description -n xorg-xserver-Xdmx -l pl.UTF-8
 Xdmx - rozproszony, wielomonitorowy serwer X.
 
+%package -n xorg-xserver-Xephyr
+Summary:       Xephyr - nested X server
+Summary(pl.UTF-8):     Xephyr - zagnieżdżony serwer X
+Group:         X11/Servers
+Requires:      Mesa-libGL >= 7.1.0
+%{?with_glamor:Requires:       libepoxy >= 1.5.4}
+Requires:      libxcb >= 1.9.3
+Requires:      pixman >= %{pixman_ver}
+Requires:      xorg-lib-libXfont2 >= 2.0.0
+
+%description -n xorg-xserver-Xephyr
+Xephyr is a kdrive server that outputs to a window on a pre-existing
+'host' X display. Think Xnest but with support for modern extensions
+like composite, damage and randr.
+
+Unlike Xnest which is an X proxy, i.e. limited to the capabilities of
+the host X server, Xephyr is a real X server which uses the host X
+server window as "framebuffer" via fast SHM XImages.
+
+It also has support for 'visually' debugging what the server is
+painting.
+
+%description -n xorg-xserver-Xephyr -l pl.UTF-8
+Xephyr jest serwerem opartym na kdrive wyświetlającym w oknie na
+istniejącym ekranie X. Można o nim myśleć jako o Xnest ze wsparciem do
+wspólczesnych rozszerzeń jak composite, damage i randr.
+
 %package -n xorg-xserver-Xnest
 Summary:       Xnest - nested X server
 Summary(pl.UTF-8):     Xnest - zagnieżdżony serwer X
@@ -255,33 +351,6 @@ Xnest - це сервер X Window System, який працює у вікні X
 для Xnest в той час, як Xnest керує вікнами та графічними запитами для
 своїх власних клієнтів.
 
-%package -n xorg-xserver-Xephyr
-Summary:       Xephyr - nested X server
-Summary(pl.UTF-8):     Xephyr - zagnieżdżony serwer X
-Group:         X11/Servers
-Requires:      Mesa-libGL >= 7.1.0
-%{?with_glamor:Requires:       libepoxy >= 1.5.4}
-Requires:      libxcb >= 1.9.3
-Requires:      pixman >= %{pixman_ver}
-Requires:      xorg-lib-libXfont2 >= 2.0.0
-
-%description -n xorg-xserver-Xephyr
-Xephyr is a kdrive server that outputs to a window on a pre-existing
-'host' X display. Think Xnest but with support for modern extensions
-like composite, damage and randr.
-
-Unlike Xnest which is an X proxy, i.e. limited to the capabilities of
-the host X server, Xephyr is a real X server which uses the host X
-server window as "framebuffer" via fast SHM XImages.
-
-It also has support for 'visually' debugging what the server is
-painting.
-
-%description -n xorg-xserver-Xephyr -l pl.UTF-8
-Xephyr jest serwerem opartym na kdrive wyświetlającym w oknie na
-istniejącym ekranie X. Można o nim myśleć jako o Xnest ze wsparciem do
-wspólczesnych rozszerzeń jak composite, damage i randr.
-
 %package -n xorg-xserver-Xvfb
 Summary:       Xvfb - virtual framebuffer X server
 Summary(pl.UTF-8):     Xvfb - serwer X z wirtualnym framebufferem
@@ -346,6 +415,8 @@ Requires:   xorg-lib-libX11 >= 1.6
 Requires:      xorg-lib-libXext >= 1.0.99.4
 Requires:      xorg-lib-libXfont2 >= 2.0.0
 Requires:      xorg-lib-libXi >= 1.2.99.1
+# for protocol.txt
+Requires:      xorg-xserver-common = %{version}-%{release}
 
 %description -n xorg-xserver-Xwayland
 Xwayland - server integrated into a Wayland window system.
@@ -353,72 +424,17 @@ Xwayland - server integrated into a Wayland window system.
 %description -n xorg-xserver-Xwayland -l pl.UTF-8
 Xwayland - serwer X integrowalny w Wayland.
 
-%package devel
-Summary:       Header files for X.org server
-Summary(pl.UTF-8):     Pliki nagłówkowe dla serwera X.org
-Group:         X11/Development/Libraries
-Requires:      Mesa-libGL-devel >= 7.8.0
-Requires:      libdrm-devel >= 2.4.89
-Requires:      pixman-devel >= %{pixman_ver}
-Requires:      xorg-lib-libXfont2-devel >= 2.0.0
-Requires:      xorg-lib-libpciaccess-devel >= 0.12.901
-Requires:      xorg-lib-libxkbfile-devel
-%{?with_dri2:Requires: xorg-proto-dri2proto-devel >= 2.8}
-%{?with_dri3:Requires: xorg-proto-dri3proto-devel >= 1.0}
-Requires:      xorg-proto-dri3proto-devel >= 1.0
-Requires:      xorg-proto-fontsproto-devel >= 2.1.3
-Requires:      xorg-proto-glproto-devel >= 1.4.17
-Requires:      xorg-proto-inputproto-devel >= 2.3
-Requires:      xorg-proto-kbproto-devel >= 1.0.3
-Requires:      xorg-proto-presentproto-devel >= 1.1
-Requires:      xorg-proto-randrproto-devel >= 1.6.0
-Requires:      xorg-proto-renderproto-devel >= 0.11
-Requires:      xorg-proto-resourceproto-devel >= 1.2.0
-Requires:      xorg-proto-scrnsaverproto-devel >= 1.1
-Requires:      xorg-proto-videoproto-devel
-Requires:      xorg-proto-xextproto-devel >= 1:7.3.0
-Requires:      xorg-proto-xf86driproto-devel >= 2.1.0
-Requires:      xorg-proto-xineramaproto-devel
-Requires:      xorg-proto-xproto-devel >= 7.0.31
-Obsoletes:     X11-Xserver-devel < 1:7.0.0
-Obsoletes:     XFree86-Xserver-devel < 1:7.0.0
-%{?with_glamor:Obsoletes:      glamor-devel}
-
-%description devel
-Header files for X.org server.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe dla serwera X.org.
-
-%package source
-Summary:       X.org server source code
-Summary(pl.UTF-8):     Pliki źródłowe dla serwera X.org
-Group:         X11/Development/Libraries
-
-%description source
-X.org server source code.
-
-%description source -l pl.UTF-8
-Pliki źródłowe dla serwera X.org.
-
-%package -n xorg-xserver-libglx
-Summary:       GLX extension library for X.org server
-Summary(pl.UTF-8):     Biblioteka rozszerzenia GLX dla serwera X.org
+%package -n xorg-xserver-common
+Summary:       Common files for various X servers
+Summary(pl.UTF-8):     Pliki wspólne dla serwerów X
 Group:         X11/Servers
-Requires:      %{name} = %{version}-%{release}
-Requires:      Mesa-libGL >= 7.1.0
-%{?with_dri2:Requires: Mesa-libGL >= 9.2.0}
-# Mesa version glapi tables in glx/ dir come from
-Provides:      xorg-xserver-libglx(glapi) = 7.1.0
-Provides:      xorg-xserver-module(glx)
-Obsoletes:     X11-OpenGL-core < 1:7.0.0
-Obsoletes:     XFree86-OpenGL-core < 1:7.0.0
+Conflicts:     xorg-xserver-server < 1.20.11-2
 
-%description -n xorg-xserver-libglx
-GLX extension library for X.org server.
+%description -n xorg-xserver-common
+Common files for various X servers.
 
-%description -n xorg-xserver-libglx -l pl.UTF-8
-Biblioteka rozszerzenia GLX dla serwera X.org.
+%description -n xorg-xserver-common -l pl.UTF-8
+Pliki wspólne dla serwerów X.
 
 %prep
 %setup -q -n xorg-server-%{version}
@@ -584,8 +600,6 @@ fi
 %attr(4755,root,root) %{_bindir}/Xwrapper
 %attr(755,root,root) %{_bindir}/cvt
 %attr(755,root,root) %{_bindir}/gtf
-%dir %{_libdir}/xorg
-%{_libdir}/xorg/protocol.txt
 %attr(755,root,root) %{_libdir}/xorg/Xorg
 %attr(4755,root,root) %{_libdir}/xorg/Xorg.wrap
 %dir %{_libdir}/xorg/modules
@@ -622,7 +636,6 @@ fi
 %verify(not md5 mtime size) %{_datadir}/X11/xorg.conf.d/10-quirks.conf
 %{_mandir}/man1/Xorg.1*
 %{_mandir}/man1/Xorg.wrap.1*
-%{_mandir}/man1/Xserver.1*
 %{_mandir}/man1/cvt.1*
 %{_mandir}/man1/gtf.1*
 %{_mandir}/man4/exa.4*
@@ -632,6 +645,23 @@ fi
 %{_mandir}/man5/xorg.conf.5*
 %{_mandir}/man5/xorg.conf.d.5*
 
+%files devel
+%defattr(644,root,root,755)
+%doc doc/{Xinput,Xserver-spec}.html %{?with_systemtap:doc/dtrace/Xserver-DTrace.html}
+%{_includedir}/xorg
+%{_aclocaldir}/xorg-server.m4
+%{_pkgconfigdir}/xorg-server.pc
+
+%files source
+%defattr(644,root,root,755)
+# keep file perms from install time, but have default defattr to keep adapter happy
+%defattr(-,root,root,755)
+%{_usrsrc}/%{name}-%{version}
+
+%files -n xorg-xserver-libglx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
+
 %if %{with dmx}
 %files -n xorg-xserver-Xdmx
 %defattr(644,root,root,755)
@@ -680,19 +710,8 @@ fi
 %attr(755,root,root) %{_bindir}/Xwayland
 %endif
 
-%files devel
+%files -n xorg-xserver-common
 %defattr(644,root,root,755)
-%doc doc/{Xinput,Xserver-spec}.html %{?with_systemtap:doc/dtrace/Xserver-DTrace.html}
-%{_includedir}/xorg
-%{_aclocaldir}/xorg-server.m4
-%{_pkgconfigdir}/xorg-server.pc
-
-%files source
-%defattr(644,root,root,755)
-# keep file perms from install time, but have default defattr to keep adapter happy
-%defattr(-,root,root,755)
-%{_usrsrc}/%{name}-%{version}
-
-%files -n xorg-xserver-libglx
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
+%dir %{_libdir}/xorg
+%{_libdir}/xorg/protocol.txt
+%{_mandir}/man1/Xserver.1*