Mailinglist Archive: opensuse-commit (1262 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package sax2
checked in at Sat Sep 2 19:04:05 CEST 2006.

--------
--- sax2/sax2.changes	2006-09-01 15:09:28.000000000 +0200
+++ sax2/sax2.changes	2006-09-02 06:31:16.000000000 +0200
@@ -1,0 +2,7 @@
+Sat Sep  2 06:30:01 CEST 2006 - sndirsch@xxxxxxx
+
+- sax2.diff:
+  * finally removed issues when xf86Parser.h/xf86Optrec.h is 
+    installed to /usr/include/xorg
+
+-------------------------------------------------------------------

New:
----
  sax2.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.pugdlf/_old	2006-09-02 19:03:55.000000000 +0200
+++ /var/tmp/diff_new_pack.pugdlf/_new	2006-09-02 19:03:55.000000000 +0200
@@ -45,7 +45,7 @@
 %endif
 Summary:        SuSE advanced X Window System-configuration
 Version:        8.1
-Release:        16
+Release:        17
 Group:          System/X11/Utilities
 License:        Other License(s), see package, GPL
 Source:         sax2.tar.bz2
@@ -53,6 +53,7 @@
 # SuSE Source...
 Source1:        sax2.desktop
 %endif
+Patch:          sax2.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:  s390
 
@@ -67,7 +68,7 @@
 
 %package -n sax2-tools
 Version:        8.1
-Release:        16
+Release:        17
 Summary:        X Window System tools for SaX2
 Group:          System/X11/Utilities
 Requires:       coreutils
@@ -96,7 +97,7 @@
 
 %package -n sax2-ident
 Version:        8.1
-Release:        16
+Release:        17
 Summary:        SaX2 identity and profile information
 Group:          System/X11/Utilities
 
@@ -114,7 +115,7 @@
 
 %package -n sax2-gui
 Version:        8.1
-Release:        16
+Release:        17
 %if %{?suse_version:1}0
 # SuSE Requires...
 Requires:       netpbm sax2-tools qt3 fvwm2 sax2
@@ -136,7 +137,7 @@
 
 %package -n sax2-libsax
 Version:        8.1
-Release:        16
+Release:        17
 %if %{?suse_version:1}0
 # SuSE Requires...
 Requires:       sax2-tools qt3 fvwm2 sax2
@@ -162,7 +163,7 @@
 
 %package -n sax2-libsax-devel
 Version:        8.1
-Release:        16
+Release:        17
 Requires:       sax2-libsax
 Summary:        SaX management library header files for X Window System-configuration development
 Group:          Development/Libraries/X11
@@ -179,7 +180,7 @@
 
 %package -n sax2-libsax-perl
 Version:        8.1
-Release:        16
+Release:        17
 Requires:       sax2-libsax
 Summary:        Language binding to use libsax with perl
 Group:          Development/Libraries/X11
@@ -196,7 +197,7 @@
 
 %package -n sax2-libsax-python
 Version:        8.1 
-Release:        16
+Release:        17
 Requires:       sax2-libsax
 %if %{?suse_version:1}0
 # SuSE Requires...
@@ -238,6 +239,7 @@
 %endif
 %prep
 %setup -n sax
+%patch
 
 %build
 test -e /.buildenv && . /.buildenv
@@ -479,6 +481,10 @@
 %endif
 
 %changelog -n sax2
+* Sat Sep 02 2006 - sndirsch@xxxxxxx
+- sax2.diff:
+  * finally removed issues when xf86Parser.h/xf86Optrec.h is
+  installed to /usr/include/xorg
 * Fri Sep 01 2006 - ms@xxxxxxx
 - fixed dependency tree (cyclic dependency)
 * Wed Aug 30 2006 - ms@xxxxxxx


++++++ sax2.diff ++++++
diff -u -r ../sax.orig/libsax/bindings/perl/Makefile.PL ./libsax/bindings/perl/Makefile.PL
--- ../sax.orig/libsax/bindings/perl/Makefile.PL	2006-09-01 23:52:57.000000000 +0200
+++ ./libsax/bindings/perl/Makefile.PL	2006-09-01 23:53:46.000000000 +0200
@@ -5,7 +5,9 @@
 
 $INCPATH="-I$QTDIR/include";
 if (-f "/usr/X11R6/include/xf86Parser.h") {
-	$INCPATH=$INCPATH." -I/usr/X11R6/include";
+	$INCPATH=$INCPATH." -iquote /usr/X11R6/include -I.";
+} else {
+	$INCPATH=$INCPATH." -iquote /usr/include/xorg -I.";
 }
 
 WriteMakefile(
diff -u -r ../sax.orig/libsax/config.h ./libsax/config.h
--- ../sax.orig/libsax/config.h	2006-09-01 23:52:57.000000000 +0200
+++ ./libsax/config.h	2006-09-01 23:53:08.000000000 +0200
@@ -27,7 +27,7 @@
 #include <stdarg.h>
 #include <dirent.h>
 extern "C" {
-#include <xf86Parser.h>
+#include "xf86Parser.h"
 }
 
 #include "export.h"
diff -u -r ../sax.orig/parse/Makefile.Linux ./parse/Makefile.Linux
--- ../sax.orig/parse/Makefile.Linux	2006-09-01 23:52:56.000000000 +0200
+++ ./parse/Makefile.Linux	2006-09-01 23:54:13.000000000 +0200
@@ -17,7 +17,7 @@
 
 test:
 	gcc -O2 parse.c -o parse -L/usr/X11R6/lib -L/usr/X11R6/lib64 \
-		-I/usr/X11R6/include \
+		-iquote /usr/X11R6/include -iquote /usr/include/xorg -I. \
 		-DX_BYTE_ORDER=X_LITTLE_ENDIAN \
 		-DNEW_INPUT -DNDEBUG -D${EXTSEC} \
 		-lxf86config -lm
diff -u -r ../sax.orig/parse/Makefile.PL ./parse/Makefile.PL
--- ../sax.orig/parse/Makefile.PL	2006-09-01 23:52:56.000000000 +0200
+++ ./parse/Makefile.PL	2006-09-01 23:54:28.000000000 +0200
@@ -6,6 +6,6 @@
   'LIBS'     => ['-L/usr/X11R6/lib -L/usr/X11R6/lib64 -lm -lxf86config'],
   'OBJECT'   => 'parse.o XFree_wrap.o',
   'DEFINE'   => "-DX_BYTE_ORDER=X_LITTLE_ENDIAN -DNEW_INPUT -DNDEBUG -D$FLAG",
-  'INC'      => '-I/usr/X11R6/include',
+  'INC'      => '-iquote /usr/X11R6/include -iquote /usr/include/xorg -I.',
   'OPTIMIZE' => '-O2'
 ); 
diff -u -r ../sax.orig/parse/XFree.h ./parse/XFree.h
--- ../sax.orig/parse/XFree.h	2006-09-01 23:52:56.000000000 +0200
+++ ./parse/XFree.h	2006-09-01 23:53:08.000000000 +0200
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <ctype.h>
-#include <xf86Parser.h>
+#include "xf86Parser.h"
 
 extern XF86ConfigPtr ReadConfigFile (char *filename);
 
diff -u -r ../sax.orig/parse/parse.c ./parse/parse.c
--- ../sax.orig/parse/parse.c	2006-09-01 23:52:56.000000000 +0200
+++ ./parse/parse.c	2006-09-01 23:53:08.000000000 +0200
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <ctype.h>
-#include <xf86Parser.h>
+#include "xf86Parser.h"
 #include <string.h>
 
 #define XF86CONF_PHSYNC    0x0001

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx