Hello community,
here is the log from the commit of package sax2
checked in at Tue Nov 11 15:54:06 CET 2008.
--------
--- sax2/sax2.changes 2008-11-10 14:29:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2008-11-10 17:47:23.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Nov 10 15:06:44 CET 2008 - ms@suse.de
+
+- fixed standard mouse detection (bnc #433339)
+- removed xorg-server-1_5.diff, added check for XORG_VERSION_MINOR
+- created udev directory in svn, moved udev rule to that
+ directory instead of maintaining it as source
+
+-------------------------------------------------------------------
@@ -9 +17 @@
-- fixed Input.map, vmware-mouse line is missing the driver
+- fixed Input.map, vmware-mouse line is missing the driver (bnc #433339)
calling whatdependson for head-i586
Old:
----
66-elo.rules
xorg-server-1_5.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.f14984/_old 2008-11-11 15:53:30.000000000 +0100
+++ /var/tmp/diff_new_pack.f14984/_new 2008-11-11 15:53:30.000000000 +0100
@@ -50,15 +50,13 @@
PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 535
+Release: 536
Group: System/X11/Utilities
License: GPL v2 or later
Source: sax2.tar.bz2
Source1: sax2.desktop
-Source2: 66-elo.rules
-Source3: sax2-rpmlintrc
+Source2: sax2-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch: xorg-server-1_5.diff
%description
This package contains the SuSE Advanced X-Configuration
@@ -230,9 +228,6 @@
%prep
%setup -n sax
-%if %{suse_version} > 1100
-%patch
-%endif
%build
test -e /.buildenv && . /.buildenv
@@ -280,20 +275,8 @@
#-------------------------------------------------
%suse_update_desktop_file -i %name System SystemSetup
#=================================================
-# hwinfo data (bnc #408436)
-#-------------------------------------------------
-mkdir -p $RPM_BUILD_ROOT/var/lib/hardware/ids
-cat > $RPM_BUILD_ROOT/var/lib/hardware/ids/sax2-ident << EOF
- vendor.id usb 0x04e7
-&device.id usb 0x0030
- +hwclass mouse
-EOF
-#=================================================
-# udev rule for creating /dev/input/elo symlink (Bug #410315)
+# file duplicates
#-------------------------------------------------
-mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
-install -m 644 $RPM_SOURCE_DIR/66-elo.rules \
- $RPM_BUILD_ROOT/etc/udev/rules.d
%if %{suse_version} > 1020
%fdupes $RPM_BUILD_ROOT/usr/share/sax/api/figures
%endif
@@ -544,10 +527,15 @@
%endif
%changelog
+* Mon Nov 10 2008 ms@suse.de
+- fixed standard mouse detection (bnc #433339)
+- removed xorg-server-1_5.diff, added check for XORG_VERSION_MINOR
+- created udev directory in svn, moved udev rule to that
+ directory instead of maintaining it as source
* Mon Nov 10 2008 sndirsch@suse.de
- use NoVirtual profile for Intel 810/815 (bnc #442413)
* Mon Nov 10 2008 ms@suse.de
-- fixed Input.map, vmware-mouse line is missing the driver
+- fixed Input.map, vmware-mouse line is missing the driver (bnc #433339)
* Fri Nov 07 2008 sndirsch@suse.de
- no longer use intel driver for i845, since the support for this
GPU is currently completely broken (bfo #18270)
++++++ sax2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/Makefile new/sax/Makefile
--- old/sax/Makefile 2008-10-27 19:43:28.000000000 +0100
+++ new/sax/Makefile 2008-11-10 17:47:25.000000000 +0100
@@ -22,6 +22,7 @@
#============================================
# Prefixs...
#--------------------------------------------
+etc_prefix = ${buildroot}/etc
usr_prefix = ${buildroot}/usr
sax_prefix = ${buildroot}/usr/share/sax
xfi_prefix = ${buildroot}/usr/share/xfine
@@ -63,6 +64,8 @@
XFINEPIXMAPS = ${xfi_prefix}/figures
LIBDOCDIR = ${doc_prefix}/libsax
LIBTOOLDIR = ${sax_prefix}/libsax
+UDEVDIR = ${etc_prefix}/udev/rules.d
+HWIDSDIR = ${buildroot}/var/lib/hardware/ids
#============================================
# Helpers
@@ -142,6 +145,19 @@
install -d -m 755 ${PROFILE} ${SBINVZ} ${SAXCACHEVZ} ${XFICACHEVZ}
install -d -m 755 ${CREATEVZ} ${APITOOLS} ${XFINEBINVZ} ${XFINEPIXMAPS}
install -d -m 755 ${LIBDOCDIR} ${LIBTOOLDIR} ${LIBSAXVZ}
+ install -d -m 755 ${UDEVDIR} ${HWIDSDIR}
+
+ #============================================
+ # hwinfo data
+ #--------------------------------------------
+ echo "vendor.id usb 0x04e7" > ${HWIDSDIR}/sax2-ident
+ echo "&device.id usb 0x0030" >> ${HWIDSDIR}/sax2-ident
+ echo "+hwclass mouse" >> ${HWIDSDIR}/sax2-ident
+
+ #============================================
+ # udev rules
+ #--------------------------------------------
+ install -m 644 udev/* ${UDEVDIR}
#============================================
# install X11 parser...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/modules/ParseConfig.pm new/sax/modules/ParseConfig.pm
--- old/sax/modules/ParseConfig.pm 2008-09-23 17:09:33.000000000 +0200
+++ new/sax/modules/ParseConfig.pm 2008-11-10 17:47:23.000000000 +0100
@@ -95,13 +95,15 @@
#========================================
# RgbPath...
#---------------------------------------
- $result = XFree::GetRgbPath($ptr);
- if (defined $result) {
- $count = 0;
- @list = split(/,/,$result);
- foreach $i (@list) {
- $parse{RgbPath}{$count} = $i;
- $count++;
+ if (XFree::GetParserVersion() <= 4) {
+ $result = XFree::GetRgbPath($ptr);
+ if (defined $result) {
+ $count = 0;
+ @list = split(/,/,$result);
+ foreach $i (@list) {
+ $parse{RgbPath}{$count} = $i;
+ $count++;
+ }
}
}
#========================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/parse/Makefile.Linux new/sax/parse/Makefile.Linux
--- old/sax/parse/Makefile.Linux 2008-06-24 03:21:10.000000000 +0200
+++ new/sax/parse/Makefile.Linux 2008-11-10 17:47:24.000000000 +0100
@@ -10,16 +10,16 @@
# Status: Up-to-date
#
EXTSEC = HAVE_EXTENSIONS_SECTION
+XORGHD = `test -f "/usr/include/xorg/xorg-server.h" && echo HAVE_XORG_SERVER_HEADER || echo NO_XORG_SERVER_HEADER`
all:
- swig -D${EXTSEC} -perl5 XFree.i
+ swig -D${EXTSEC} -D${XORGHD} -perl5 XFree.i
perl Makefile.PL
test:
gcc -O2 parse.c -o parse -L/usr/X11R6/lib -L/usr/X11R6/lib64 \
-iquote /usr/X11R6/include -iquote /usr/include/xorg -I. \
- -DX_BYTE_ORDER=X_LITTLE_ENDIAN \
- -DNEW_INPUT -DNDEBUG -D${EXTSEC} \
+ -DNEW_INPUT -DNDEBUG -D${EXTSEC} -D${XORGHD} \
-lxf86config -lm
clean:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/parse/Makefile.PL new/sax/parse/Makefile.PL
--- old/sax/parse/Makefile.PL 2008-07-24 16:39:13.000000000 +0200
+++ new/sax/parse/Makefile.PL 2008-11-10 17:47:24.000000000 +0100
@@ -3,13 +3,19 @@
$CFLAGS = $ENV{RPM_OPT_FLAGS};
$CFLAGS =~ s/-Wall//;
-$FLAG="HAVE_EXTENSIONS_SECTION";
+$XORGHD = "NO_XORG_SERVER_HEADER";
+if (-f "/usr/include/xorg/xorg-server.h") {
+ $XORGHD="HAVE_XORG_SERVER_HEADER";
+}
+
+$FLAG1="HAVE_EXTENSIONS_SECTION";
+$FLAG2=$XORGHD;
WriteMakefile(
'NAME' => 'XFree',
'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",
+ 'DEFINE' => "-DNEW_INPUT -DNDEBUG -D$FLAG1 -D$FLAG2",
'INC' => '-iquote /usr/X11R6/include -iquote /usr/include/xorg -I.',
'OPTIMIZE' => "-O2 $CFLAGS"
);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/parse/parse.c new/sax/parse/parse.c
--- old/sax/parse/parse.c 2008-09-23 17:09:33.000000000 +0200
+++ new/sax/parse/parse.c 2008-11-10 17:47:24.000000000 +0100
@@ -18,9 +18,15 @@
#include