[xorg-x11-xkb-utils/f21] Clean up SPEC file
Simone Caronni
slaanesh at fedoraproject.org
Fri Nov 7 13:59:49 UTC 2014
commit 159361ac40b658df6966e3989ced7996464b538a
Author: Simone Caronni <negativo17 at gmail.com>
Date: Fri Nov 7 14:59:22 2014 +0100
Clean up SPEC file
xorg-x11-xkb-utils.spec | 249 ++++++++++++++--------------------------------
1 files changed, 76 insertions(+), 173 deletions(-)
---
diff --git a/xorg-x11-xkb-utils.spec b/xorg-x11-xkb-utils.spec
index 1dc8b69..1c872c9 100644
--- a/xorg-x11-xkb-utils.spec
+++ b/xorg-x11-xkb-utils.spec
@@ -1,61 +1,58 @@
-Summary: X.Org X11 xkb utilities
-Name: xorg-x11-xkb-utils
-Version: 7.7
-Release: 10%{?dist}
-License: MIT
-Group: User Interface/X
-URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# use the macro so the doc dir is changed automagically
-%define xkbutils_version 1.0.4
-Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.2.4.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.1.3.tar.bz2
-Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.3.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.3.0.tar.bz2
-
-Patch01: 0001-Reset-scan-state-when-opening-a-new-file.patch
-Patch02: 0001-man-document-help-em1-emp-eml.patch
-
-BuildRequires: pkgconfig
-BuildRequires: byacc
-BuildRequires: libxkbfile-devel
-BuildRequires: libX11-devel
-BuildRequires: libXaw-devel
-BuildRequires: libXt-devel
-# FIXME: xkbvleds requires libXext, but autotools doesn't check/require it:
-# gcc -O2 -g -march=i386 -mcpu=i686 -o xkbvleds xkbvleds-xkbvleds.o
-# xkbvleds-LED.o xkbvleds-utils.o -lXaw7 -lXmu -lXt -lSM -lICE -lXext -lXpm -lX11 -ldl
-# /usr/bin/ld: cannot find -lXext
-# libXext-devel needed for xkbutils (from above error)
-BuildRequires: libXext-devel
-# FIXME: xkbvleds requires libXext, but autotools doesn't check/require it:
-# gcc -O2 -g -march=i386 -mcpu=i686 -o xkbvleds xkbvleds-xkbvleds.o
-# xkbvleds-LED.o xkbvleds-utils.o -lXaw7 -lXmu -lXt -lSM -lICE -lXext -lXpm -lX11 -ldl
-# /usr/bin/ld: cannot find -lXpm
-# libXpm-devel needed for xkbutils (from above error)
-BuildRequires: libXpm-devel
-
-Provides: setxkbmap xkbcomp
-Obsoletes: XFree86 xorg-x11
+# Component versions
+%define setxkbmap 1.3.0
+%define xkbcomp 1.2.4
+%define xkbevd 1.1.3
+%define xkbprint 1.0.3
+%define xkbutils 1.0.4
+
+Summary: X.Org X11 xkb utilities
+Name: xorg-x11-xkb-utils
+Version: 7.7
+Release: 11%{?dist}
+License: MIT
+URL: http://www.x.org
+
+Source0: http://www.x.org/pub/individual/app/setxkbmap-%{setxkbmap}.tar.bz2
+Source1: http://www.x.org/pub/individual/app/xkbcomp-%{xkbcomp}.tar.bz2
+Source2: http://www.x.org/pub/individual/app/xkbevd-%{xkbevd}.tar.bz2
+Source3: http://www.x.org/pub/individual/app/xkbprint-%{xkbprint}.tar.bz2
+Source4: http://www.x.org/pub/individual/app/xkbutils-%{xkbutils}.tar.bz2
+
+Patch01: 0001-Reset-scan-state-when-opening-a-new-file.patch
+Patch02: 0001-man-document-help-em1-emp-eml.patch
+
+BuildRequires: byacc
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xaw7)
+BuildRequires: pkgconfig(xkbfile)
+BuildRequires: pkgconfig(xorg-macros) >= 1.8
+BuildRequires: pkgconfig(xt)
+# xkbutils/xkbvleds requires libXext and libXpm, but autotools don't check/require them:
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xpm)
+
+
+Provides: setxkbmap = %{setxkbmap}
+Provides: xkbcomp = %{xkbcomp}
+
+%description
+X.Org X11 xkb core utilities.
%package devel
-Summary: X.Org X11 xkb utilities development package.
-Group: Development/Libraries
-Requires: pkgconfig
+Summary: X.Org X11 xkb utilities development package
+Requires: pkgconfig
+
%description devel
X.Org X11 xkb utilities development files.
%package -n xorg-x11-xkb-extras
-Summary: X.Org X11 xkb gadgets
-Provides: xkbevd xkbprint xkbutils
-
-%description
-X.Org X11 xkb core utilities
+Summary: X.Org X11 xkb gadgets
+Provides: xkbevd = %{xkbevd}
+Provides: xkbprint = %{xkbprint}
+Provides: xkbutils = %{xkbutils}
%description -n xorg-x11-xkb-extras
-X.Org X11 xkb gadgets
+X.Org X11 xkb gadgets.
%prep
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
@@ -63,37 +60,42 @@ X.Org X11 xkb gadgets
%patch02 -p1
%build
-export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP -Os"
-for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
- pushd $pkg-*
- [ $pkg == xkbcomp ] && rm xkbparse.c # force regen
- %configure
- make V=1
- popd
-done
+# Build all apps
+{
+ for app in * ; do
+ pushd $app
+ case $app in
+ xkbcomp-*)
+ rm xkbparse.c # force regen
+ ;;
+ *)
+ ;;
+ esac
+ %configure
+ make %{?_smp_mflags}
+ popd
+ done
+}
%install
-rm -rf $RPM_BUILD_ROOT
-for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
- pushd $pkg-*
- make install DESTDIR=$RPM_BUILD_ROOT
- popd
-done
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Install all apps
+{
+ for app in * ; do
+ pushd $app
+ %make_install
+ popd
+ done
+}
%files
-%defattr(-,root,root,-)
%{_bindir}/setxkbmap
%{_bindir}/xkbcomp
%{_mandir}/man1/setxkbmap.1*
%{_mandir}/man1/xkbcomp.1*
%files -n xorg-x11-xkb-extras
-%defattr(-,root,root,-)
-%doc xkbutils-%{xkbutils_version}/COPYING
-%doc xkbutils-%{xkbutils_version}/README
+%doc xkbutils-%{xkbutils}/COPYING
+%doc xkbutils-%{xkbutils}/README
%{_bindir}/xkbbell
%{_bindir}/xkbevd
%{_bindir}/xkbprint
@@ -106,10 +108,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xkbwatch.*
%files devel
-%defattr(-,root,root,-)
%{_libdir}/pkgconfig/xkbcomp.pc
%changelog
+* Fri Nov 07 2014 Simone Caronni <negativo17 at gmail.com> - 7.7-11
+- Clean up SPEC file, build all components like other x11 packages.
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.7-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@@ -170,104 +174,3 @@ rm -rf $RPM_BUILD_ROOT
* Thu Jul 08 2010 Adam Jackson <ajax at redhat.com> 7.4-8
- xkbcomp-speed.patch: Backport performance changes from git master.
-
-* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 7.4-7
-- xkbevd 1.1.0
-- xkbutils 1.0.2
-
-* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-6
-- xkbcomp 1.1.1
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Jul 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-4
-- setxkbmap 1.1.0
-
-* Thu Jul 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-3
-- xkbcomp 1.1.0
-
-* Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 7.4-2
-- Fix missing %%defattr in -extras
-
-* 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
-
-* Mon Aug 25 2008 Peter Hutterer <peter.hutterer at redhat.com> 7.2-7
-- xkbcomp 1.0.5
-- Remove xkbcomp-1.0.4-open-less.patch.
-- xkbcomp-1.0.5-dont-overwrite.patch: Don't overwrite groups unnecessarily.
-
-* Tue Jul 15 2008 Adam Jackson <ajax at redhat.com> 7.2-6
-- Fix license tag.
-
-* Wed Apr 16 2008 Adam Jackson <ajax at redhat.com> 7.2-5
-- xkbcomp 1.0.4
-- xkbcomp-1.0.4-open-less.patch: Make xkbcomp faster by removing uncredible
- fail.
-
-* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 7.2-4
-- Autorebuild for GCC 4.3
-
-* Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 7.2-3
-- Rebuild for ppc toolchain bug
-
-* Wed Jul 25 2007 Jeremy Katz <katzj at redhat.com> - 7.2-2
-- rebuild for toolchain bug
-
-* Tue Jul 24 2007 Adam Jackson <ajax at redhat.com> 7.2-1
-- setxkbmap 1.0.4
-- Arbitrary version number bump, to match X.org release numbering. Why not.
-
-* Mon Jan 08 2007 Adam Jackson <ajax at redhat.com> 1.0.2-3
-- From OLPC: jam -DHAVE_STRCASECMP into CFLAGS to make xkbcomp (and therefore
- X server startup) slightly less painfully slow.
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
-- rebuild
-
-* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
-- Added xkbutils_version macro, which can be used in the Version field
- in the future, to help prevent accidental bumping of the package version.
-
-* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
-- Update setxkbmap, xkbevd, and xkbcomp
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1
-- Updated all apps to version 1.0.1 from X11R7.0
-
-* Sat Dec 17 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
-- Updated all apps to version 1.0.0 from X11R7 RC4.
-- Changed manpage dir from man1x to man1 to match upstream default.
-
-* Sun Nov 13 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2
-- Change from "Conflicts" to "Obsoletes: XFree86, xorg-x11" for upgrades.
-- Rebuild against new libXaw 0.99.2-2, which has fixed DT_SONAME. (#173027)
-
-* Fri Nov 11 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-1
-- Updated to xkbutils-0.99.1, setxkbmap-0.99.2, xkbcomp-0.99.1, xkbevd-0.99.2,
- xkbprint-0.99.1 from X11R7 RC2.
-
-* Thu Nov 10 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-3
-- Updated xkbutils to version 0.99.0 from X11R7 RC1. The upstream tarball
- changed, but the version stayed the same. <sigh>
-- Updated setxkbmap, xkbcomp, xkbevd, xkbprint.
-- Change manpage location to 'man1x' in file manifest.
-- Iterate over packages with for loop instead of serialized code duplication.
-
-* Wed Oct 05 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-2
-- Use Fedora-Extras style BuildRoot tag.
-- Update BuildRequires to use new library package names.
-- Tidy up spec file a bit.
-
-* Wed Aug 24 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-1
-- Initial build.
More information about the scm-commits
mailing list