- updated xman-paths and xfs-logger patches

- moved _wmpropsdir to /usr/share/wm-properties (more pros than for previous
  location now)
- -xft1 obsoletes only pre-4.3 -xft, updated -xft1 description
- added version to fontconfig provides

Changed files:
    XFree86-xfs-logger.patch -> 1.3
    XFree86-xman-manpaths.patch -> 1.2
    XFree86.spec -> 1.380

diff --git a/XFree86-xfs-logger.patch b/XFree86-xfs-logger.patch
index b980b7b5a009193d6795a5442240d78011ea0623..c54b41caeefe65087adb98f27656fbeefc86c28e 100644 (file)
--- a/XFree86-xfs-logger.patch
+++ b/XFree86-xfs-logger.patch
@@ -46,11 +46,11 @@ diff -Nur xc/programs/xfs.org/os/utils.c xc/programs/xfs/os/utils.c
  static void
  usage(void)
  {
--    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name]\n",
-+    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-d debug_level]\n",
+-    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-ls listen_socket]\n",
++    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-ls listen_socket] [-d debug_level]\n",
            progname);
      exit(1);
- 
+ }
 @@ -295,6 +296,8 @@
                ProcessLSoption (argv[++i]);
            else

diff --git a/XFree86-xman-manpaths.patch b/XFree86-xman-manpaths.patch
index 0c3e2db7f4505f8483388d5efdeee99ac2876215..08ff60c2f5536a8b74e4888fef36f553c2306312 100644 (file)
--- a/XFree86-xman-manpaths.patch
+++ b/XFree86-xman-manpaths.patch
@@ -1,11 +1,11 @@
---- XFree86-4.2.0/xc/programs/xman/vendor.h.orig       Sun Mar 17 01:50:17 2002
-+++ XFree86-4.2.0/xc/programs/xman/vendor.h    Sun Mar 17 01:54:57 2002
+--- XFree86-4.2.99.901/xc/programs/xman/vendor.h.orig  Sun Mar 17 01:50:17 2002
++++ XFree86-4.2.99.901/xc/programs/xman/vendor.h       Sun Mar 17 01:54:57 2002
 @@ -77,7 +77,7 @@
  #  define SYSMANPATH "/usr/catman/u_man:/usr/catman/a_man"
  #elif defined(__bsdi__)
  #  define SYSMANPATH "/usr/share/man:/usr/contrib/man:/usr/contrib/isode/man:/usr/local/man"
--#elif defined(__OpenBSD__)
-+#elif defined(__OpenBSD__) || defined(linux)
+-#elif defined(__OpenBSD__) || defined(__DARWIN__)
++#elif defined(__OpenBSD__) || defined(__DARWIN__) || defined(linux)
  #  define SYSMANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man"
  #elif defined(SVR4) || defined(__osf__) || (defined(BSD) && (BSD >= 199103))
  #  define SYSMANPATH "/usr/share/man"

diff --git a/XFree86.spec b/XFree86.spec
index cd72e58ebcaa6cd6591063fd18ffa8b199801cb8..8c863feafe38d64daf2f53e6f0c169e25c0f5be7 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -86,38 +86,38 @@ Patch26:    %{name}-HasFreetype2.patch
 Patch27:       %{name}-config-s3.patch
 Patch28:       %{name}-sparc_pci_domains.patch
 Patch29:       %{name}-XTerm.ad.patch
-Patch30:       %{name}-dri_directory_mode_fix.patch
+#Patch30:      %{name}-dri_directory_mode_fix.patch
 Patch31:       %{name}-alpha_GLX_align_fix.patch
-Patch32:       %{name}-XftConfig_in_correct_place.patch
+#Patch32:      %{name}-XftConfig_in_correct_place.patch
 Patch33:       %{name}-PEX+XIE.patch
 Patch34:       %{name}-xman-manpaths.patch
 Patch35:       %{name}-ppc_drivers.patch
-Patch36:       ftp://ftp.xfree86.org/pub/XFree86/4.2.1/patches/4.2.0-4.2.1.diff.gz
+#Patch36:      ftp://ftp.xfree86.org/pub/XFree86/4.2.1/patches/4.2.0-4.2.1.diff.gz
 Patch37:       %{name}-clearrts.patch
-Patch38:       %{name}-mga020414.patch
-Patch39:       %{name}-trident-9397.patch
-Patch40:       %{name}-4.2.0-i810-driver-update-cvs-20020617.patch.bz2
-Patch41:       %{name}-nv020414.patch
-Patch42:       %{name}-fix-07-s3trio64v2gx+netfinity.patch
-Patch43:       %{name}-prosavage.patch
-Patch44:       %{name}-xtt-null-pointer.patch
+#Patch38:      %{name}-mga020414.patch
+#Patch39:      %{name}-trident-9397.patch
+#Patch40:      %{name}-4.2.0-i810-driver-update-cvs-20020617.patch.bz2
+#Patch41:      %{name}-nv020414.patch
+#Patch42:      %{name}-fix-07-s3trio64v2gx+netfinity.patch
+#Patch43:      %{name}-prosavage.patch
+#Patch44:      %{name}-xtt-null-pointer.patch
 Patch45:       %{name}-i740-driver-update-cvs-20020617.patch
-Patch46:       %{name}-neomagic-Xv-support.patch
+#Patch46:      %{name}-neomagic-Xv-support.patch
 Patch47:       %{name}-tdfx-disable-dri-on-16Mb-cards-in-hires.patch
-Patch48:       %{name}-tdfx-should-be-2048-not-2046.patch
+#Patch48:      %{name}-tdfx-should-be-2048-not-2046.patch
 Patch49:       %{name}-tdfx-interlace.patch
 Patch50:       %{name}-tdfx-fix-compiler-warnings.patch
 Patch51:       %{name}-tdfx-fix-vtswitch-font-corruption.patch
 Patch52:       %{name}-sis-option-swcursor.patch
-Patch53:       %{name}-sis-unresolved-symbols.patch
+#Patch53:      %{name}-sis-unresolved-symbols.patch
 Patch54:       %{name}-sis-maxxfbmem-fixup.patch
-Patch55:       %{name}-Radeon9000.patch
+#Patch55:      %{name}-Radeon9000.patch
 Patch56:       %{name}-Xfont-Type1-large-DoS.patch
 # "strip -g libGLcore.a" left empty object debug_xform.o, which caused GLcore
 # loading failure with "debug_xform.o: no symbols"
 Patch57:       %{name}-GLcore-strip-a-workaround.patch
 # Original from: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/fixes/4.2.1-mit-shm-security.patch
-Patch58:       %{name}-4.2.1-mit-shm-security.patch
+#Patch58:      %{name}-4.2.1-mit-shm-security.patch
 Patch59:       %{name}-disable_glide.patch
 Patch60:       %{name}-expat.patch
 Patch61:       %{name}-pkgconfig.patch
@@ -155,7 +155,7 @@ Obsoletes:  X11R6.1
 %define                _icondir        /usr/share/icons
 %define                _pixmapsdir     /usr/share/pixmaps
 %define                _soundsdir      /usr/share/sounds
-%define                _wmpropsdir     %{_datadir}/wm-properties
+%define                _wmpropsdir     /usr/share/wm-properties
 
 # avoid Mesa dependency in XFree86-OpenGL-libs
 # Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI
@@ -371,17 +371,17 @@ PEX extension static library.
 Statyczna biblioteka rozszerzenia PEX.
 
 %package xft1
-Summary:       Font rendering library
-Summary(pl):   Biblioteka wy¶wietlaj±ca fonty
+Summary:       Old version of font rendering library
+Summary(pl):   Stara wersja biblioteki wy¶wietlaj±cej fonty
 Group:         X11/XFree86
 Requires:      %{name}-libs = %{version}
-Obsoletes:     XFree86-xft
+Obsoletes:     XFree86-xft < 4.2.99
 
 %description xft1
-Font rendering library.
+Old version of font rendering library.
 
 %description xft1 -l pl
