rpms/xorg-x11-xfs/FC-5 xorg-x11-xfs.spec,1.21,1.22

Wed Jun 28 08:40:45 UTC 2006

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25526

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-4.FC5.0
- Update build dep to xorg-x11-xtrans-devel >= 1.0.0-3.2.FC5.0 to ensure we
  pick up the setuid bug fixes for (#196126)
- Added xfs documentation to doc macro.
- Use "make install" instead of makeinstall macro.
- Clean up source file URLs.
- Added missing BuildRequires for (#191856).
- Rebuild xfs for FC5 update.



Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/FC-5/xorg-x11-xfs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22

--- xorg-x11-xfs.spec	9 Mar 2006 11:46:31 -0000	1.21
+++ xorg-x11-xfs.spec	28 Jun 2006 08:40:42 -0000	1.22
@@ -7,28 +7,29 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 4
+Release: 4.FC5.0
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
 Group: System Environment/Daemons
 URL: http://www.x.org
-#Source0: %{pkgname}-%{version}.tar.bz2
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfs-1.0.1.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfsinfo-1.0.1.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fslsfonts-1.0.1.tar.bz2
-Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fstobdf-1.0.1.tar.bz2
-Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/showfont-1.0.1.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.1.tar.bz2
+Source1: http://xorg.freedesktop.org/releases/individual/app/xfsinfo-1.0.1.tar.bz2
+Source2: http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.1.tar.bz2
+Source3: http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.1.tar.bz2
+Source4: http://xorg.freedesktop.org/releases/individual/app/showfont-1.0.1.tar.bz2
 Source10:  xfs.init
 # NOTE: xfs config input file, processed via sed below.
 Source11:  xfs.config.in
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
 # xfs needs 'fontsproto' to build, as indicated by ./configure
 BuildRequires: xorg-x11-proto-devel
 # FIXME: xfs needs xtrans to build, but autotools doesn't detect it missing
-BuildRequires: xorg-x11-xtrans-devel
+# Ensure that we're getting the xtrans with setuid fixes (xorg-x11-xtrans-devel-1.0.0-3.2.FC5.0)
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.0-3.2.FC5.0
 BuildRequires: libFS-devel
 # FIXME: The version specification can be removed from here in the future,
 # as it is not really mandatory, but forces a bugfix workaround on people who
@@ -39,6 +40,7 @@
 BuildRequires: freetype-devel
 # font-utils >= 1.0.0 needed for fontdir pkgconfig variable
 BuildRequires: font-utils >= 1.0.0
+BuildRequires: libfontenc-devel
 
 # FIXME: This Requires on libXfont can be removed from here in the future,
 # as it is not really mandatory, but forces a bugfix workaround on people who
@@ -124,7 +126,7 @@
 
 for pkg in xfsinfo fslsfonts fstobdf showfont ; do
    pushd ${pkg}-*
-   %makeinstall
+   make install DESTDIR=$RPM_BUILD_ROOT
    popd
 done
 
@@ -250,7 +252,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc xfs-%{version}/AUTHORS xfs-%{version}/COPYING xfs-%{version}/INSTALL
+%doc xfs-%{version}/NEWS xfs-%{version}/README xfs-%{version}/ChangeLog
 %{_bindir}/xfs
 %dir %{_sysconfdir}/X11
 %dir %{_sysconfdir}/X11/fs
@@ -277,6 +280,15 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-4.FC5.0
+- Update build dep to xorg-x11-xtrans-devel >= 1.0.0-3.2.FC5.0 to ensure we
+  pick up the setuid bug fixes for (#196126)
+- Added xfs documentation to doc macro.
+- Use "make install" instead of makeinstall macro.
+- Clean up source file URLs.
+- Added missing BuildRequires for (#191856).
+- Rebuild xfs for FC5 update.
+
 * Wed Mar 01 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-4
 - Fix all rpm scriptlets "upgrade" tests to only execute on upgrades.
 
@@ -286,13 +298,13 @@
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-2.1
 - bump again for double-long bug on ppc(64)
 
-* Thu Feb  9 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
+* Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
 - Removed invocation of fc-cache from xfs initscript for bug (#179362)
 - Redirect stderr to /dev/null to squelch an unwanted error xfs.init (#155349)
 - Replace "s#^/.*:[a-z]*$##g" with "s#:unscaled$##g" in xfs.init for (#179491)
 - Cosmetic cleanups to spec file to satiate the banshees.
 
-* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 16 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
@@ -333,7 +345,7 @@
 * Thu Nov 10 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-2
 - Added showfont-0.99.1 from X11R7 RC1 release.
 
-* Wed Nov 9 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-1
+* Wed Nov 09 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-1
 - Updated all packages to version 0.99.1 from X11R7 RC1.
 - Bump package version to 6.99.99.901 (the RC1 CVS tag).
 - Change manpage location to 'man1x' in file manifest.
@@ -343,7 +355,7 @@
   and complete restructuring, which removed a lot of the super craptasticness
   that had been sitting there for years.
 
-* Wed Oct 3 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-4
+* Wed Oct 03 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-4
 - Use Fedora-Extras style BuildRoot tag
 - Update BuildRequires to use new library package names
 - Remove unnecessary BuildRequires on 'install', and fix pkgconfig dep


