rpms/gai/devel gai-0.5.10-xorg.patch,NONE,1.1 gai.spec,1.17,1.18

Michel Alexandre Salim (salimma) fedora-extras-commits at redhat.com
Sun Feb 12 21:29:05 UTC 2006 

Author: salimma

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

Modified Files:
	gai.spec 
Added Files:
	gai-0.5.10-xorg.patch 
Log Message:
Updates to build against modular X in -devel


gai-0.5.10-xorg.patch:

--- NEW FILE gai-0.5.10-xorg.patch ---
--- gai-0.5.10.orig/configure	2005-06-26 02:01:36.000000000 -0500
+++ gai-0.5.10/configure	2006-01-30 20:26:40.000000000 -0500
@@ -3080,18 +3080,18 @@
 done
 
 
-if test "${ac_cv_header__usr_X11R6_include_X11_X_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for /usr/X11R6/include/X11/X.h" >&5
-echo $ECHO_N "checking for /usr/X11R6/include/X11/X.h... $ECHO_C" >&6
-if test "${ac_cv_header__usr_X11R6_include_X11_X_h+set}" = set; then
+if test "${ac_cv_header__usr_include_X11_X_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for /usr/include/X11/X.h" >&5
+echo $ECHO_N "checking for /usr/include/X11/X.h... $ECHO_C" >&6
+if test "${ac_cv_header__usr_include_X11_X_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header__usr_X11R6_include_X11_X_h" >&5
-echo "${ECHO_T}$ac_cv_header__usr_X11R6_include_X11_X_h" >&6
+echo "$as_me:$LINENO: result: $ac_cv_header__usr_include_X11_X_h" >&5
+echo "${ECHO_T}$ac_cv_header__usr_include_X11_X_h" >&6
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking /usr/X11R6/include/X11/X.h usability" >&5
-echo $ECHO_N "checking /usr/X11R6/include/X11/X.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking /usr/include/X11/X.h usability" >&5
+echo $ECHO_N "checking /usr/include/X11/X.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3099,7 +3099,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include </usr/X11R6/include/X11/X.h>
+#include </usr/include/X11/X.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3135,15 +3135,15 @@
 echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-echo "$as_me:$LINENO: checking /usr/X11R6/include/X11/X.h presence" >&5
-echo $ECHO_N "checking /usr/X11R6/include/X11/X.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking /usr/include/X11/X.h presence" >&5
+echo $ECHO_N "checking /usr/include/X11/X.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include </usr/X11R6/include/X11/X.h>
+#include </usr/include/X11/X.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -3177,25 +3177,25 @@
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
 ## ------------------------------------------ ##
@@ -3206,18 +3206,18 @@
       sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for /usr/X11R6/include/X11/X.h" >&5
-echo $ECHO_N "checking for /usr/X11R6/include/X11/X.h... $ECHO_C" >&6
-if test "${ac_cv_header__usr_X11R6_include_X11_X_h+set}" = set; then
+echo "$as_me:$LINENO: checking for /usr/include/X11/X.h" >&5
+echo $ECHO_N "checking for /usr/include/X11/X.h... $ECHO_C" >&6
+if test "${ac_cv_header__usr_include_X11_X_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_header__usr_X11R6_include_X11_X_h=$ac_header_preproc
+  ac_cv_header__usr_include_X11_X_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header__usr_X11R6_include_X11_X_h" >&5
-echo "${ECHO_T}$ac_cv_header__usr_X11R6_include_X11_X_h" >&6
+echo "$as_me:$LINENO: result: $ac_cv_header__usr_include_X11_X_h" >&5
+echo "${ECHO_T}$ac_cv_header__usr_include_X11_X_h" >&6
 
 fi
-if test $ac_cv_header__usr_X11R6_include_X11_X_h = yes; then
+if test $ac_cv_header__usr_include_X11_X_h = yes; then
   :
 else
 


Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/devel/gai.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gai.spec	16 Aug 2005 23:33:04 -0000	1.17
+++ gai.spec	12 Feb 2006 21:29:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.10
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -9,17 +9,18 @@
 Source0:	http://download.sf.net/gai/gai-%{version}.tar.bz2
 Patch0:		gai-0.5.9-pkgconfig.patch
 Patch1:		gai-0.5.10-nls.patch
+Patch2:		gai-0.5.10-xorg.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
-BuildRequires:	SDL-devel gtkglext-devel gettext
+BuildRequires:	libgnomeui-devel, gnome-panel-devel, mesa-libGLU-devel
+BuildRequires:	SDL-devel, gtkglext-devel, gettext, xorg-x11-proto-devel
 
 %package	devel
 Summary:	Library and headers for Generic Applet Interface
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel
-Requires:	libgnomeui-devel gtkglext-devel
+Requires:	pkgconfig, gnome-panel-devel, mesa-libGLU-devel
+Requires:	libgnomeui-devel, gtkglext-devel, xorg-x11-proto-devel
 
 %description
 This library provides a generic interface for developing applets for Gnome 2
@@ -38,6 +39,7 @@
 %setup -q
 %patch0 -p1 -b .pkgconfig
 %patch1 -p1 -b .nls
+%patch2 -p1 -b .xorg
 
 %build
 %ifarch x86_64
@@ -71,6 +73,10 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Mon Jan 30 2006 Michel Salim <mcihel.salim[AT]gmail.com> - 0.5.10-5
+- regenerate configure to account for modular xorg's location change
+- BuildReq changes: removed implicit dependencies, added xorg-x11-proto-devel and mesa-libGLU-devel that are now no longer pulled in
+
 * Wed Aug 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.10-4
 - rebuilt

More information about the fedora-extras-commits mailing list