-Biblioteka wy¶wietlaj±ca fonty.
+Stara wersja biblioteki wy¶wietlaj±cej fonty.
 
 %package xft
 Summary:        X Font rendering library
@@ -442,7 +442,7 @@ Summary:        Font configuration and customization library
 Summary(pl):    Biblioteka do konfigurowania fontów
 Requires:      %{name}-libs = %{version}
 Group:          Libraries
-Provides:      fontconfig
+Provides:      fontconfig = 1.0.1
 Obsoletes:     fontconfig
 
 %description fontconfig
@@ -457,9 +457,9 @@ systemie i wybierania ich w zale
 Summary:        Font configuration and customization library
 Summary(pl):    Biblioteka do konfigurowania fontów
 Group:          Development/Libraries
-Provides:      fontconfig-devel
 Requires:       %{name}-fontconfig = %{version}
 Requires:       freetype-devel
+Provides:      fontconfig-devel = 1.0.1
 Obsoletes:     fontconfig-devel
 
 %description fontconfig-devel
@@ -1859,22 +1859,21 @@ System. 
 %patch3 -p0
 %patch4 -p1
 %patch5 -p0
-# not ready yet
-#%patch6 -p0
+%patch6 -p0
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-#%patch11 -p0 --seems to be obsoleted
+#%patch11 -p0  -- obsoleted???
 %patch12 -p1
 %patch13 -p1
 %patch14 -p0
 %patch15 -p1
 %patch16 -p0
-#%patch17 -p1 -- not ready, is it required?
+#%patch17 -p1  -- not ready, is it required?
 %patch18 -p1
-#%patch19 -p1
-%patch20 -p0 
+#%patch19 -p1  -- maybe should be updated to allow using make -j
+%patch20 -p0
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
@@ -1883,39 +1882,38 @@ System. 
 %patch26 -p1
 %patch27 -p1
 %ifarch sparc sparc64
-# needs updating (14 rejects)
-#%patch28 -p1
+#%patch28 -p1  -- needs update
 %endif
 %patch29 -p0
 #%patch30 -p1 -- obsoleted
 %patch31 -p1
 #%patch32 -p1 --obsoleted
 %patch33 -p0
-#%patch34 -p1 --obsoleted????????
+%patch34 -p1
 %ifarch ppc
 %patch35       --new version required
 %endif
 #%%{?_without_tdfx:%patch35} --same as above
 #%patch36 -p0 --obsoleted
 %patch37 -p1
-####%patch38 -p1
-#%patch39 -p1
-####%patch40 -p0
-####%patch41 -p1
-####%patch42 -p1  --obsoleted (all with ####)
-####%patch43 -p1
-####%patch44 -p1
-####%patch45 -p1
-####%patch46 -p1
+#%patch38 -p1  -- obsoleted
+#%patch39 -p1  -- obsoleted
+#%patch40 -p0  -- obsoleted
+#%patch41 -p1  -- obsoleted
+#%patch42 -p1  -- obsoleted (only partially???)
+#%patch43 -p1  -- obsoleted
+#%patch44 -p1  -- obsoleted
+#%patch45 -p1  -- obsoleted? (but doesn't look to be applied)
+#%patch46 -p1  -- obsoleted
 %{!?_without_tdfx:%patch47 -p0}
-#%{!?_without_tdfx:%patch48 -p0}
+#%patch48 -p0  -- obsoleted
 %{!?_without_tdfx:%patch49 -p1}
-#%patch50 -p0
+#%patch50 -p0  -- causing problems IIRC (but not really needed)
 %{!?_without_tdfx:%patch51 -p0}
-#%patch52 -p1
-#%patch53 -p1
-#%patch54 -p1
-#%patch55 -p0
+#%patch52 -p1  -- probably not needed
+#%patch53 -p1  -- obsoleted
+#%patch54 -p1  -- obsoleted? (code looks very different)
+#%patch55 -p0  -- obsoleted
 %patch56 -p1
 #%%{!?debug:%patch57 -p1} --obsoleted
 #%patch58 -p0  --obsoleted