Accepting request 120679 from home:vuntz:branches:X11:XOrg
Keep pkg-config file, but in a devel subpackage OBS-URL: https://build.opensuse.org/request/show/120679 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkbcomp?expand=0&rev=7
This commit is contained in:
parent
8f4a8421b4
commit
291f44b6ef
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 11 08:45:25 UTC 2012 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
- Split the pkg-config file in a devel subpackage, instead of
|
||||||
|
removing it: it might be needed by some configure scripts.
|
||||||
|
- Remove xkbcomp-devel Provides from main subpackage now that we
|
||||||
|
have a proper devel subpackage.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 11 08:22:43 UTC 2012 - coolo@suse.com
|
Fri May 11 08:22:43 UTC 2012 - coolo@suse.com
|
||||||
|
|
||||||
|
20
xkbcomp.spec
20
xkbcomp.spec
@ -32,16 +32,21 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.8
|
|||||||
BuildRequires: pkgconfig(xproto) >= 7.0.17
|
BuildRequires: pkgconfig(xproto) >= 7.0.17
|
||||||
# This was part of the xorg-x11 package up to version 7.6
|
# This was part of the xorg-x11 package up to version 7.6
|
||||||
Conflicts: xorg-x11 <= 7.6
|
Conflicts: xorg-x11 <= 7.6
|
||||||
# xkbcomp is 'sort of' a compiler, thus actually a -devel tool. Providing the symbol
|
|
||||||
# here helps to silence rpmlint and makes it easier in the future, should this ever
|
|
||||||
# become bigger and require a real split.
|
|
||||||
Provides: %{name}-devel = %{version}
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The xkbcomp keymap compiler converts a description of an XKB keymap
|
The xkbcomp keymap compiler converts a description of an XKB keymap
|
||||||
into one of several output formats.
|
into one of several output formats.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Utility to compile XKB keyboard description -- Development Files
|
||||||
|
Group: Development/Libraries/X11
|
||||||
|
Requires: %{name} = %{version}
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
The xkbcomp keymap compiler converts a description of an XKB keymap
|
||||||
|
into one of several output formats.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
@ -51,14 +56,15 @@ make %{?_smp_mflags}
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
# once we have something real to develop, we can split -devel
|
|
||||||
rm %{buildroot}%{_libdir}/pkgconfig/xkbcomp.pc
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc ChangeLog COPYING README
|
%doc ChangeLog COPYING README
|
||||||
%{_bindir}/xkbcomp
|
%{_bindir}/xkbcomp
|
||||||
%{_mandir}/man1/xkbcomp.1%{?ext_man}
|
%{_mandir}/man1/xkbcomp.1%{?ext_man}
|
||||||
#%{_libdir}/pkgconfig/xkbcomp.pc
|
|
||||||
|
%files devel
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_libdir}/pkgconfig/xkbcomp.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user