[xorg-x11-resutils/f21] SPEC file cleanup + updates
Simone Caronni
slaanesh at fedoraproject.org
Tue Nov 4 14:56:59 UTC 2014
commit 5e77afb5da3ce96c693369d3786a2a254a7ae52a
Author: Simone Caronni <negativo17 at gmail.com>
Date: Tue Nov 4 15:14:35 2014 +0100
SPEC file cleanup + updates
sources | 2 -
xorg-x11-resutils.spec | 174 ++++++++++++++----------------------------------
2 files changed, 49 insertions(+), 127 deletions(-)
---
diff --git a/sources b/sources
index 34cb931..0b61df5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
-48d56924f76738872ef6c90f99030e34 appres-1.0.3.tar.bz2
623322610e4040393e0ff2a69e6612cd editres-1.0.6.tar.bz2
-3c0d5d8d6abaf411cd0647bc7073ac38 listres-1.0.2.tar.bz2
e4651e55dccb0ae234e49bdc0b984fc9 viewres-1.0.4.tar.bz2
diff --git a/xorg-x11-resutils.spec b/xorg-x11-resutils.spec
index bed5a54..c749b19 100644
--- a/xorg-x11-resutils.spec
+++ b/xorg-x11-resutils.spec
@@ -1,43 +1,34 @@
-%define pkgname resutils
-
-Summary: X.Org X11 X resource utilities
-Name: xorg-x11-%{pkgname}
-Version: 7.5
-Release: 10%{?dist}
-License: MIT
-Group: User Interface/X
-URL: http://www.x.org
-
-Source0: ftp://ftp.x.org/pub/individual/app/appres-1.0.3.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/editres-1.0.6.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/app/listres-1.0.2.tar.bz2
-Source3: ftp://ftp.x.org/pub/individual/app/viewres-1.0.4.tar.bz2
-
-Patch0: editres-1.0.6-format-security.patch
-
-BuildRequires: pkgconfig
-BuildRequires: libX11-devel
-BuildRequires: libXt-devel
-BuildRequires: libXmu-devel
-BuildRequires: libXext-devel
-BuildRequires: libSM-devel
-BuildRequires: libICE-devel
-BuildRequires: libXaw-devel >= 1.0.2-6
-# FIXME: appres has 'x11 xt' as a dependency check, which fails. While it
-# does not check for Xdmcp, installing libXdmcp-devel resolves the problem.
-# This implies that one of the other library devel packages should probably
-# have a Requires: libXdmcp-devel instead, but it isn't completely clear
-# what the best solution is yet, so I'm putting this here.
-BuildRequires: libXdmcp-devel
-BuildRequires: autoconf automake libtool
-BuildRequires: xorg-x11-util-macros
-
-Provides: appres editres listres viewres
-
-# NOTE: appres, editres used to be in the XFree86/xorg-x11 package, whereas
-# oddly enough, the listres, viewres utilities were in the *-tools subpackage.
-Obsoletes: XFree86, xorg-x11
-Obsoletes: XFree86-tools, xorg-x11-tools
+# Component versions
+%define appres 1.0.4
+%define editres 1.0.6
+%define listres 1.0.3
+%define viewres 1.0.4
+
+Summary: X.Org X11 X resource utilities
+Name: xorg-x11-resutils
+Version: 7.5
+Release: 11%{?dist}
+License: MIT
+URL: http://www.x.org
+
+Source0: http://www.x.org/pub/individual/app/appres-%{appres}.tar.bz2
+Source1: http://www.x.org/pub/individual/app/editres-%{editres}.tar.bz2
+Source2: http://www.x.org/pub/individual/app/listres-%{listres}.tar.bz2
+Source3: http://www.x.org/pub/individual/app/viewres-%{viewres}.tar.bz2
+
+Patch0: editres-1.0.6-format-security.patch
+
+BuildRequires: libtool
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xaw7)
+BuildRequires: pkgconfig(xmu)
+BuildRequires: pkgconfig(xt)
+BuildRequires: pkgconfig(xorg-macros) >= 1.8
+
+Provides: appres = %{appres}
+Provides: editres = %{editres}
+Provides: listres = %{listres}
+Provides: viewres = %{viewres}
%description
A collection of utilities for managing X resources.
@@ -49,32 +40,26 @@ A collection of utilities for managing X resources.
%build
# Build all apps
{
- for app in * ; do
- pushd $app
- autoreconf -vif
- %configure --disable-xprint
- make
- popd
- done
+ for app in * ; do
+ pushd $app
+ autoreconf -vif
+ %configure --disable-xprint
+ make %{?_smp_mflags}
+ popd
+ done
}
%install
-rm -rf $RPM_BUILD_ROOT
# Install all apps
{
- for app in * ; do
- pushd $app
- make install DESTDIR=$RPM_BUILD_ROOT
- popd
- done
+ for app in * ; do
+ pushd $app
+ %make_install
+ popd
+ done
}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
-%doc
%{_bindir}/appres
%{_bindir}/editres
%{_bindir}/listres
@@ -89,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/viewres.1*
%changelog
+* Tue Nov 04 2014 Simone Caronni <negativo17 at gmail.com> - 7.5-11
+- Clean up SPEC file, fix rpmlint warnings.
+- Simplify build requirements.
+- appres 1.0.4
+- listres 1.0.3
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.5-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@@ -128,70 +119,3 @@ rm -rf $RPM_BUILD_ROOT
* Fri Mar 05 2010 Matěj Cepl <mcepl at redhat.com> - 7.1-10
- Fixed bad directory ownership of /usr/share/X11
-
-* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 7.1-9
-- Un-Requires xorg-x11-filesystem
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Jul 15 2008 Adam Jackson <ajax at redhat.com> 7.1-6
-- Fix license tag.
-
-* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 7.1-5
-- Autorebuild for GCC 4.3
-
-* Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 7.1-4
-- Rebuild for build id
-
-* Tue Jan 23 2007 Adam Jackson <ajax at redhat.com> 7.1-3
-- appres 1.0.1
-
-* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 7.1-2.fc6
-- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
-- Add 'dist' tag to package release string.
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 7.1-1.1
-- rebuild
-
-* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
-- Bump package version to 7.1 to match the X11 release the packages were
- last synced with.
-- Bump build dep to libXaw-devel >= 1.0.2-6, to pick up indirect dependency
- on libXpm-devel which was fixed in that release.
-
-* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
-- Fix all SourceN lines in spec file to not have to update them every time.
-- Remove package ownership of mandir/libdir/etc.
-
-* 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
-- Update all resource utils to version 1.0.1 from X11R7.0
-
-* Fri Dec 16 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
-- Update all resource utils to version 1.0.0 from X11R7 RC4.
-- Move app-defaults files to _datadir
-- Change manpage dir from man1x to man1 to match RC4 default.
-- Added "BuildRequires: libX11-devel, libXt-devel"
-
-* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> 0.99.1-3
-- require newer filesystem package (#172610)
-
-* Sun Nov 13 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2
-- Add "Obsoletes: XFree86, XFree86-tools, xorg-x11, xorg-x11-tools", as
- appres, editres used to be in the XFree86/xorg-x11 package, whereas
- oddly enough, the listres, viewres utilities were in the *-tools subpackage.
-- 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
-- Initial build, with all apps taken from X11R7 RC2
-- Use "make install DESTDIR=$RPM_BUILD_ROOT" as the makeinstall macro fails on
- some packages.
More information about the scm-commits
mailing list