rpms/kdesvn/devel kdesvn-0.7.1-x.patch, NONE, 1.1 kdesvn.spec, 1.4, 1.5 kdesve-0.7.0rc1-x.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7444

Modified Files:
	kdesvn.spec 
Added Files:
	kdesvn-0.7.1-x.patch 
Removed Files:
	kdesve-0.7.0rc1-x.patch 
Log Message:
New patch - only remove check for X11 includes for pre-modular X compat


kdesvn-0.7.1-x.patch:

--- NEW FILE kdesvn-0.7.1-x.patch ---
--- kdesvn-0.7.1/configure.x11	2005-11-25 12:05:40.000000000 -0700
+++ kdesvn-0.7.1/configure	2005-12-12 10:27:42.000000000 -0700
@@ -26637,90 +26637,6 @@
 
 
 
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$x_direct_test_include>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
-fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = NO
-
 if test "$ac_x_libraries" = NO; then
   # Check for the libraries.
 


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdesvn.spec	12 Dec 2005 16:37:28 -0000	1.4
+++ kdesvn.spec	12 Dec 2005 18:56:16 -0000	1.5
@@ -9,7 +9,7 @@
 License:        GPL
 URL:            http://www.alwins-world.de/programs/kdesvn/
 Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{srcver}.tar.gz
-Patch0:         kdesve-0.7.0rc1-x.patch
+Patch0:         kdesvn-0.7.1-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q -n %{name}-%{srcver}
-%patch -p1
+%patch -p1 -b .x11
 
 
 %build


--- kdesve-0.7.0rc1-x.patch DELETED ---