Accepting request 120693 from X11:XOrg

- 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.

- remove the pkgconfig file - it requires all devel packages and
  nothing of that is needed to run xkbcomp

OBS-URL: https://build.opensuse.org/request/show/120693
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkbcomp?expand=0&rev=3

xkbcomp.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+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
+
+- remove the pkgconfig file - it requires all devel packages and
+  nothing of that is needed to run xkbcomp
+
 -------------------------------------------------------------------
 Thu Apr 26 18:40:02 UTC 2012 - vuntz@opensuse.org
 

xkbcomp.spec

@@ -15,13 +15,14 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           xkbcomp
 Version:        1.2.4
-Release:        1
-License:        MIT
+Release:        0
 Summary:        Utility to compile XKB keyboard description
-Url:            http://xorg.freedesktop.org/
+License:        MIT
 Group:          System/X11/Utilities
+Url:            http://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
 BuildRequires:  bison
 BuildRequires:  pkg-config
@@ -31,16 +32,21 @@ BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 BuildRequires:  pkgconfig(xproto) >= 7.0.17
 # This was part of the xorg-x11 package up to version 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
 
 %description
 The xkbcomp keymap compiler converts a description of an XKB keymap
 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
 %setup -q
 
@@ -56,6 +62,9 @@ make %{?_smp_mflags}
 %doc ChangeLog COPYING README
 %{_bindir}/xkbcomp
 %{_mandir}/man1/xkbcomp.1%{?ext_man}
+
+%files devel
+%defattr(-,root,root)
 %{_libdir}/pkgconfig/xkbcomp.pc
 
 %changelog