rpms/xorg-x11/devel xorg-x11.spec,1.186,1.187

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Apr 22 13:59:01 UTC 2005


Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23281

Modified Files:
	xorg-x11.spec 
Log Message:
- Change xfs initscript dependancies from "Requires(preun,postun):" to using
  two separate lines because rpm has a bug (#118773) that causes dependancies
  of this syntax to be ignored.




Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- xorg-x11.spec	21 Apr 2005 19:08:20 -0000	1.186
+++ xorg-x11.spec	22 Apr 2005 13:58:58 -0000	1.187
@@ -255,7 +255,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: flex >= 2.5.4a
-# Perl is used both by xorg-x11 during build (bdftruncate.pl) and by my specfile
+# Perl is used both by xorg-x11 during build (bdftruncate.pl) and the specfile
 BuildRequires: perl
 BuildRequires: bison, zlib-devel, ncurses-devel, utempter, expat-devel
 BuildRequires: pam-devel, libpng-devel
@@ -661,7 +661,8 @@
 Prereq: /sbin/chkconfig, %{_x11bindir}/mkfontdir, %{_bindir}/ttmkfdir
 Requires: %{name}-libs = %{version}-%{release}
 # xfs rpm scripts that use /sbin/service
-Requires(preun,postun): /sbin/service
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
 Obsoletes: XFree86-xfs
 Provides: xfs
 
@@ -729,7 +730,9 @@
 # xorg-x11-libs-data, so we conflict them
 Conflicts: XFree86 <= 4.2.99.2-0.20021105.0, XFree86-libs <= 4.2.99.2-0.20021105.0
 %endif
-#Requires(post,postun,verify): /sbin/ldconfig grep textutils
+#Requires(post): /sbin/ldconfig grep textutils
+#Requires(postun): /sbin/ldconfig grep textutils
+#Requires(verify): /sbin/ldconfig grep textutils
 Prereq: /sbin/ldconfig grep textutils
 Obsoletes: XFree86-libs
 # FIXME: Currently the same libs are present, but that's soon to change
@@ -3615,7 +3618,12 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
-* Thu Apr 21 2005 Soren Sandmann Pedersen <sandmann at redhat.com> 6.8.2-27
+* Fri Apr 22 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-27
+- Change xfs initscript dependancies from "Requires(preun,postun):" to using
+  two separate lines because rpm has a bug (#118773) that causes dependancies
+  of this syntax to be ignored.
+
+* Thu Apr 21 2005 Soren Sandmann Pedersen <sandmann at redhat.com>
 - Make old custom-modelines RHEL4 only. Add .laptop-modes.patch with
   support for various weird laptop resolutions.
 




More information about the fedora-cvs-commits mailing list