[xorg-x11-server-utils/f21: 2/4] Clean up SPEC file, fix rpmlint warnings
Simone Caronni
slaanesh at fedoraproject.org
Mon Nov 3 16:07:34 UTC 2014
commit daf83752b86555f3d525063f57b39949f3d12077
Author: Simone Caronni <negativo17 at gmail.com>
Date: Thu Oct 23 15:21:30 2014 +0200
Clean up SPEC file, fix rpmlint warnings
xorg-x11-server-utils.spec | 159 ++++++++++++++++++++++++++------------------
1 files changed, 93 insertions(+), 66 deletions(-)
---
diff --git a/xorg-x11-server-utils.spec b/xorg-x11-server-utils.spec
index 59c6e36..42dfa3a 100644
--- a/xorg-x11-server-utils.spec
+++ b/xorg-x11-server-utils.spec
@@ -1,73 +1,103 @@
-%define pkgname server-utils
# doesn't work yet, needs more nickle bindings
%define with_xkeystone 0
-Summary: X.Org X11 X server utilities
-Name: xorg-x11-%{pkgname}
-Version: 7.7
-Release: 8%{?dist}
-License: MIT
-Group: User Interface/X
-URL: http://www.x.org
-
-Source0: http://www.x.org/pub/individual/app/iceauth-1.0.6.tar.bz2
-Source2: http://www.x.org/pub/individual/app/rgb-1.0.5.tar.bz2
-Source3: http://www.x.org/pub/individual/app/sessreg-1.0.8.tar.bz2
-Source5: http://www.x.org/pub/individual/app/xgamma-1.0.5.tar.bz2
-Source6: http://www.x.org/pub/individual/app/xhost-1.0.6.tar.bz2
-Source7: http://www.x.org/pub/individual/app/xmodmap-1.0.8.tar.bz2
-Source8: http://www.x.org/pub/individual/app/xrandr-1.4.3.tar.bz2
-Source9: http://www.x.org/pub/individual/app/xrdb-1.1.0.tar.bz2
-Source10: http://www.x.org/pub/individual/app/xrefresh-1.0.5.tar.bz2
-Source11: http://www.x.org/pub/individual/app/xset-1.2.3.tar.bz2
-Source12: http://www.x.org/pub/individual/app/xsetmode-1.0.0.tar.bz2
-Source13: http://www.x.org/pub/individual/app/xsetpointer-1.0.1.tar.bz2
-Source14: http://www.x.org/pub/individual/app/xsetroot-1.1.1.tar.bz2
-Source15: http://www.x.org/pub/individual/app/xstdcmap-1.0.3.tar.bz2
-Source16: http://www.x.org/pub/individual/app/xkill-1.0.4.tar.bz2
-Source17: http://www.x.org/pub/individual/app/xinput-1.6.1.tar.bz2
-
-BuildRequires: xorg-x11-util-macros
-
-BuildRequires: pkgconfig(xmu) pkgconfig(xext) pkgconfig(xrandr)
-BuildRequires: pkgconfig(xxf86vm) pkgconfig(xrender) pkgconfig(xi)
-BuildRequires: pkgconfig(xt) pkgconfig(xpm) pkgconfig(xxf86misc)
-BuildRequires: pkgconfig(xtrans)
-# xsetroot requires xbitmaps-devel (which was renamed now)
-BuildRequires: xorg-x11-xbitmaps
-# xsetroot
-BuildRequires: libXcursor-devel
-# xinput
-BuildRequires: libXinerama-devel
-
-BuildRequires: autoconf automake libtool
+# Component versions
+%define iceauth 1.0.6
+%define rgb 1.0.5
+%define sessreg 1.0.8
+%define xgamma 1.0.5
+%define xhost 1.0.6
+%define xinput 1.6.1
+%define xkill 1.0.4
+%define xmodmap 1.0.8
+%define xrandr 1.4.3
+%define xrdb 1.1.0
+%define xrefresh 1.0.5
+%define xset 1.2.3
+%define xsetmode 1.0.0
+%define xsetpointer 1.0.1
+%define xsetroot 1.1.1
+%define xstdcmap 1.0.3
+
+Summary: X.Org X11 X server utilities
+Name: xorg-x11-server-utils
+Version: 7.7
+Release: 9%{?dist}
+License: MIT
+URL: http://www.x.org
+
+Source0: http://www.x.org/pub/individual/app/iceauth-%{iceauth}.tar.bz2
+Source1: http://www.x.org/pub/individual/app/rgb-%{rgb}.tar.bz2
+Source2: http://www.x.org/pub/individual/app/sessreg-%{sessreg}.tar.bz2
+Source3: http://www.x.org/pub/individual/app/xgamma-%{xgamma}.tar.bz2
+Source4: http://www.x.org/pub/individual/app/xhost-%{xhost}.tar.bz2
+Source5: http://www.x.org/pub/individual/app/xinput-%{xinput}.tar.bz2
+Source6: http://www.x.org/pub/individual/app/xkill-%{xkill}.tar.bz2
+Source7: http://www.x.org/pub/individual/app/xmodmap-%{xmodmap}.tar.bz2
+Source8: http://www.x.org/pub/individual/app/xrandr-%{xrandr}.tar.bz2
+Source9: http://www.x.org/pub/individual/app/xrdb-%{xrdb}.tar.bz2
+Source10: http://www.x.org/pub/individual/app/xrefresh-%{xrefresh}.tar.bz2
+Source11: http://www.x.org/pub/individual/app/xset-%{xset}.tar.bz2
+Source12: http://www.x.org/pub/individual/app/xsetmode-%{xsetmode}.tar.bz2
+Source13: http://www.x.org/pub/individual/app/xsetpointer-%{xsetpointer}.tar.bz2
+Source14: http://www.x.org/pub/individual/app/xsetroot-%{xsetroot}.tar.bz2
+Source15: http://www.x.org/pub/individual/app/xstdcmap-%{xstdcmap}.tar.bz2
+
+BuildRequires: xorg-x11-util-macros
+
+BuildRequires: pkgconfig(xbitmaps)
+BuildRequires: pkgconfig(xcursor)
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xi)
+BuildRequires: pkgconfig(xinerama)
+BuildRequires: pkgconfig(xmu)
+BuildRequires: pkgconfig(xpm)
+BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xt)
+BuildRequires: pkgconfig(xtrans)
+BuildRequires: pkgconfig(xxf86misc)
+BuildRequires: pkgconfig(xxf86vm)
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
# xrdb, sigh
-Requires: mcpp
-# older -apps had xinput and xkill, moved them here because they're
-# a) universally useful and b) don't require Xaw
-Conflicts: xorg-x11-apps < 7.6-4
-
-Provides: iceauth rgb sessreg xgamma xhost
-Provides: xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer
-Provides: xsetroot xstdcmap xinput xkill
+Requires: mcpp
+
+Provides: iceauth = %{iceauth}
+Provides: rgb = %{rgb}
+Provides: sessreg = %{sessreg}
+Provides: xgamma = %{xgamma}
+Provides: xhost = %{xhost}
+Provides: xinput = %{xinput}
+Provides: xkill = %{xkill}
+Provides: xmodmap = %{xmodmap}
+Provides: xrandr = %{xrandr}
+Provides: xrdb = %{xrdb}
+Provides: xrefresh = %{xrefresh}
+Provides: xset = %{xset}
+Provides: xsetmode = %{xsetmode}
+Provides: xsetpointer = %{xsetpointer}
+Provides: xsetroot = %{xsetroot}
+Provides: xstdcmap = %{xstdcmap}
%description
-A collection of utilities used to tweak and query the runtime configuration
-of the X server.
+A collection of utilities used to tweak and query the runtime configuration of
+the X server.
%if %{with_xkeystone}
%package -n xkeystone
-Summary: X display keystone correction
-Group: User Interface/X
-Requires: nickle
+Summary: X display keystone correction
+Requires: nickle
%description -n xkeystone
Utility to perform keystone adjustments on X screens.
%endif
%prep
-%setup -q -c %{name}-%{version} -a2 -a3 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
+%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15
%build
@@ -78,15 +108,15 @@ Utility to perform keystone adjustments on X screens.
case $app in
rgb-*)
autoreconf -vif
- %configure ;# --with-rgb-db=%{_datadir}/X11
+ %configure
;;
- xset-*)
+ xset-*)
autoreconf -vif
- %configure
- ;;
+ %configure
+ ;;
*)
autoreconf -vif
- %configure --with-cpp=/usr/bin/mcpp
+ %configure --with-cpp=%{_bindir}/mcpp
;;
esac
@@ -96,7 +126,6 @@ Utility to perform keystone adjustments on X screens.
}
%install
-rm -rf $RPM_BUILD_ROOT
# Install all apps
{
for app in * ; do
@@ -110,14 +139,10 @@ rm -rf $RPM_BUILD_ROOT
done
}
%if !%{with_xkeystone}
-rm -f $RPM_BUILD_ROOT/usr/bin/xkeystone
+rm -f $RPM_BUILD_ROOT%{_bindir}/xkeystone
%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%doc
%{_bindir}/iceauth
%{_bindir}/sessreg
@@ -155,11 +180,13 @@ rm -rf $RPM_BUILD_ROOT
%if %{with_xkeystone}
%files -n xkeystone
-%defattr(-,root,root,-)
%{_bindir}/xkeystone
%endif
%changelog
+* Thu Oct 23 2014 Simone Caronni <negativo17 at gmail.com> - 7.7-9
+- Clean up SPEC file, fix rpmlint warnings.
+
* Wed Oct 01 2014 Adam Jackson <ajax at redhat.com> 7.7-8
- xrandr 1.4.3
More information about the scm-commits
mailing list