rpms/wayland
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Simplify -devel subpackage packaging

Browse Source 
Instead of 4 subpackages, wayland-devel + libwayland-client-devel +
libwayland-cursor-devel + libwayland-server-devel, just have a single
wayland-devel that has all the headers needed for linking.

This way, we can have a single -devel package which makes it easier to
install wayland headers to develop with it, but at the same time keeps
library subpackages separate so that the binary distro doesn't pull in
unneeded dependencies.
This commit is contained in:
Kalev Lember 2016-08-17 08:41:56 +02:00
parent 1ef05bc45e
commit ff86b2d061
1 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
wayland.spec
View File

@ -26,9 +26,21 @@ an X application, or a wayland client itself. The clients can be traditional
applications, X servers (rootless or fullscreen) or other display servers.
%package devel
Summary: Common headers for wayland
Summary: Development files for %{name}
Requires: libwayland-client%{?_isa} = %{version}-%{release}
Requires: libwayland-cursor%{?_isa} = %{version}-%{release}
Requires: libwayland-server%{?_isa} = %{version}-%{release}
# For upgrade path from F24
Provides: libwayland-client-devel = %{version}-%{release}
Obsoletes: libwayland-client-devel < 1.11.91
Provides: libwayland-cursor-devel = %{version}-%{release}
Obsoletes: libwayland-cursor-devel < 1.11.91
Provides: libwayland-server-devel = %{version}-%{release}
Obsoletes: libwayland-server-devel < 1.11.91
%description devel
Common headers for wayland
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package doc
Summary: Wayland development documentation
@ -52,26 +64,6 @@ Summary: Wayland server library
%description -n libwayland-server
Wayland server library
%package -n libwayland-client-devel
Summary: Headers and symlinks for developing wayland client applications
Requires: libwayland-client%{?_isa} = %{version}-%{release}
Requires: wayland-devel%{?_isa} = %{version}-%{release}
%description -n libwayland-client-devel
Headers and symlinks for developing wayland client applications.
%package -n libwayland-cursor-devel
Summary: Headers and symlinks for developing wayland cursor applications
Requires: libwayland-cursor%{?_isa} = %{version}-%{release}
Requires: wayland-devel%{?_isa} = %{version}-%{release}
%description -n libwayland-cursor-devel
Headers and symlinks for developing wayland cursor applications.
%package -n libwayland-server-devel
Summary: Headers and symlinks for developing wayland server applications
Requires: libwayland-server%{?_isa} = %{version}-%{release}
Requires: wayland-devel%{?_isa} = %{version}-%{release}
%description -n libwayland-server-devel
Headers and symlinks for developing wayland server applications.
%prep
%setup -q
@ -109,12 +101,10 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \
%files devel
%{_bindir}/wayland-scanner
%{_includedir}/wayland-util.h
%{_includedir}/wayland-egl.h
%{_includedir}/wayland-egl-core.h
%{_includedir}/wayland-version.h
%{_includedir}/wayland-*.h
%{_libdir}/pkgconfig/wayland-*.pc
%{_libdir}/libwayland-*.so
%{_datadir}/aclocal/wayland-scanner.m4
%{_libdir}/pkgconfig/wayland-scanner.pc
%dir %{_datadir}/wayland
%{_datadir}/wayland/wayland-scanner.mk
%{_datadir}/wayland/wayland.xml
@ -134,24 +124,10 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \
%files -n libwayland-server
%{_libdir}/libwayland-server.so.0*
%files -n libwayland-client-devel
%{_includedir}/wayland-client*.h
%{_libdir}/libwayland-client.so
%{_libdir}/pkgconfig/wayland-client.pc
%files -n libwayland-cursor-devel
%{_includedir}/wayland-cursor*.h
%{_libdir}/libwayland-cursor.so
%{_libdir}/pkgconfig/wayland-cursor.pc
%files -n libwayland-server-devel
%{_includedir}/wayland-server*.h
%{_libdir}/libwayland-server.so
%{_libdir}/pkgconfig/wayland-server.pc
%changelog
* Wed Aug 17 2016 Kalev Lember <klember@redhat.com> - 1.11.91-1
- Update to 1.11.91
- Simplify -devel subpackage packaging
* Wed Jun 01 2016 Kalev Lember <klember@redhat.com> - 1.11.0-1
- Update to 1.11.0