rpms/xorg-x11-xkb-utils/devel xorg-x11-xkb-utils.spec,1.25,1.26

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7501

Modified Files:
	xorg-x11-xkb-utils.spec 
Log Message:
* Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 7.4-1
- Split Xaw-requiring utilities to extras subpackage



Index: xorg-x11-xkb-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xorg-x11-xkb-utils.spec	26 Feb 2009 11:41:50 -0000	1.25
+++ xorg-x11-xkb-utils.spec	2 Jul 2009 19:53:55 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-xkb-utils
-Version: 7.2
-Release: 8%{?dist}
+Version: 7.4
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -35,18 +35,25 @@ BuildRequires: libXext-devel
 # libXpm-devel needed for xkbutils (from above error)
 BuildRequires: libXpm-devel
 
-Provides: setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
-Obsoletes: XFree86, xorg-x11
+Provides: setxkbmap xkbcomp
+Obsoletes: XFree86 xorg-x11
+
+%package -n xorg-x11-xkb-extras
+Summary: X.Org X11 xkb gadgets
+Provides: xkbevd xkbprint xkbutils
 
 %description
-X.Org X11 xkb utilities
+X.Org X11 xkb core utilities
+
+%description -n xorg-x11-xkb-extras
+X.Org X11 xkb gadgets
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
 %patch1 -p0 -b .dont-overwrite
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP"
+export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP -Os"
 for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
     pushd $pkg-*
     %configure
@@ -67,21 +74,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc xkbutils-%{xkbutils_version}/AUTHORS xkbutils-%{xkbutils_version}/COPYING xkbutils-%{xkbutils_version}/INSTALL
-%doc xkbutils-%{xkbutils_version}/NEWS xkbutils-%{xkbutils_version}/README xkbutils-%{xkbutils_version}/ChangeLog
 %{_bindir}/setxkbmap
-%{_bindir}/xkbbell
 %{_bindir}/xkbcomp
+%{_mandir}/man1/setxkbmap.1*
+%{_mandir}/man1/xkbcomp.1*
+
+%files -n xorg-x11-xkb-extras
+%doc xkbutils-%{xkbutils_version}/AUTHORS xkbutils-%{xkbutils_version}/COPYING xkbutils-%{xkbutils_version}/INSTALL
+%doc xkbutils-%{xkbutils_version}/NEWS xkbutils-%{xkbutils_version}/README
+%{_bindir}/xkbbell
 %{_bindir}/xkbevd
 %{_bindir}/xkbprint
 %{_bindir}/xkbvleds
 %{_bindir}/xkbwatch
-%{_mandir}/man1/setxkbmap.1*
-%{_mandir}/man1/xkbcomp.1*
 %{_mandir}/man1/xkbevd.1*
 %{_mandir}/man1/xkbprint.1*
 
 %changelog
+* Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 7.4-1
+- Split Xaw-requiring utilities to extras subpackage
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild