rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.38,1.39

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xfs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23675

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
* Thu Jul 08 2010 Adam Jackson <ajax at redhat.com> 1:1.0.5-8
- Install a COPYING for -utils too
- Remove some XFree86 compat oh my goodness how was that still there.



Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- xorg-x11-xfs.spec	5 Mar 2010 14:09:34 -0000	1.38
+++ xorg-x11-xfs.spec	8 Jul 2010 17:53:04 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-xfs
 Version: 1.0.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT
@@ -33,7 +33,6 @@ Requires: libXfont >= 1.2.9
 
 Provides: xfs
 
-Obsoletes: XFree86-xfs
 Requires(pre): /sbin/nologin, /usr/sbin/useradd
 Requires(post): /sbin/chkconfig, grep, sed, coreutils
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -53,17 +52,6 @@ Summary: X.Org X11 font server utilities
 Group: User Interface/X
 #Requires: %{name} = %{version}-%{release}
 
-# So upgrades from OS releases with XFree86 work, since the utilities were
-# previously in the "xfs" subpackage instead of their own subpackage.
-Obsoletes: XFree86-xfs
-# FIXME: This conflict is because the utils moved from the xorg-x11-xfs
-# subpackage to the xorg-x11-xfs-utils subpackage starting with 6.99.99.0.
-# This may need to be updated in the future if the package major version
-# changes in some way.  Review this again after X11R7 is completed, and
-# prior to Fedora Core 5 being released to ensure the Conflict is set
-# properly to avoid installation/upgrade problems.
-Conflicts: xorg-x11-xfs < 6.99.99.0
-
 %description utils
 X.Org X11 font server utilities
 
@@ -71,9 +59,6 @@ X.Org X11 font server utilities
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
 
 %build
-# Comment: Separate sections for each individual tarball rather than an
-# iterative for loop, so that each can be customized easily in future.
-
 # Build xfs
 {
    pushd xfs-*
@@ -123,26 +108,6 @@ done
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-##### xfs scripts ####################################################
-# triggerpostun xfs:
-# - Work around a bug in the XFree86-xfs postun script, which results in
-#   the special xfs user account being inadvertently removed, causing xfs
-#   to run as the root user, and also resulting in xfs not being activated
-#   by chkconfig,  This trigger executes right after the XFree86-xfs
-#   postun script during upgrades from older OS releases that shipped
-#   XFree86, and ensures that the xfs user exists, and that the xfs
-#   initscript is properly activated with chkconfig (#118145,118818)
-#
-#   WARNING: THIS MUST BE LEFT HERE AS LONG AS WE SUPPORT UPGRADES FROM
-#   Fedora Core 1, Red Hat Linux <any release>,
-#   Red Hat Enterprise Linux 2.1, 3
-%triggerpostun -- XFree86-xfs
-{
-  /usr/sbin/useradd -c "X Font Server" -r -s /sbin/nologin -u 43 -d /etc/X11/fs xfs || :
-  /sbin/chkconfig --add xfs
-  /sbin/service xfs condrestart || :
-} &> /dev/null || :
-
 %pre
 {
   /usr/sbin/useradd -c "X Font Server" -r -s /sbin/nologin -u 43 -d /etc/X11/fs xfs || :
@@ -231,6 +196,9 @@ EOF
 %{_sysconfdir}/rc.d/init.d/xfs
 
 %files utils
+%defattr(-,root,root,-)
+# cheating
+%doc xfs-%{version}/COPYING
 %{_bindir}/fslsfonts
 %{_bindir}/fstobdf
 %{_bindir}/showfont
@@ -242,6 +210,10 @@ EOF
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Thu Jul 08 2010 Adam Jackson <ajax at redhat.com> 1:1.0.5-8
+- Install a COPYING for -utils too
+- Remove some XFree86 compat oh my goodness how was that still there.
+
 * Fri Mar 05 2010 Matěj Cepl <mcepl at redhat.com> - 1:1.0.5-7
 - Fixed bad directory ownership of /etc/X11