July 2008 - openSUSE Commits - openSUSE Mailing Lists

commit xorg-x11-driver-video-ivtv
by root＠Hilbert.suse.de 28 Jul '08

28 Jul '08

Hello community, here is the log from the commit of package xorg-x11-driver-video-ivtv checked in at Mon Jul 28 02:06:00 CEST 2008. -------- --- arch/i386/xorg-x11-driver-video-ivtv/xorg-x11-driver-video-ivtv.changes 2008-04-26 10:56:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-ivtv/xorg-x11-driver-video-ivtv.changes 2008-07-28 01:42:53.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 28 01:42:26 CEST 2008 - ro(a)suse.de + +- update to version 1.0.1 + - Add support for newer X org versions with libpciaccess + - xf86-video-ivtv Xv scaling fix + +------------------------------------------------------------------- Old: ---- xf86-video-ivtv-1.0.0.tar.bz2 New: ---- xf86-video-ivtv-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video-ivtv.spec ++++++ --- /var/tmp/diff_new_pack.YsZ384/_old 2008-07-28 01:47:22.000000000 +0200 +++ /var/tmp/diff_new_pack.YsZ384/_new 2008-07-28 01:47:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-driver-video-ivtv (Version 1.0.0) +# spec file for package xorg-x11-driver-video-ivtv (Version 1.0.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -25,8 +25,8 @@ License: X11/MIT Group: System/X11/Servers/XF86_4 AutoReqProv: on -Version: 1.0.0 -Release: 59 +Version: 1.0.1 +Release: 1 Summary: The X11 video driver for the PVR-350 frame buffer Requires: xorg-x11-server Source: xf86-video-ivtv-%{version}.tar.bz2 @@ -71,6 +71,10 @@ %{_libdir}/xorg/modules/drivers/*_drv.so %changelog +* Mon Jul 28 2008 ro(a)suse.de +- update to version 1.0.1 + - Add support for newer X org versions with libpciaccess + - xf86-video-ivtv Xv scaling fix * Sat Apr 26 2008 coolo(a)suse.de - fix build * Wed Oct 17 2007 ro(a)suse.de ++++++ xf86-video-ivtv-1.0.0.tar.bz2 -> xf86-video-ivtv-1.0.1.tar.bz2 ++++++ ++++ 3515 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/autogen.sh new/xf86-video-ivtv-1.0.1/autogen.sh --- old/xf86-video-ivtv-1.0.0/autogen.sh 2007-02-17 14:21:08.000000000 +0100 +++ new/xf86-video-ivtv-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/ChangeLog new/xf86-video-ivtv-1.0.1/ChangeLog --- old/xf86-video-ivtv-1.0.0/ChangeLog 2007-10-14 18:36:10.000000000 +0200 +++ new/xf86-video-ivtv-1.0.1/ChangeLog 2008-03-05 18:41:35.000000000 +0100 @@ -1,3 +1,5 @@ +#1.0.1 - Add support for newer X org versions with libpciaccess + - xf86-video-ivtv Xv scaling fix #1.0.0 - Renamed to ivtv_drv and xf86-video-ivtv for consistency with X11R7 naming convention. - When the ivtv X driver is loaded, it ensures the osd/framebuffer is switched diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/config.h.in new/xf86-video-ivtv-1.0.1/config.h.in --- old/xf86-video-ivtv-1.0.0/config.h.in 2007-02-17 14:21:08.000000000 +0100 +++ new/xf86-video-ivtv-1.0.1/config.h.in 2007-10-19 21:19:45.000000000 +0200 @@ -50,8 +50,20 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Version number of package */ #undef VERSION + +/* Update some functions to new X parameter list */ +#undef X_NEW_PARMS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/configure.ac new/xf86-video-ivtv-1.0.1/configure.ac --- old/xf86-video-ivtv-1.0.0/configure.ac 2007-08-25 21:01:09.000000000 +0200 +++ new/xf86-video-ivtv-1.0.1/configure.ac 2008-02-28 08:07:04.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-ivtv], - 1.0.0, + 1.0.1, [http://ivtvdriver.org/trac], xf86-video-ivtv) @@ -47,16 +47,30 @@ [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) +PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901], + [AC_DEFINE(X_NEW_PARMS,1,[Update some functions to new X parameter list])]) + # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for extensions XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) +XORG_DRIVER_CHECK_EXT(XSERVER_LIBPCIACCESS, pciaccess) XORG_DRIVER_CHECK_EXT(XV, videoproto) -# Checks for libraries. +save_CFLAGS="$CFLAGS" +CFLAGS="$XORG_CFLAGS" +AC_CHECK_DECL(XSERVER_LIBPCIACCESS, + [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no], + [#include "xorg-server.h"]) +CFLAGS="$save_CFLAGS" + +if test "x$XSERVER_LIBPCIACCESS" = xyes; then + PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) +fi +AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) # Checks for header files. AC_HEADER_STDC diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/README new/xf86-video-ivtv-1.0.1/README --- old/xf86-video-ivtv-1.0.0/README 2007-10-14 19:47:44.000000000 +0200 +++ new/xf86-video-ivtv-1.0.1/README 2008-01-14 23:43:22.000000000 +0100 @@ -40,16 +40,28 @@ Xorg 7.x Servers ================ -For new 7.x servers run the configure script followed by make and then make install. -The installation path may well need to be altered using the --prefix option. +For new 7.x servers run: -If you get this error when running the configure script: + autogen.sh + make + make install -checking for XORG... configure: error: Package requirements (xorg-server >= 1.0.99.901 xproto fontsproto ) were not met. +The installation path may well need to be altered using the --prefix +option in autogen.sh. + +If you get this error when running autogen.sh or the configure script: + +checking for XORG... configure: error: Package requirements (xorg-server +xproto fontsproto ) were not met. then it is likely that you are missing the xorg-server development package. For Fedora this package is called 'xorg-x11-server-sdk'. +Debian 4.0 (etch) uses X 7.1.1. You must install the required packages +by using 'apt-get install autoconf automake libtool xserver-xorg-dev +x11proto-core-dev x11proto-fonts-dev'. You can check success by +checking if the files ivtv_drv.la and ivtv_drv.so are available at +/usr/local/lib/xorg/modules/drivers Xorg 6.x & Xfree86 servers ========================== @@ -192,9 +204,10 @@ not specified with the ivtv-fb module. Setting that option locks down the resolution to a fixed value. -If you want to use a custom resolution then you should first load the ivtvfb -module with the resolutions you want. To do that add a line to -/etc/modprobe.conf, e.g.: +If you want to use a custom resolution then you should first load the +ivtvfb module with the resolutions you want. To do that change your +modprobe configuration file by adding a line to /etc/modprobe.conf or +(for Debian 4.0) by creating a file /etc/modprobe.d/ivtvfb: options ivtvfb osd_xres=720 osd_yres=576 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/src/Imakefile new/xf86-video-ivtv-1.0.1/src/Imakefile --- old/xf86-video-ivtv-1.0.0/src/Imakefile 2007-08-27 17:08:53.000000000 +0200 +++ new/xf86-video-ivtv-1.0.1/src/Imakefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -XCOMM -XCOMM This is an Imakefile for the ivtv driver. -XCOMM -#undef DefaultCCOptions -#define DefaultCCOptions -#define IHaveModules -#include <Server.tmpl> - -SRCS = ivtv.c ivtv_hw.c ivtv_xv.c -OBJS = ivtv.o ivtv_hw.o ivtv_xv.o - -#if defined(XF86DriverSDK) -INCLUDES = -I. -I../../include -#else -INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ - -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ - -I$(SERVERSRC)/fb -I$(XF86SRC)/xaa \ - -I$(XF86SRC)/fbdevhw -I$(XF86SRC)/ramdac \ - -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ - -I$(XF86SRC)/rac \ - -I$(SERVERSRC)/Xext -I$(XF86SRC)/xf24_32bpp\ - -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/miext/shadow -I$(EXTINCSRC) -I$(SERVERSRC)/render -#endif -#ifdef XF86_VERSION_CURRENT -XCOMM We are using Xfree86 - -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,16,0) -DEFREGIONNULL = -DX_USE_REGION_NULL -#endif - -#else -XCOMM We are using X.org -DEFREGIONNULL = -DX_USE_REGION_NULL -#endif -DEFINES = FbdevDefines $(DEFREGIONNULL) - -#if MakeHasPosixVariableSubstitutions -SubdirLibraryRule($(OBJS)) -#endif - -ModuleObjectRule() - -ObjectModuleTarget(ivtv,$(OBJS)) - -InstallObjectModule(ivtv,$(MODULEDIR),drivers) - - -DependTarget() - -InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/ivtv) -InstallDriverSDKNonExecFile(ivtv.c,$(DRIVERSDKDIR)/drivers/ivtv) - -InstallDriverSDKObjectModule(ivtv,$(DRIVERSDKMODULEDIR),drivers) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/src/ivtv.c new/xf86-video-ivtv-1.0.1/src/ivtv.c --- old/xf86-video-ivtv-1.0.0/src/ivtv.c 2007-10-12 09:12:46.000000000 +0200 +++ new/xf86-video-ivtv-1.0.1/src/ivtv.c 2008-02-28 08:07:07.000000000 +0100 @@ -114,7 +114,7 @@ #define IVTVDEV_DRIVER_NAME "ivtv" #define IVTVDEV_VERSION_MAJOR 1 #define IVTVDEV_VERSION_MINOR 0 -#define IVTVDEV_VERSION_PATCH 0 +#define IVTVDEV_VERSION_PATCH 1 #define IVTVDEV_VERSION ((IVTVDEV_VERSION_MAJOR << 16) | \ (IVTVDEV_VERSION_MINOR << 8) | \ (IVTVDEV_VERSION_PATCH)) @@ -198,7 +198,7 @@ static void IVTVshadowUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf) { -#ifdef X_MODULAR +#ifdef X_NEW_PARMS RegionPtr damage = DamageRegion(pBuf->pDamage); #else RegionPtr damage = &pBuf->damage; @@ -330,9 +330,6 @@ xf86MatchDevice(IVTVDEV_DRIVER_NAME, &devSections)) <= 0) return FALSE; - if (xf86GetPciVideoInfo() == NULL) - return FALSE; - numUsed = xf86MatchPciInstances(IVTVDEV_DRIVER_NAME, PCI_HAUPPAUGE_VENDOR_ID, IVTVChipsets, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/src/ivtv_hw.c new/xf86-video-ivtv-1.0.1/src/ivtv_hw.c --- old/xf86-video-ivtv-1.0.0/src/ivtv_hw.c 2007-10-12 09:14:57.000000000 +0200 +++ new/xf86-video-ivtv-1.0.1/src/ivtv_hw.c 2008-02-28 08:05:23.000000000 +0100 @@ -269,7 +269,13 @@ xf86DrvMsg(scrnIndex, X_ERROR, "Unable to open yuv device '%s'\n", yuvDevFull); } + } else if (yuvFd == -1 && errno == EACCES) { + /* Device exists, but we weren't allowed to open it */ + xf86DrvMsg(scrnIndex, X_ERROR, + "Unable to open yuv device '%s'. " + "Check device permissions.\n", yuvDevFull); } + if (yuvFd == -1) continue; @@ -350,7 +356,11 @@ /* -------------------------------------------------------------------- */ Bool +#if XSERVER_LIBPCIACCESS +ivtvHWProbe(struct pci_device *PciInfo, char *device, char **namep) +#else ivtvHWProbe(pciVideoPtr pPci, char *device, char **namep) +#endif { int fd; Bool retVal = TRUE; @@ -377,7 +387,11 @@ } Bool +#if XSERVER_LIBPCIACCESS +ivtvHWInit(ScrnInfoPtr pScrn, struct pci_device *PciInfo, char *device) +#else ivtvHWInit(ScrnInfoPtr pScrn, pciVideoPtr pPci, char *device) +#endif { ivtvHWPtr hwPtr; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/src/ivtv_hw.h new/xf86-video-ivtv-1.0.1/src/ivtv_hw.h --- old/xf86-video-ivtv-1.0.0/src/ivtv_hw.h 2007-08-28 10:37:51.000000000 +0200 +++ new/xf86-video-ivtv-1.0.1/src/ivtv_hw.h 2008-02-28 08:05:23.000000000 +0100 @@ -44,6 +44,10 @@ # include "xorgVersion.h" #endif +#ifdef XSERVER_LIBPCIACCESS +#include <pciaccess.h> +#endif + typedef struct { /* framebuffer device: filename (/dev/fb*), handle, more */ @@ -90,17 +94,15 @@ # define IVTVDEVHW_BYTE_SWAP 1 #endif -/* FIXME - There must be a better way to do this..... */ -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(7,0,0,0,0) -# define X_MODULAR 1 -#elif XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,0,0,0,0) -# define X_MODULAR 1 -#endif - Bool ivtvHWGetRec(ScrnInfoPtr pScrn); void ivtvHWFreeRec(ScrnInfoPtr pScrn); +#if XSERVER_LIBPCIACCESS +Bool ivtvHWProbe(struct pci_device *PciInfo, char *device, char **namep); +Bool ivtvHWInit(ScrnInfoPtr pScrn, struct pci_device *PciInfo, char *device); +#else Bool ivtvHWProbe(pciVideoPtr pPci, char *device, char **namep); Bool ivtvHWInit(ScrnInfoPtr pScrn, pciVideoPtr pPci, char *device); +#endif char *ivtvHWGetName(ScrnInfoPtr pScrn); int ivtvHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp); int ivtvHWGetLineLength(ScrnInfoPtr pScrn); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/src/ivtv_xv.c new/xf86-video-ivtv-1.0.1/src/ivtv_xv.c --- old/xf86-video-ivtv-1.0.0/src/ivtv_xv.c 2007-08-28 10:37:51.000000000 +0200 +++ new/xf86-video-ivtv-1.0.1/src/ivtv_xv.c 2007-11-05 18:31:09.000000000 +0100 @@ -66,7 +66,7 @@ static void IVTVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer); -#ifdef X_MODULAR +#ifdef X_NEW_PARMS static int IVTVPutImage(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char *, short, short, Bool, RegionPtr, pointer, DrawablePtr); @@ -566,11 +566,12 @@ ((sc_y & 15) << 4) + (blk_index & 15) + suv_offset; /* Copy v */ - dst[dst_offset] = src[(width >> 1) * us_y + v_offset + us_x]; - blk_index++; + dst[dst_offset++] = src[(width >> 1) * us_y + v_offset + us_x]; + /* Copy u */ dst[dst_offset] = src[(width >> 1) * us_y + u_offset + us_x]; - blk_index++; + + blk_index+=2; if (xskip_count != xskip) { /* Count towards the next horizontal skip */ @@ -676,7 +677,7 @@ return (sc_x << 16) | sc_y; } -#ifdef X_MODULAR +#ifdef X_NEW_PARMS static int IVTVPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit regexp
by root＠Hilbert.suse.de 27 Jul '08

27 Jul '08

Hello community, here is the log from the commit of package regexp checked in at Mon Jul 28 01:22:58 CEST 2008. -------- --- regexp/regexp.changes 2006-09-27 15:30:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/regexp/regexp.changes 2008-07-27 13:32:43.885738000 +0200 @@ -1,0 +2,5 @@ +Sun Jul 27 13:32:47 CEST 2008 - coolo(a)suse.de + +- build with gcj to avoid bootstrapping problems with openjdk + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ regexp.spec ++++++ --- /var/tmp/diff_new_pack.kH5618/_old 2008-07-28 01:17:46.000000000 +0200 +++ /var/tmp/diff_new_pack.kH5618/_new 2008-07-28 01:17:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package regexp (Version 1.3) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,22 +11,24 @@ # norootforbuild # icecream 0 + Name: regexp -BuildRequires: ant java2-devel-packages xml-commons-apis +BuildRequires: ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap +#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 %define name regexp %define full_name jakarta-%{name} %define version 1.3 %define release 2jpp %define section free Version: 1.3 -Release: 25 +Release: 232 Summary: Simple regular expressions API -License: Apache +License: The Apache Software License Group: Development/Libraries/Java -URL: http://jakarta.apache.org/regexp/ +Url: http://jakarta.apache.org/regexp/ Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz Patch: %{name}-java14compat.patch -Buildarch: noarch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,6 +42,7 @@ %package javadoc +License: The Apache Software License PreReq: coreutils Group: Development/Libraries/Java Summary: Javadoc for regexp @@ -97,17 +100,19 @@ %defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version} -%changelog -n regexp -* Wed Sep 27 2006 - skh(a)suse.de +%changelog +* Sun Jul 27 2008 coolo(a)suse.de +- build with gcj to avoid bootstrapping problems with openjdk +* Wed Sep 27 2006 skh(a)suse.de - don't use icecream - use source="1.4" and target="1.4" for build with java 1.5 -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Fri Jul 29 2005 - jsmeix(a)suse.de +* Fri Jul 29 2005 jsmeix(a)suse.de - Adjustments in the spec file. -* Mon Jul 18 2005 - jsmeix(a)suse.de +* Mon Jul 18 2005 jsmeix(a)suse.de - Current version 1.3 from JPackage.org -* Thu Sep 16 2004 - skh(a)suse.de +* Thu Sep 16 2004 skh(a)suse.de - Fix prerequires of javadoc subpackage -* Thu Sep 02 2004 - skh(a)suse.de +* Thu Sep 02 2004 skh(a)suse.de - Initial package created with version 1.3 (JPackage 1.5) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde4-konqueror-plugins
by root＠Hilbert.suse.de 27 Jul '08

27 Jul '08

Hello community, here is the log from the commit of package kde4-konqueror-plugins checked in at Mon Jul 28 01:17:34 CEST 2008. -------- --- KDE/kde4-konqueror-plugins/kde4-konqueror-plugins.changes 2008-07-07 18:06:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde4-konqueror-plugins/kde4-konqueror-plugins.changes 2008-07-27 11:03:50.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jul 27 11:01:20 CEST 2008 - stbinner(a)suse.de + +- update from SVN + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-konqueror-plugins.spec ++++++ --- /var/tmp/diff_new_pack.T27191/_old 2008-07-28 01:10:38.000000000 +0200 +++ /var/tmp/diff_new_pack.T27191/_new 2008-07-28 01:10:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kde4-konqueror-plugins (Version 4.0.svn819877) +# spec file for package kde4-konqueror-plugins (Version 4.1.svn838216) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: kde4-konqueror-plugins -BuildRequires: kdebase4-workspace-devel libkonq-devel +BuildRequires: kdebase4-workspace-devel libQtWebKit-devel libkonq-devel License: GPL v2 or later Group: Productivity/Networking/Web/Browsers Summary: Konqueror Related Addons -Version: 4.0.svn819877 -Release: 7 +Version: 4.1.svn838216 +Release: 1 Source0: base.tar.bz2 Patch: google-suggest.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -92,8 +92,11 @@ /usr/share/icons/oxygen/*/actions/imagegallery.* /usr/share/icons/oxygen/*/actions/validators.* /usr/share/icons/oxygen/*/actions/webarchiver.* +%doc %lang(en) /usr/share/doc/kde/HTML/en/konq-plugins %changelog +* Sun Jul 27 2008 stbinner(a)suse.de +- update from SVN * Mon Jul 07 2008 dmueller(a)suse.de - adjust buildrequires * Wed Jun 25 2008 dmueller(a)suse.de ++++++ base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/base/doc/CMakeLists.txt new/base/doc/CMakeLists.txt --- old/base/doc/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/base/doc/CMakeLists.txt 2007-09-25 08:54:17.000000000 +0200 @@ -0,0 +1 @@ +add_subdirectory(konq-plugins) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/base/konq-plugins/autorefresh/autorefresh.rc new/base/konq-plugins/autorefresh/autorefresh.rc --- old/base/konq-plugins/autorefresh/autorefresh.rc 2008-06-12 15:14:04.000000000 +0200 +++ new/base/konq-plugins/autorefresh/autorefresh.rc 2008-07-03 21:28:43.000000000 +0200 @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> - <kpartgui library="autorefresh" name="autorefresh" version="0.2" > + <kpartgui library="autorefresh" name="autorefresh" version="2" > <MenuBar> <Menu name="tools"> <Text>&Tools</Text> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/base/konq-plugins/babelfish/CMakeLists.txt new/base/konq-plugins/babelfish/CMakeLists.txt --- old/base/konq-plugins/babelfish/CMakeLists.txt 2008-04-08 00:16:18.000000000 +0200 +++ new/base/konq-plugins/babelfish/CMakeLists.txt 2008-07-17 14:10:38.000000000 +0200 @@ -12,14 +12,17 @@ macro_bool_to_01(WEBKITKDE_FOUND HAVE_WEBKITKDE) -configure_file(config-babelfish.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-babelfish.h ) - -########### next target ############### - if( WEBKITKDE_FOUND ) include_directories(${WEBKITKDE_INCLUDE_DIR}) + FIND_PATH(WEBVIEW_PATH webkitkde/webview.h PATH ${WEBKITKDE_INCLUDE_DIR}) + macro_bool_to_01(WEBVIEW_PATH HAVE_WEBVIEW ) endif(WEBKITKDE_FOUND) + +configure_file(config-babelfish.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-babelfish.h ) + +########### next target ############### + set(babelfishplugin_PART_SRCS plugin_babelfish.cpp ) kde4_add_plugin(babelfishplugin WITH_PREFIX ${babelfishplugin_PART_SRCS}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/base/konq-plugins/babelfish/config-babelfish.h.cmake new/base/konq-plugins/babelfish/config-babelfish.h.cmake --- old/base/konq-plugins/babelfish/config-babelfish.h.cmake 2008-04-08 00:16:18.000000000 +0200 +++ new/base/konq-plugins/babelfish/config-babelfish.h.cmake 2008-07-17 14:10:38.000000000 +0200 @@ -1 +1,2 @@ #cmakedefine HAVE_WEBKITKDE 1 +#cmakedefine HAVE_WEBVIEW 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/base/konq-plugins/babelfish/plugin_babelfish.cpp new/base/konq-plugins/babelfish/plugin_babelfish.cpp --- old/base/konq-plugins/babelfish/plugin_babelfish.cpp 2008-04-08 00:16:18.000000000 +0200 +++ new/base/konq-plugins/babelfish/plugin_babelfish.cpp 2008-07-17 14:10:38.000000000 +0200 @@ -43,8 +43,12 @@ #ifdef HAVE_WEBKITKDE #include <webkitpart.h> +#ifdef HAVE_WEBVIEW +#include <webview.h> +#else #include <webkitview.h> #endif +#endif typedef KGenericFactory<PluginBabelFish> BabelFishFactory; static const KAboutData aboutdata("babelfish", 0, ki18n("Translate Web Page") , "1.0" ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/base/konq-plugins/dirfilter/CMakeLists.txt new/base/konq-plugins/dirfilter/CMakeLists.txt --- old/base/konq-plugins/dirfilter/CMakeLists.txt 2008-04-08 13:30:51.000000000 +0200 +++ new/base/konq-plugins/dirfilter/CMakeLists.txt 2008-07-22 12:33:33.000000000 +0200 @@ -11,7 +11,7 @@ -target_link_libraries(dirfilterplugin ${KDE4_KDE3SUPPORT_LIBS} ) +target_link_libraries(dirfilterplugin ${KDE4_KPARTS_LIBS}) install(TARGETS dirfilterplugin DESTINATION ${PLUGIN_INSTALL_DIR} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/base/konq-plugins/kimgalleryplugin/CMakeLists.txt new/base/konq-plugins/kimgalleryplugin/CMakeLists.txt --- old/base/konq-plugins/kimgalleryplugin/CMakeLists.txt 2008-04-10 09:47:17.000000000 +0200 +++ new/base/konq-plugins/kimgalleryplugin/CMakeLists.txt 2008-07-22 01:28:54.000000000 +0200 @@ -10,7 +10,7 @@ -target_link_libraries(kimgallery ${KDE4_KDE3SUPPORT_LIBS} konq ) +target_link_libraries(kimgallery ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ) install(TARGETS kimgallery DESTINATION ${PLUGIN_INSTALL_DIR} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/base/konq-plugins/searchbar/searchbar.cpp new/base/konq-plugins/searchbar/searchbar.cpp --- old/base/konq-plugins/searchbar/searchbar.cpp 2008-04-07 22:39:22.000000000 +0200 +++ new/base/konq-plugins/searchbar/searchbar.cpp 2008-07-11 23:09:38.000000000 +0200 @@ -218,7 +218,6 @@ m_searchCombo->addToHistory(search); m_searchCombo->setItemIcon(0, m_searchIcon); - m_searchCombo->setEditText(QString()); m_urlEnterLock = false; } @@ -329,6 +328,7 @@ m_searchMode = UseSearchProvider; m_currentEngine = m_searchEngines.at(id); setIcon(); + m_searchCombo->lineEdit()->selectAll(); } void SearchBarPlugin::selectSearchEngines() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit jlex
by root＠Hilbert.suse.de 27 Jul '08

27 Jul '08

Hello community, here is the log from the commit of package jlex checked in at Mon Jul 28 01:10:29 CEST 2008. -------- --- jlex/jlex.changes 2008-07-25 08:08:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/jlex/jlex.changes 2008-07-27 13:45:53.580253000 +0200 @@ -1,0 +2,5 @@ +Sun Jul 27 13:45:56 CEST 2008 - coolo(a)suse.de + +- avoid more packages creating bootstrap problems + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jlex.spec ++++++ --- /var/tmp/diff_new_pack.K26311/_old 2008-07-28 01:10:23.000000000 +0200 +++ /var/tmp/diff_new_pack.K26311/_new 2008-07-28 01:10:23.000000000 +0200 @@ -14,12 +14,13 @@ Name: jlex BuildRequires: ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap +#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 %define name jlex %define version 1.2.6 %define release 2jpp %define section free Version: 1.2.6 -Release: 230 +Release: 232 Summary: A Lexical Analyzer Generator for Java License: BSD 3-Clause Group: Development/Libraries/Java @@ -78,6 +79,8 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Sun Jul 27 2008 coolo(a)suse.de +- avoid more packages creating bootstrap problems * Fri Jul 25 2008 coolo(a)suse.de - build with gcj to avoid bootstrap problems with openjdk * Mon Sep 25 2006 skh(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bcel
by root＠Hilbert.suse.de 27 Jul '08

27 Jul '08

Hello community, here is the log from the commit of package bcel checked in at Mon Jul 28 01:10:12 CEST 2008. -------- --- bcel/bcel.changes 2008-07-22 20:57:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/bcel/bcel.changes 2008-07-27 13:34:51.661836000 +0200 @@ -1,0 +2,5 @@ +Sun Jul 27 13:34:42 CEST 2008 - coolo(a)suse.de + +- avoid xerces and xml-commons (ant still works) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bcel.spec ++++++ --- /var/tmp/diff_new_pack.S23628/_old 2008-07-28 01:09:06.000000000 +0200 +++ /var/tmp/diff_new_pack.S23628/_new 2008-07-28 01:09:06.000000000 +0200 @@ -13,14 +13,15 @@ Name: bcel -BuildRequires: ant java-1_5_0-gcj-compat-devel regexp xml-commons-apis-bootstrap +BuildRequires: ant java-1_5_0-gcj-compat-devel regexp xerces-j2-bootstrap xml-commons-apis-bootstrap +#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 %define name bcel %define version 5.1 %define release 5jpp %define section free %define manual 0 Version: 5.1 -Release: 274 +Release: 276 Summary: Byte Code Engineering Library License: The Apache Software License Source0: http://jakarta.apache.org/builds/jakarta-bcel/release/v5.1/bcel-5.1-src.tar… @@ -177,6 +178,8 @@ # ----------------------------------------------------------------------------- %changelog +* Sun Jul 27 2008 coolo(a)suse.de +- avoid xerces and xml-commons (ant still works) * Tue Jul 22 2008 coolo(a)suse.de - build with gcj to avoid build cycle * Mon Sep 25 2006 skh(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hal
by root＠Hilbert.suse.de 27 Jul '08

27 Jul '08

Hello community, here is the log from the commit of package hal checked in at Sun Jul 27 12:00:15 CEST 2008. -------- --- hal/hal.changes 2008-06-20 14:05:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/hal/hal.changes 2008-07-25 12:14:27.000000000 +0200 @@ -1,0 +2,113 @@ +Thu Jul 24 15:56:35 CEST 2008 - dkukawka(a)suse.de + +- enabled ACL support + +------------------------------------------------------------------- +Wed Jul 16 20:03:13 CEST 2008 - dkukawka(a)suse.de + +- updated hal-info to latest git (20080716) +- added new patches to fix mess from git master: + - hal-info-20080716-fix-Samsung-keymapping.diff: fix keymapping + for Samsung machines and added a S20X + - hal-info-20080716-fix-acer-keymapping.diff: fixed Acer mapping, + added keys to allow blacklisting, use it now only for laptops, + added a TM 660 + +------------------------------------------------------------------- +Tue Jul 15 22:56:51 CEST 2008 - dkukawka(a)suse.de + +- added new patch: + - hal-info-20080715-add-CDMA_USB_modem.diff: add a CDMA USB + modem, info for fdi-file contributed by reporter via bnc#405332 + +------------------------------------------------------------------- +Tue Jul 15 20:40:12 CEST 2008 - dkukawka(a)suse.de + +- fixed rchal file, removed ';' to fix bnc#407880 + +------------------------------------------------------------------- +Mon Jul 7 20:45:51 CEST 2008 - dkukawka(a)suse.de + +- fixed libsmbios requirements due to renaming of libsmbios-lib + +------------------------------------------------------------------- +Wed Jul 2 14:34:18 CEST 2008 - dkukawka(a)suse.de + +- added new patch: + - hal-20080702-ipw-killswitch-addon.diff: added new addon for the + IPW killswitch device to improve performance since this + interface get called every 1 or 2 seconds by NetworkManager. + +------------------------------------------------------------------- +Wed Jul 2 00:41:59 CEST 2008 - dkukawka(a)suse.de + +- added new patch: + - hal-info-20080702-fix-identify-cardreader.diff: update matches + for some cardreader (fix for fd.o#16577) + +------------------------------------------------------------------- +Wed Jul 2 00:08:55 CEST 2008 - dkukawka(a)suse.de + +- signed and added comments to all the may upstream going patches +- added new patch: + - hal-20080701-fix-merge-uint64.diff: fix merge for unit64 + +------------------------------------------------------------------- +Tue Jul 1 15:34:06 CEST 2008 - dkukawka(a)suse.de + +- added new patch: + - hal-20080701-generic-backlight-addon.diff: use an addon instead + of callout to set/read brightness to/from generic sysfs + backlight interface + +------------------------------------------------------------------- +Tue Jul 1 13:16:54 CEST 2008 - dkukawka(a)suse.de + +- updated patch: + - hal-20080701-fix-get_storage.model_from_SCSI.diff: read from + layer only for IDE devices + +------------------------------------------------------------------- +Mon Jun 30 22:42:08 CEST 2008 - dkukawka(a)suse.de + +- added new patch: + - hal-20080630-reuse-check_priv-code_for_helper.diff: added new + files util_helper_priv.{c/h} to reuse code of check_priv() in + the addons instead of do the same again and again. + +------------------------------------------------------------------- +Mon Jun 30 16:15:05 CEST 2008 - dkukawka(a)suse.de + +- added new patches: + - hal-20080630-fix-get_storage.model_from_SCSI.diff: fix for + bnc#397871 to get storage.model from SCSI-layer via ioctl and + not from sysfs to prevent problems with ide via SCSI layer + - hal-20080630-fix-remove_storage.model_from_Volumes.diff: + remove the storage.model property from volumes, they don't need + it and it's always empty + +------------------------------------------------------------------- +Sat Jun 28 18:15:28 CEST 2008 - dkukawka(a)suse.de + +- added new patch: + - hal-20080628-fix-memory-leak-g_strsplit.diff: fix possible + memoryleak + +------------------------------------------------------------------- +Fri Jun 27 16:28:47 CEST 2008 - dkukawka(a)suse.de + +- fixed spec file +- added new patch: + - hal-20080414-fix-pmu_sysfs-power_supply.diff: fix for fd.o + #15482 to fix battery handling with pmu (ppc) + +------------------------------------------------------------------- +Thu Jun 26 18:08:04 CEST 2008 - dkukawka(a)suse.de + +- renamed patches, use now this notation to trace date of patch + creation/change: hal-${DATE}-* +- update HAL to latest git master (20080626) +- added new patch: + - hal-20080626-fix-PropertyModified.diff: fix fd.o #16427 + +------------------------------------------------------------------- @@ -6,0 +120,12 @@ +Tue Jun 17 23:20:46 CEST 2008 - dkukawka(a)suse.de + +- updated hal-info to 20080617 + +------------------------------------------------------------------- +Thu Jun 5 18:37:19 CEST 2008 - dkukawka(a)suse.de + +- updated hal to git master and hal-info to 20080605 +- removed patches: + - hal-update-to_41073645ea95e.diff + +------------------------------------------------------------------- hal-doc.changes: same change Old: ---- hal-0.5.11.tar.bz2 hal-add-standby-support_v2.diff hal-allow_uid_for_ntfs.diff hal-cleanup-deprecated_libhal-storage.diff hal-configure.diff hal-fix-linux_remove_childs.diff hal-fix-storage-policy-fixed-drives.diff hal-info-20080523.tar.bz2 hal-panasonic-acpi-suse.diff hal-update-to_41073645ea95e.diff New: ---- hal-0.5.11_git20080626.tar.bz2 hal-20061124-allow_uid_for_ntfs.diff hal-20070613-panasonic-acpi-suse.diff hal-20070803-cleanup-deprecated_libhal-storage.diff hal-20071113-fix-storage-policy-fixed-drives.diff hal-20080317-fix-linux_remove_childs.diff hal-20080318-add-standby-support_v2.diff hal-20080414-fix-pmu_sysfs-power_supply.diff hal-20080620-fix-configure.diff hal-20080626-fix-PropertyModified.diff hal-20080628-fix-memory-leak-g_strsplit.diff hal-20080630-fix-remove_storage.model_from_Volumes.diff hal-20080630-reuse-check_priv-code_for_helper.diff hal-20080701-fix-get_storage.model_from_SCSI.diff hal-20080701-fix-merge-uint64.diff hal-20080701-generic-backlight-addon.diff hal-20080702-ipw-killswitch-addon.diff hal-info-20080702-fix-identify-cardreader.diff hal-info-20080715-add-CDMA_USB_modem.diff hal-info-20080716-fix-acer-keymapping.diff hal-info-20080716-fix-Samsung-keymapping.diff hal-info-20080716.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-doc.spec ++++++ --- /var/tmp/diff_new_pack.bn6008/_old 2008-07-27 11:59:33.000000000 +0200 +++ /var/tmp/diff_new_pack.bn6008/_new 2008-07-27 11:59:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hal-doc (Version 0.5.11) +# spec file for package hal-doc (Version 0.5.11_git20080626) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,9 +19,10 @@ Summary: Daemon for Collecting Hardware Information %define dbus_version 0.61 %define dbus_release 1 -%define hal_info_version 20080523 -Version: 0.5.11 -Release: 12 +%define hal_info_version 20080716 +%define libsmbios_version 2.0.2 +Version: 0.5.11_git20080626 +Release: 1 Url: http://freedesktop.org/Software/hal License: Other uncritical OpenSource License Group: System/Daemons @@ -29,8 +30,8 @@ Requires: pm-utils BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files %ifarch %ix86 x86_64 -BuildRequires: libsmbios-libs >= 0.13.12 -BuildRequires: libsmbios-devel >= 0.13.12 +BuildRequires: libsmbios2 >= %libsmbios_version +BuildRequires: libsmbios-devel >= %libsmbios_version BuildRequires: gcc-c++ #!BuildIgnore: pciutils-ids %endif @@ -51,7 +52,7 @@ Provides: hotkey-setup = 0.1 Obsoletes: hotkey-setup <= 0.1 %ifarch %ix86 x86_64 ia64 -Requires: pmtools, libsmbios-libs >= 0.13.12 +Requires: pmtools, libsmbios2 >= %libsmbios_version %endif %ifarch %ix86 x86_64 Requires: setserial @@ -67,24 +68,36 @@ Source50: hal-doc-rpmlintrc Source60: hal-rpmlintrc # SUSE specific patches -Patch1: hal-panasonic-acpi-suse.diff -Patch2: hal-allow_uid_for_ntfs.diff -Patch3: hal-fix-storage-policy-fixed-drives.diff -Patch4: hal-configure.diff +Patch1: hal-20070613-panasonic-acpi-suse.diff +Patch2: hal-20061124-allow_uid_for_ntfs.diff +Patch3: hal-20071113-fix-storage-policy-fixed-drives.diff # SUSE specific temporary patches -Patch10: hal-add-standby-support_v2.diff +Patch10: hal-20080318-add-standby-support_v2.diff # submitted (or planed to do in next time) upstream patches -Patch100: hal-fix-linux_remove_childs.diff +Patch100: hal-20080317-fix-linux_remove_childs.diff +Patch101: hal-20080626-fix-PropertyModified.diff +Patch102: hal-20080414-fix-pmu_sysfs-power_supply.diff +Patch103: hal-20080628-fix-memory-leak-g_strsplit.diff +Patch104: hal-20080701-fix-get_storage.model_from_SCSI.diff +Patch105: hal-20080630-fix-remove_storage.model_from_Volumes.diff +Patch106: hal-20080630-reuse-check_priv-code_for_helper.diff +Patch107: hal-20080701-generic-backlight-addon.diff +Patch108: hal-20080701-fix-merge-uint64.diff +Patch109: hal-20080702-ipw-killswitch-addon.diff +Patch110: hal-20080620-fix-configure.diff # backports from git master: -Patch200: hal-update-to_41073645ea95e.diff +#Patch200: hal-update-to_.diff # revert from HEAD: #Patch250: hal-revert.diff # patches from ML: #Patch300: hal-ML.diff # hal-info related patches: -#Patch400: hal-info.diff +Patch400: hal-info-20080702-fix-identify-cardreader.diff +Patch401: hal-info-20080715-add-CDMA_USB_modem.diff +Patch402: hal-info-20080716-fix-acer-keymapping.diff +Patch403: hal-info-20080716-fix-Samsung-keymapping.diff # currently unused patches: -Patch500: hal-cleanup-deprecated_libhal-storage.diff +Patch500: hal-20070803-cleanup-deprecated_libhal-storage.diff # temporary debug patches #Patch1000: hal-debug.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -123,7 +136,7 @@ Requires: e2fsprogs-devel %endif %ifarch %ix86 x86_64 -BuildRequires: libsmbios-devel >= 0.13.12 +BuildRequires: libsmbios-devel >= %libsmbios_version %endif AutoReqProv: on Group: Development/Libraries/Other @@ -162,15 +175,27 @@ %patch1 -p0 %patch2 -p1 %patch3 -p0 -%patch4 -p0 %patch10 -p0 %patch100 -p1 -%patch200 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 +%patch105 -p1 +%patch106 -p1 +%patch107 -p1 +%patch108 -p1 +%patch109 -p1 +%patch110 -p1 +#%patch200 -p1 #%patch300 -p1 #%patch1000 -p1 # patch hal-info package if needed pushd hal-info-%{hal_info_version} -#%patch400 -p1 +%patch400 -p1 +%patch401 -p1 +%patch402 -p1 +%patch403 -p1 popd %build @@ -187,6 +212,7 @@ --with-hal-group=haldaemon \ --docdir=%{_datadir}/doc/packages/hal \ --with-eject=/bin/eject \ + --enable-acl-management \ %ifarch ppc ppc64 --disable-acpi \ --disable-acpi-acpid \ @@ -358,8 +384,82 @@ %endif %changelog +* Thu Jul 24 2008 dkukawka(a)suse.de +- enabled ACL support +* Wed Jul 16 2008 dkukawka(a)suse.de +- updated hal-info to latest git (20080716) +- added new patches to fix mess from git master: + - hal-info-20080716-fix-Samsung-keymapping.diff: fix keymapping + for Samsung machines and added a S20X + - hal-info-20080716-fix-acer-keymapping.diff: fixed Acer mapping, + added keys to allow blacklisting, use it now only for laptops, + added a TM 660 +* Wed Jul 16 2008 dkukawka(a)suse.de +- added new patch: + - hal-info-20080715-add-CDMA_USB_modem.diff: add a CDMA USB + modem, info for fdi-file contributed by reporter via bnc#405332 +* Tue Jul 15 2008 dkukawka(a)suse.de +- fixed rchal file, removed ';' to fix bnc#407880 +* Mon Jul 07 2008 dkukawka(a)suse.de +- fixed libsmbios requirements due to renaming of libsmbios-lib +* Wed Jul 02 2008 dkukawka(a)suse.de +- added new patch: + - hal-20080702-ipw-killswitch-addon.diff: added new addon for the + IPW killswitch device to improve performance since this + interface get called every 1 or 2 seconds by NetworkManager. +* Wed Jul 02 2008 dkukawka(a)suse.de +- added new patch: + - hal-info-20080702-fix-identify-cardreader.diff: update matches + for some cardreader (fix for fd.o#16577) +* Wed Jul 02 2008 dkukawka(a)suse.de +- signed and added comments to all the may upstream going patches +- added new patch: + - hal-20080701-fix-merge-uint64.diff: fix merge for unit64 +* Tue Jul 01 2008 dkukawka(a)suse.de +- added new patch: + - hal-20080701-generic-backlight-addon.diff: use an addon instead + of callout to set/read brightness to/from generic sysfs + backlight interface +* Tue Jul 01 2008 dkukawka(a)suse.de +- updated patch: + - hal-20080701-fix-get_storage.model_from_SCSI.diff: read from + layer only for IDE devices +* Tue Jul 01 2008 dkukawka(a)suse.de +- added new patch: + - hal-20080630-reuse-check_priv-code_for_helper.diff: added new + files util_helper_priv.{c/h} to reuse code of check_priv() in + the addons instead of do the same again and again. +* Mon Jun 30 2008 dkukawka(a)suse.de +- added new patches: + - hal-20080630-fix-get_storage.model_from_SCSI.diff: fix for + bnc#397871 to get storage.model from SCSI-layer via ioctl and + not from sysfs to prevent problems with ide via SCSI layer + - hal-20080630-fix-remove_storage.model_from_Volumes.diff: + remove the storage.model property from volumes, they don't need + it and it's always empty +* Sat Jun 28 2008 dkukawka(a)suse.de +- added new patch: + - hal-20080628-fix-memory-leak-g_strsplit.diff: fix possible + memoryleak +* Fri Jun 27 2008 dkukawka(a)suse.de +- fixed spec file +- added new patch: + - hal-20080414-fix-pmu_sysfs-power_supply.diff: fix for fd.o + [#15482] to fix battery handling with pmu (ppc) +* Thu Jun 26 2008 dkukawka(a)suse.de +- renamed patches, use now this notation to trace date of patch + creation/change: hal-${DATE}-* +- update HAL to latest git master (20080626) +- added new patch: + - hal-20080626-fix-PropertyModified.diff: fix fd.o #16427 * Fri Jun 20 2008 schwab(a)suse.de - Fix configure script. +* Wed Jun 18 2008 dkukawka(a)suse.de +- updated hal-info to 20080617 +* Thu Jun 05 2008 dkukawka(a)suse.de +- updated hal to git master and hal-info to 20080605 +- removed patches: + - hal-update-to_41073645ea95e.diff * Sat May 24 2008 dkukawka(a)suse.de - updated hal-info to 20080523 including: - bnc#378674: fix huawei e220 umts-modem ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.bn6008/_old 2008-07-27 11:59:33.000000000 +0200 +++ /var/tmp/diff_new_pack.bn6008/_new 2008-07-27 11:59:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hal (Version 0.5.11) +# spec file for package hal (Version 0.5.11_git20080626) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,9 +19,10 @@ Summary: Daemon for Collecting Hardware Information %define dbus_version 0.61 %define dbus_release 1 -%define hal_info_version 20080523 -Version: 0.5.11 -Release: 11 +%define hal_info_version 20080716 +%define libsmbios_version 2.0.2 +Version: 0.5.11_git20080626 +Release: 1 Url: http://freedesktop.org/Software/hal License: GPL v2 or later; AFL Group: System/Daemons @@ -29,8 +30,8 @@ Requires: pm-utils BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files %ifarch %ix86 x86_64 -BuildRequires: libsmbios-libs >= 0.13.12 -BuildRequires: libsmbios-devel >= 0.13.12 +BuildRequires: libsmbios2 >= %libsmbios_version +BuildRequires: libsmbios-devel >= %libsmbios_version BuildRequires: gcc-c++ #!BuildIgnore: pciutils-ids %endif @@ -51,7 +52,7 @@ Provides: hotkey-setup = 0.1 Obsoletes: hotkey-setup <= 0.1 %ifarch %ix86 x86_64 ia64 -Requires: pmtools, libsmbios-libs >= 0.13.12 +Requires: pmtools, libsmbios2 >= %libsmbios_version %endif %ifarch %ix86 x86_64 Requires: setserial @@ -67,24 +68,36 @@ Source50: hal-doc-rpmlintrc Source60: hal-rpmlintrc # SUSE specific patches -Patch1: hal-panasonic-acpi-suse.diff -Patch2: hal-allow_uid_for_ntfs.diff -Patch3: hal-fix-storage-policy-fixed-drives.diff -Patch4: hal-configure.diff +Patch1: hal-20070613-panasonic-acpi-suse.diff +Patch2: hal-20061124-allow_uid_for_ntfs.diff +Patch3: hal-20071113-fix-storage-policy-fixed-drives.diff # SUSE specific temporary patches -Patch10: hal-add-standby-support_v2.diff +Patch10: hal-20080318-add-standby-support_v2.diff # submitted (or planed to do in next time) upstream patches -Patch100: hal-fix-linux_remove_childs.diff +Patch100: hal-20080317-fix-linux_remove_childs.diff +Patch101: hal-20080626-fix-PropertyModified.diff +Patch102: hal-20080414-fix-pmu_sysfs-power_supply.diff +Patch103: hal-20080628-fix-memory-leak-g_strsplit.diff +Patch104: hal-20080701-fix-get_storage.model_from_SCSI.diff +Patch105: hal-20080630-fix-remove_storage.model_from_Volumes.diff +Patch106: hal-20080630-reuse-check_priv-code_for_helper.diff +Patch107: hal-20080701-generic-backlight-addon.diff +Patch108: hal-20080701-fix-merge-uint64.diff +Patch109: hal-20080702-ipw-killswitch-addon.diff +Patch110: hal-20080620-fix-configure.diff # backports from git master: -Patch200: hal-update-to_41073645ea95e.diff +#Patch200: hal-update-to_.diff # revert from HEAD: #Patch250: hal-revert.diff # patches from ML: #Patch300: hal-ML.diff # hal-info related patches: -#Patch400: hal-info.diff +Patch400: hal-info-20080702-fix-identify-cardreader.diff +Patch401: hal-info-20080715-add-CDMA_USB_modem.diff +Patch402: hal-info-20080716-fix-acer-keymapping.diff +Patch403: hal-info-20080716-fix-Samsung-keymapping.diff # currently unused patches: -Patch500: hal-cleanup-deprecated_libhal-storage.diff +Patch500: hal-20070803-cleanup-deprecated_libhal-storage.diff # temporary debug patches #Patch1000: hal-debug.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -122,7 +135,7 @@ Requires: e2fsprogs-devel %endif %ifarch %ix86 x86_64 -BuildRequires: libsmbios-devel >= 0.13.12 +BuildRequires: libsmbios-devel >= %libsmbios_version %endif AutoReqProv: on Group: Development/Libraries/Other @@ -161,15 +174,27 @@ %patch1 -p0 %patch2 -p1 %patch3 -p0 -%patch4 -p0 %patch10 -p0 %patch100 -p1 -%patch200 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 +%patch105 -p1 +%patch106 -p1 +%patch107 -p1 +%patch108 -p1 +%patch109 -p1 +%patch110 -p0 +#%patch200 -p1 #%patch300 -p1 #%patch1000 -p1 # patch hal-info package if needed pushd hal-info-%{hal_info_version} -#%patch400 -p1 +%patch400 -p1 +%patch401 -p1 +%patch402 -p1 +%patch403 -p1 popd %build @@ -186,6 +211,7 @@ --with-hal-group=haldaemon \ --docdir=%{_datadir}/doc/packages/hal \ --with-eject=/bin/eject \ + --enable-acl-management \ %ifarch ppc ppc64 --disable-acpi \ --disable-acpi-acpid \ @@ -357,8 +383,82 @@ %endif %changelog +* Thu Jul 24 2008 dkukawka(a)suse.de +- enabled ACL support +* Wed Jul 16 2008 dkukawka(a)suse.de +- updated hal-info to latest git (20080716) +- added new patches to fix mess from git master: + - hal-info-20080716-fix-Samsung-keymapping.diff: fix keymapping + for Samsung machines and added a S20X + - hal-info-20080716-fix-acer-keymapping.diff: fixed Acer mapping, + added keys to allow blacklisting, use it now only for laptops, + added a TM 660 +* Wed Jul 16 2008 dkukawka(a)suse.de +- added new patch: + - hal-info-20080715-add-CDMA_USB_modem.diff: add a CDMA USB + modem, info for fdi-file contributed by reporter via bnc#405332 +* Tue Jul 15 2008 dkukawka(a)suse.de +- fixed rchal file, removed ';' to fix bnc#407880 +* Mon Jul 07 2008 dkukawka(a)suse.de +- fixed libsmbios requirements due to renaming of libsmbios-lib +* Wed Jul 02 2008 dkukawka(a)suse.de +- added new patch: + - hal-20080702-ipw-killswitch-addon.diff: added new addon for the + IPW killswitch device to improve performance since this + interface get called every 1 or 2 seconds by NetworkManager. +* Wed Jul 02 2008 dkukawka(a)suse.de +- added new patch: + - hal-info-20080702-fix-identify-cardreader.diff: update matches + for some cardreader (fix for fd.o#16577) +* Wed Jul 02 2008 dkukawka(a)suse.de +- signed and added comments to all the may upstream going patches +- added new patch: + - hal-20080701-fix-merge-uint64.diff: fix merge for unit64 +* Tue Jul 01 2008 dkukawka(a)suse.de +- added new patch: + - hal-20080701-generic-backlight-addon.diff: use an addon instead + of callout to set/read brightness to/from generic sysfs + backlight interface +* Tue Jul 01 2008 dkukawka(a)suse.de +- updated patch: + - hal-20080701-fix-get_storage.model_from_SCSI.diff: read from + layer only for IDE devices +* Tue Jul 01 2008 dkukawka(a)suse.de +- added new patch: + - hal-20080630-reuse-check_priv-code_for_helper.diff: added new + files util_helper_priv.{c/h} to reuse code of check_priv() in + the addons instead of do the same again and again. +* Mon Jun 30 2008 dkukawka(a)suse.de +- added new patches: + - hal-20080630-fix-get_storage.model_from_SCSI.diff: fix for + bnc#397871 to get storage.model from SCSI-layer via ioctl and + not from sysfs to prevent problems with ide via SCSI layer + - hal-20080630-fix-remove_storage.model_from_Volumes.diff: + remove the storage.model property from volumes, they don't need + it and it's always empty +* Sat Jun 28 2008 dkukawka(a)suse.de +- added new patch: + - hal-20080628-fix-memory-leak-g_strsplit.diff: fix possible + memoryleak +* Fri Jun 27 2008 dkukawka(a)suse.de +- fixed spec file +- added new patch: + - hal-20080414-fix-pmu_sysfs-power_supply.diff: fix for fd.o + [#15482] to fix battery handling with pmu (ppc) +* Thu Jun 26 2008 dkukawka(a)suse.de +- renamed patches, use now this notation to trace date of patch + creation/change: hal-${DATE}-* +- update HAL to latest git master (20080626) +- added new patch: + - hal-20080626-fix-PropertyModified.diff: fix fd.o #16427 * Fri Jun 20 2008 schwab(a)suse.de - Fix configure script. +* Wed Jun 18 2008 dkukawka(a)suse.de +- updated hal-info to 20080617 +* Thu Jun 05 2008 dkukawka(a)suse.de +- updated hal to git master and hal-info to 20080605 +- removed patches: + - hal-update-to_41073645ea95e.diff * Sat May 24 2008 dkukawka(a)suse.de - updated hal-info to 20080523 including: - bnc#378674: fix huawei e220 umts-modem ++++++ hal-20061124-allow_uid_for_ntfs.diff ++++++ diff --git a/tools/hal-storage-mount.c b/tools/hal-storage-mount.c index ef8d1a9..47412a8 100644 --- a/tools/hal-storage-mount.c +++ b/tools/hal-storage-mount.c @@ -724,6 +724,7 @@ if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 && strcmp (libhal_volume_get_fstype (volume), "iso9660") != 0 && strcmp (libhal_volume_get_fstype (volume), "hfs") != 0 && + strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 && strcmp (libhal_volume_get_fstype (volume), "udf") != 0) { pol_change_uid = wants_to_change_uid; } ++++++ hal-20070613-panasonic-acpi-suse.diff ++++++ --- hald/linux/acpi.c +++ hald/linux/acpi.c @@ -1111,6 +1111,8 @@ acpi_synthesize_display ("acpi/toshiba", "lcd", ACPI_TYPE_TOSHIBA_DISPLAY); acpi_synthesize_display ("acpi/asus", "brn", ACPI_TYPE_ASUS_DISPLAY); acpi_synthesize_display ("acpi/pcc", "brightness", ACPI_TYPE_PANASONIC_DISPLAY); + /* keep this around for compatibility to SUSE 10.1/10.2 kernels */ + acpi_synthesize_display ("acpi/panasonic", "ac_brightness", ACPI_TYPE_PANASONIC_DISPLAY); acpi_synthesize_display ("acpi/ibm", "brightness", ACPI_TYPE_IBM_DISPLAY); acpi_synthesize_display ("acpi/sony", "brightness", ACPI_TYPE_SONY_DISPLAY); /* omnibook does not live under acpi GNOME#331458 */ --- tools/linux/hal-system-lcd-get-brightness-linux +++ tools/linux/hal-system-lcd-get-brightness-linux @@ -48,7 +48,8 @@ elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then # cat /proc/acpi/pcc/brightness # 5 - value="`cat $HAL_PROP_LINUX_ACPI_PATH`" + read value < $HAL_PROP_LINUX_ACPI_PATH + value=$[($value-51)/13] elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then # cat /proc/acpi/ibm/brightness # level: 5 --- tools/linux/hal-system-lcd-set-brightness-linux +++ tools/linux/hal-system-lcd-set-brightness-linux @@ -46,7 +46,7 @@ elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then # echo {0..15} > /proc/acpi/pcc/brightness # http://readlist.com/lists/vger.kernel.org/linux-kernel/7/36405.html - echo "$value" > $HAL_PROP_LINUX_ACPI_PATH + echo "$[($value*136)/10+51]" > $HAL_PROP_LINUX_ACPI_PATH elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then # echo "level {0..7}" > /proc/acpi/ibm/brightness # http://ibm-acpi.sourceforge.net/README ++++++ hal-20070803-cleanup-deprecated_libhal-storage.diff ++++++ ++++ 1033 lines (skipped) ++++++ hal-20071113-fix-storage-policy-fixed-drives.diff ++++++ --- fdi/policy/10osvendor/99-storage-policy-fixed-drives.fdi 1970-01-01 01:00:00.000000000 +0100 +++ fdi/policy/10osvendor/99-storage-policy-fixed-drives.fdi 2006-03-07 00:02:06.000000000 +0100 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?>  + +<deviceinfo version="0.2"> +<device> + <match key="@block.storage_device:storage.hotpluggable" bool="false"> + <match key="@block.storage_device:storage.removable" bool="false"> + <merge key="volume.ignore" type="bool">true</merge> + </match> + </match> +</device> +</deviceinfo> --- fdi/policy/10osvendor/Makefile.am 2007-11-13 16:19:08.000000000 +0100 +++ fdi/policy/10osvendor/Makefile.am 2007-11-13 16:19:27.000000000 +0100 @@ -2,6 +2,7 @@ fdidir = $(datadir)/hal/fdi/policy/10osvendor dist_fdi_DATA = \ + 10-dockstation.fdi \ 10-input-policy.fdi \ 10-dockstation.fdi \ 10-laptop-panel-mgmt-policy.fdi \ @@ -11,7 +12,8 @@ 10-x11-input.fdi \ 15-storage-luks.fdi \ 20-storage-methods.fdi \ - 30-wol.fdi + 30-wol.fdi \ + 99-storage-policy-fixed-drives.fdi if BUILD_KEYMAPS dist_fdi_DATA += 10-keymap.fdi ++++++ hal-20080317-fix-linux_remove_childs.diff ++++++ From: Danny Kukawka <danny.kukawka(a)web.de> Subject: remove childs without sysfs_path Remove childs via extra handling only if they have no linux.sysfs_path. Should fix problems with parallel device handling. Signed-off-by: Danny Kukawka <danny.kukawka(a)web.de> --- device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hald/linux/device.c b/hald/linux/device.c index d0e6d81..80874f0 100644 --- a/hald/linux/device.c +++ b/hald/linux/device.c @@ -4390,8 +4390,11 @@ hotplug_event_begin_remove_dev (const gchar *subsystem, const gchar *sysfs_path, for (tmp = children; tmp != NULL; tmp = g_slist_next (tmp)) { child = HAL_DEVICE (tmp->data); - HAL_INFO(("Remove now: %s as child of: %s", hal_device_get_udi(child), hal_device_get_udi(d))); - hal_util_callout_device_remove (child, dev_callouts_remove_child_done, NULL, NULL); + /* find childs without sysfs path as e.g. spawned devices*/ + if (hal_device_property_get_string(child, "linux.sysfs_path") == NULL) { + HAL_INFO(("Remove now: %s as child of: %s", hal_device_get_udi(child), hal_device_get_udi(d))); + hal_util_callout_device_remove (child, dev_callouts_remove_child_done, NULL, NULL); + } } g_slist_free (children); ++++++ hal-20080318-add-standby-support_v2.diff ++++++ Index: doc/spec/hal-spec-properties.xml ================================================================================ --- doc/spec/hal-spec-properties.xml +++ doc/spec/hal-spec-properties.xml @@ -5650,7 +5650,7 @@ <entry></entry> <entry>Yes</entry> <entry> - If suspend support is compiled into the kernel. + If suspend (S3) support is compiled into the kernel. NB. This may not mean the machine is able to suspend successfully. </entry> @@ -5662,13 +5662,25 @@ <entry></entry> <entry>Yes</entry> <entry> - If hibernation support is compiled into the kernel. + If hibernation (S4) support is compiled into the kernel. NB. This may not mean the machine is able to hibernate successfully. </entry> </row> <row> <entry> + <literal>power_management.can_standby</literal> (bool) + </entry> + <entry></entry> + <entry>No</entry> + <entry> + If standby (S1) support is compiled into the kernel. + NB. This may not mean the machine is able to standby + successfully. + </entry> + </row> + <row> + <entry> <literal>power_management.is_powersave_set</literal> (bool) </entry> <entry/> --- fdi/policy/10osvendor/10-power-mgmt-policy.fdi +++ fdi/policy/10osvendor/10-power-mgmt-policy.fdi @@ -36,6 +36,11 @@ <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_argnames" type="strlist"></append> <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_execpaths" type="strlist">hal-system-power-hibernate</append> + <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_names" type="strlist">Standby</append> + <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_signatures" type="strlist"></append> + <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_argnames" type="strlist"></append> + <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_execpaths" type="strlist">hal-system-power-standby</append> + <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_names" type="strlist">Shutdown</append> <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_signatures" type="strlist"></append> <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_argnames" type="strlist"></append> --- hald/linux/osspec.c 2007-11-26 22:46:07.000000000 +0100 +++ hald/linux/osspec.c 2007-11-26 22:48:25.000000000 +0100 @@ -607,11 +607,13 @@ { gboolean can_suspend; gboolean can_hibernate; + gboolean can_standby; char *poweroptions; const char *pmtype; can_suspend = FALSE; can_hibernate = FALSE; + can_standby = FALSE; /* try to find 'mem' and 'disk' in /sys/power/state */ poweroptions = hal_util_get_string_from_file("/sys/power/", "state"); @@ -623,6 +625,8 @@ can_suspend = TRUE; if (strstr (poweroptions, "disk")) can_hibernate = TRUE; + if (strstr (poweroptions, "standby")) + can_standby = TRUE; if (!can_suspend) { pmtype = hal_device_property_get_string (d, "power_management.type"); @@ -659,6 +663,7 @@ hal_device_property_set_bool (d, "power_management.can_suspend", can_suspend); hal_device_property_set_bool (d, "power_management.can_suspend_hybrid", FALSE); hal_device_property_set_bool (d, "power_management.can_hibernate", can_hibernate); + hal_device_property_set_bool (d, "power_management.can_standby", can_standby); } static void --- tools/Makefile.am +++ tools/Makefile.am @@ -88,6 +88,7 @@ hal-system-power-suspend \ hal-system-power-hibernate \ hal-system-power-shutdown \ + hal-system-power-standby \ hal-system-power-reboot \ hal-system-lcd-get-brightness \ hal-system-lcd-set-brightness \ --- tools/hal-system-power-standby +++ tools/hal-system-power-standby @@ -0,0 +1,6 @@ +#!/bin/sh + +. hal-functions + +hal_check_priv org.freedesktop.hal.power-management.standby +hal_exec_backend --- tools/linux/Makefile.am +++ tools/linux/Makefile.am @@ -12,6 +12,7 @@ hal-system-power-suspend-linux \ hal-system-power-hibernate-linux \ hal-system-power-shutdown-linux \ + hal-system-power-standby-linux \ hal-system-power-reboot-linux \ hal-system-lcd-get-brightness-linux \ hal-system-lcd-set-brightness-linux \ --- tools/linux/hal-system-power-standby-linux +++ tools/linux/hal-system-power-standby-linux @@ -0,0 +1,58 @@ +#!/bin/sh + +POWERSAVED_STANDBY="dbus-send --system --dest=com.novell.powersave \ + --print-reply /com/novell/powersave \ + com.novell.powersave.action.Standby" + +unsupported() { + echo org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported >&2 + echo No Standby method found >&2 + exit 1 +} + +#SuSE and ALTLinux only support powersave +if [ -f "/etc/altlinux-release" ] || [ -f "/etc/SuSE-release" ] ; then + if [ -x /usr/bin/powersave ] ; then + $POWERSAVED_STANDBY + RET=$? + else + # TODO: add support + unsupported + fi + +#FreeBSD uses zzz to suspend for both ACPI and APM +elif [ "x`uname -s`" = "xFreeBSD" ] ; then + if [ -x /usr/sbin/acpiconf ] ; then + /usr/sbin/acpiconf -s 1 + RET=$? + else + unsupported + fi + +#Other distros just need to have *any* tools installed +else + if [ -x "/usr/bin/powersave" ] ; then + $POWERSAVED_STANDBY + RET=$? + elif [ -w "/sys/power/state" ] ; then + # Use the raw kernel sysfs interface + echo "standby" > /sys/power/state + RET=$? + else + # TODO: add other scripts support + unsupported + fi + fi + +#Refresh devices as a resume can do funny things +for type in button battery ac_adapter +do + devices=`hal-find-by-capability --capability $type` + for device in $devices + do + dbus-send --system --print-reply --dest=org.freedesktop.Hal \ + $device org.freedesktop.Hal.Device.Rescan + done +done + +exit $RET --- policy/org.freedesktop.hal.power-management.policy 2007-10-17 15:44:00.000000000 +0200 +++ policy/org.freedesktop.hal.power-management.policy 2007-10-17 15:44:40.000000000 +0200 @@ -79,6 +79,15 @@ </defaults> </action> + <action id="org.freedesktop.hal.power-management.standby"> + <description>Standby the system</description> + <message>System policy prevents standby the system</message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>yes</allow_active> + </defaults> + </action> + <action id="org.freedesktop.hal.power-management.cpufreq"> <description>Configure CPU frequency scaling</description> <message>System policy prevents CPU frequency scaling to be configured</message> ++++++ hal-20080414-fix-pmu_sysfs-power_supply.diff ++++++ From: Danny Kukawka <danny.kukawka(a)web.de> Subject: fix PMU battery and AC handling with power_supply Fixed PMU battery and AC handling if they are exposed via the power_supply interface. This prevents double the battery and AC devices by handling the proc and sysfs interfaces. Signed-off-by: Danny Kukawka <danny.kukawka(a)web.de> --- pmu.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/hald/linux/pmu.c b/hald/linux/pmu.c index 0222cb3..567fe65 100644 --- a/hald/linux/pmu.c +++ b/hald/linux/pmu.c @@ -39,6 +39,7 @@ #include "hotplug.h" #include "osspec_linux.h" +#include "device.h" #include "pmu.h" @@ -361,16 +362,18 @@ pmu_synthesize_hotplug_events (void) pmu_synthesize_item ("/proc/pmu/info", PMU_TYPE_LAPTOP_PANEL); } - /* setup timer for things that we need to poll */ + if (!_have_sysfs_power_supply) { + /* setup timer for things that we need to poll */ #ifdef HAVE_GLIB_2_14 - g_timeout_add_seconds (PMU_POLL_INTERVAL, - pmu_poll, - NULL); + g_timeout_add_seconds (PMU_POLL_INTERVAL, + pmu_poll, + NULL); #else - g_timeout_add (1000 * PMU_POLL_INTERVAL, - pmu_poll, - NULL); + g_timeout_add (1000 * PMU_POLL_INTERVAL, + pmu_poll, + NULL); #endif + } out: return ret; @@ -380,6 +383,10 @@ static HalDevice * pmu_generic_add (const gchar *pmu_path, HalDevice *parent, PMUDevHandler *handler) { HalDevice *d; + + if (((handler->pmu_type == PMU_TYPE_BATTERY) || (handler->pmu_type == PMU_TYPE_AC_ADAPTER)) && _have_sysfs_power_supply) + return NULL; + d = hal_device_new (); hal_device_property_set_string (d, "linux.pmu_path", pmu_path); hal_device_property_set_int (d, "linux.pmu_type", handler->pmu_type); ++++++ hal-20080620-fix-configure.diff ++++++ --- configure.in +++ configure.in @@ -30,6 +30,7 @@ AC_SUBST(LT_AGE) AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_C_O +AC_PROG_CXX AC_HEADER_STDC AC_PROG_LIBTOOL AC_PROG_MAKE_SET ++++++ hal-20080626-fix-PropertyModified.diff ++++++ From: Danny Kukawka <danny.kukawka(a)web.de> Subject: fixed PropertyModified signal in SPEC and code Fixed PropertyModified signal in SPEC to do what the code already do and fixed function declaration of device_send_signal_property_modified() to do the same as the function is already used. This should fix fd.o bug #16427. Signed-off-by: Danny Kukawka <danny.kukawka(a)web.de> --- doc/spec/hal-spec-interfaces.xml | 2 +- hald/hald_dbus.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/spec/hal-spec-interfaces.xml b/doc/spec/hal-spec-interfaces.xml index b77b3a4..25cc771 100644 --- a/doc/spec/hal-spec-interfaces.xml +++ b/doc/spec/hal-spec-interfaces.xml @@ -620,7 +620,7 @@ $ dbus-send --system --print-reply --dest=org.freedesktop.Hal \ <tbody> <row> <entry>PropertyModified</entry> - <entry>Int num_changes, Array of struct {String property_name, Bool added, Bool removed}</entry> + <entry>Int num_changes, Array of struct {String property_name, Bool removed, Bool added}</entry> <entry> One or more properties on the device object have changed. </entry> diff --git a/hald/hald_dbus.h b/hald/hald_dbus.h index 3bc2d04..a6013c7 100644 --- a/hald/hald_dbus.h +++ b/hald/hald_dbus.h @@ -93,8 +93,8 @@ void device_send_signal_interface_lock_released (HalDevice *device, const char * void device_send_signal_property_modified (HalDevice *device, const char *key, - dbus_bool_t removed, - dbus_bool_t added); + dbus_bool_t added, + dbus_bool_t removed); void device_send_signal_condition (HalDevice *device, const char *condition_name, const char *condition_details); ++++++ hal-20080628-fix-memory-leak-g_strsplit.diff ++++++ From: Danny Kukawka <danny.kukawka(a)web.de> Subject: fixed possible memory leak Fixed possible memory leak due to usage of g_strsplit(). Signed-off-by: Danny Kukawka <danny.kukawka(a)web.de> --- acpi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hald/linux/acpi.c b/hald/linux/acpi.c index a7892ea..6f76af6 100644 --- a/hald/linux/acpi.c +++ b/hald/linux/acpi.c @@ -530,6 +530,10 @@ get_processor_model_name (gint proc_num) } } } + + if (lines) { + g_strfreev (lines); + } } else { HAL_ERROR (("Couldn't open /proc/cpuinfo: %s", error->message)); ++++++ hal-20080630-fix-remove_storage.model_from_Volumes.diff ++++++ From: Danny Kukawka <danny.kukawka(a)web.de> Subject: remove storage.model property from volumes Remove storage.model property from volumes. This property make no sense on a volume device and should be used only within the storage namespace. Signed-off-by: Danny Kukawka <danny.kukawka(a)web.de> --- blockdev.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c index d6d2abd..f22af64 100644 --- a/hald/linux/blockdev.c +++ b/hald/linux/blockdev.c @@ -1419,7 +1419,6 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f hal_device_property_set_string (d, "block.storage_device", hal_device_get_udi (parent)); /* defaults */ - hal_device_property_set_string (d, "storage.model", ""); hal_device_property_set_string (d, "volume.fstype", ""); hal_device_property_set_string (d, "volume.fsusage", ""); hal_device_property_set_string (d, "volume.fsversion", ""); ++++++ hal-20080630-reuse-check_priv-code_for_helper.diff ++++++ ++++ 648 lines (skipped) ++++++ hal-20080701-fix-get_storage.model_from_SCSI.diff ++++++ From: Danny Kukawka <danny.kukawka(a)web.de> Subject: read storage.model on IDE via HDIO_GET_IDENTITY Read storage.model on IDE via HDIO_GET_IDENTITY to prevent getting truncated (after 16 chars) strings from IDE via SCSI devices. Signed-off-by: Danny Kukawka <danny.kukawka(a)web.de> --- blockdev.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c index 6042558..347c992 100644 --- a/hald/linux/blockdev.c +++ b/hald/linux/blockdev.c @@ -27,14 +27,18 @@ #endif #include <ctype.h> +#include <fcntl.h> #include <limits.h> #include <linux/kdev_t.h> +#include <linux/hdreg.h> #include <mntent.h> #include <stdint.h> +#include <stdio.h> #include <stdlib.h> #include <dirent.h> #include <string.h> #include <sys/stat.h> +#include <sys/ioctl.h> #include <syslog.h> #include <unistd.h> #include <errno.h> @@ -1251,8 +1255,11 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f if (strcmp (parent_bus, "ide") == 0) { char buf[256]; gchar *media; - gchar *model; struct stat st; + int fd; + struct hd_driveid id; + gchar *model = NULL; + gboolean got_model = FALSE; /* Be conservative and don't poll IDE drives at all (except CD-ROM's, see below) */ hal_device_property_set_bool (d, "storage.media_check_enabled", FALSE); @@ -1284,11 +1291,40 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f } } - if ((model = hal_util_get_string_from_file (buf, "model")) != NULL) { - hal_device_property_set_string (d, "storage.model", model); - hal_device_property_set_string (d, "info.product", model); + /* get model from SCSI/IDE layer and not via sysfs */ + fd = open(device_file, O_RDONLY|O_NONBLOCK); + if (fd < 0) { + HAL_WARNING(("unable to open '%s'", device_file)); + } else { + if (ioctl(fd, HDIO_GET_IDENTITY, &id)) { + HAL_WARNING (("HDIO_GET_IDENTITY unsupported or failed for: '%s'", device_file)); + } else { + int i = 0; + char str[41]; + while (i < 39) { + str[i] = id.model[i]; + i++; + } + str[40] = '\0'; + + if ((model = hal_util_strdup_valid_utf8(str)) != NULL) { + model = g_strdelimit(model, "/", '_'); + got_model = TRUE; + } + } + close(fd); } + if (model == NULL) { + model = hal_util_get_string_from_file (buf, "model"); + } + + hal_device_property_set_string (d, "storage.model", model); + hal_device_property_set_string (d, "info.product", model); + + if (got_model && model != NULL) + g_free (model); + } else if (strcmp (parent_bus, "scsi") == 0) { if (strcmp (hal_device_property_get_string (parent, "scsi.type"), "unknown") == 0) { HAL_WARNING (("scsi.type is unknown")); ++++++ hal-20080701-fix-merge-uint64.diff ++++++ From: Danny Kukawka <danny.kukawka(a)web.de> Subject: fixed merge for uint64 Fixed typo to get merge working again with type=uint64. Should fix fd.o bug #16575. Signed-off-by: Danny Kukawka <danny.kukawka(a)web.de> --- create_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hald/create_cache.c b/hald/create_cache.c index cdc8c9a..d52f834 100644 --- a/hald/create_cache.c +++ b/hald/create_cache.c @@ -159,7 +159,7 @@ get_merge_type (const char *str) return MERGE_BOOLEAN; if (strcmp (str, "int") == 0) return MERGE_INT32; - if (strcmp (str, "unint64") == 0) + if (strcmp (str, "uint64") == 0) return MERGE_UINT64; if (strcmp (str, "double") == 0) return MERGE_DOUBLE; ++++++ hal-20080701-generic-backlight-addon.diff ++++++ From: Danny Kukawka <danny.kukawka(a)web.de> Subject: added new addon for the generic sysfs backlight interface Added new addon to set/get values to/from the generic sysfs backlight interface to improve the performance while change the brightness of a e.g. laptop panel, by preventing fork three times for each level change in the current script-code. Signed-off-by: Danny Kukawka <danny.kukawka(a)web.de> --- fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi | 26 + hald/linux/addons/Makefile.am | 5 hald/linux/addons/addon-generic-backlight.c | 275 ++++++++++++++++++ 3 files changed, 296 insertions(+), 10 deletions(-) diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi index d717a8a..e63c4b0 100644 --- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi +++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi @@ -6,18 +6,24 @@ <match key="info.category" string="laptop_panel">  <match key="laptop_panel.access_method" compare_ne="custom"> - <append key="info.interfaces" type="strlist">org.freedesktop.Hal.Device.LaptopPanel</append> +  + <match key="linux.sysfs_path" exists="true"> + <append key="info.addons" type="strlist">hald-addon-generic-backlight</append> + </match> +  + <match key="linux.sysfs_path" exists="false"> + <append key="info.interfaces" type="strlist">org.freedesktop.Hal.Device.LaptopPanel</append> - <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">SetBrightness</append> - <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist">i</append> - <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist">brightness_value</append> - <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-set-brightness</append> - - <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">GetBrightness</append> - <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist"></append> - <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist"></append> - <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-get-brightness</append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">SetBrightness</append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist">i</append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist">brightness_value</append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-set-brightness</append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">GetBrightness</append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist"></append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist"></append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-get-brightness</append> + </match> </match> </match> </device> diff --git a/hald/linux/addons/Makefile.am b/hald/linux/addons/Makefile.am index 37beba4..75448a1 100644 --- a/hald/linux/addons/Makefile.am +++ b/hald/linux/addons/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ if HALD_COMPILE_LINUX libexec_PROGRAMS = \ + hald-addon-generic-backlight \ hald-addon-hid-ups \ hald-addon-input \ hald-addon-storage @@ -92,3 +93,7 @@ hald_addon_pmu_LDADD = $(top_builddir)/libhal/libhal.la hald_addon_storage_SOURCES = addon-storage.c ../../logger.c ../../util_helper.c hald_addon_storage_LDADD = $(top_builddir)/libhal/libhal.la @GLIB_LIBS@ + +hald_addon_generic_backlight_SOURCES = addon-generic-backlight.c ../../logger.c ../../util_helper.c ../../util_helper_priv.c +hald_addon_generic_backlight_LDADD = $(top_builddir)/libhal/libhal.la @GLIB_LIBS@ + diff --git a/hald/linux/addons/addon-generic-backlight.c b/hald/linux/addons/addon-generic-backlight.c new file mode 100644 index 0000000..b61a874 --- /dev/null +++ b/hald/linux/addons/addon-generic-backlight.c @@ -0,0 +1,275 @@ +/*************************************************************************** + * CVSID: $Id$ + * + * addon-generic-backlight.c: + * Copyright (C) 2008 Danny Kukawka <danny.kukawka(a)web.de> + * + * Licensed under the Academic Free License version 2.1 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + **************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#include <errno.h> +#include <fcntl.h> +#include <stdio.h> + +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + +#include <glib/gmain.h> +#include <dbus/dbus-glib.h> +#include <dbus/dbus-glib-lowlevel.h> + +#include "libhal/libhal.h" +#include "../../logger.h" +#include "../../util_helper.h" +#include "../../util_helper_priv.h" + +static GMainLoop *main_loop; +static LibHalContext *halctx = NULL; +static DBusConnection *conn; + +const char *udi = NULL; +const char *path = NULL; +static int levels = 0; + +/* Getting backlight level */ +static int +get_backlight () +{ + FILE *f; + int value; + char buf[64]; + gchar sysfs_path[512]; + + f = NULL; + value = -1; + + g_snprintf (sysfs_path, sizeof (sysfs_path), "%s/brightness", path); + + f = fopen (sysfs_path, "rb"); + if (f == NULL) { + HAL_WARNING(("Could not read brightness from '%s'", sysfs_path)); + return -1; + } + + if (fgets (buf, sizeof (buf), f) == NULL) { + HAL_ERROR (("Cannot read from '%s'", sysfs_path)); + goto out; + } + + errno = 0; + value = strtol (buf, NULL, 10); + if (errno != 0) { + value = -1; + } + +out: + if (f != NULL) + fclose (f); + + return value; +} + +/* Setting backlight level */ +static int +set_backlight (int level) +{ + int fd, l, ret; + gchar sysfs_path[512]; + /* Assume we don't need more */ + char buf[5]; + + /* sanity-checking level */ + if (level > levels-1) + level = levels-1; + + if (level < 0) + level = 0; + + ret = -1; + + g_snprintf (sysfs_path, sizeof (sysfs_path), "%s/brightness", path); + + fd = open (sysfs_path, O_WRONLY); + if (fd < 0) { + HAL_WARNING(("Could not open '%s'", sysfs_path)); + goto out; + } + + if ((l = snprintf (buf, 4, "%d", level)) < 4) { + if (write (fd, buf, l) < 0) { + HAL_WARNING(("Could not write '%s' to '%s'", buf , sysfs_path)); + } else { + /* everything okay */ + ret = level; + } + } + +out: + if (fd >= 0) + close (fd); + + return ret; +} + +/* DBus filter function */ +static DBusHandlerResult +filter_function (DBusConnection *connection, DBusMessage *message, void *userdata) +{ + DBusError err; + DBusMessage *reply; + + if (!check_priv (halctx, connection, message, dbus_message_get_path (message), + "org.freedesktop.hal.power-management.lcd-panel")) { + return DBUS_HANDLER_RESULT_HANDLED; + } + + reply = NULL; + + if (dbus_message_is_method_call (message, + "org.freedesktop.Hal.Device.LaptopPanel", + "SetBrightness")) { + int brightness; + + dbus_error_init (&err); + if (dbus_message_get_args (message, + &err, + DBUS_TYPE_INT32, &brightness, + DBUS_TYPE_INVALID)) { + if (brightness < 0 || brightness > levels -1) { + reply = dbus_message_new_error (message, + "org.freedesktop.Hal.Device.LaptopPanel.Invalid", + "Brightness level is invalid"); + } else { + int return_code; + int set; + + set = set_backlight (brightness); + + reply = dbus_message_new_method_return (message); + if (reply == NULL) + goto error; + + if (set == brightness) + return_code = 0; + else + return_code = 1; + + dbus_message_append_args (reply, + DBUS_TYPE_INT32, &return_code, + DBUS_TYPE_INVALID); + } + + dbus_connection_send (connection, reply, NULL); + } + } else if (dbus_message_is_method_call (message, + "org.freedesktop.Hal.Device.LaptopPanel", + "GetBrightness")) { + int brightness; + + dbus_error_init (&err); + if (dbus_message_get_args (message, + &err, + DBUS_TYPE_INVALID)) { + brightness = get_backlight(); + + reply = dbus_message_new_method_return (message); + if (reply == NULL) + goto error; + + dbus_message_append_args (reply, + DBUS_TYPE_INT32, &brightness, + DBUS_TYPE_INVALID); + dbus_connection_send (connection, reply, NULL); + } + } + +error: + if (reply != NULL) + dbus_message_unref (reply); + + return DBUS_HANDLER_RESULT_HANDLED; +} + +int +main (int argc, char *argv[]) +{ + DBusError err; + char * level_str; + + setup_logger (); + udi = getenv ("UDI"); + path = getenv ("HAL_PROP_LINUX_SYSFS_PATH"); + + HAL_DEBUG (("udi='%s', path='%s'", udi, path)); + if (udi == NULL) { + HAL_ERROR (("No device specified")); + return -2; + } + if (path == NULL) { + HAL_ERROR (("No sysfs path specified")); + return -2; + } + + level_str = getenv ("HAL_PROP_LAPTOP_PANEL_NUM_LEVELS"); + if (level_str != NULL) { + levels = atoi (level_str); + } else { + HAL_ERROR (("No laptop_panel.num_levels defined")); + } + + dbus_error_init (&err); + if ((halctx = libhal_ctx_init_direct (&err)) == NULL) { + HAL_ERROR (("Cannot connect to hald")); + return -3; + } + + conn = libhal_ctx_get_dbus_connection (halctx); + dbus_connection_setup_with_g_main (conn, NULL); + + dbus_connection_add_filter (conn, filter_function, NULL, NULL); + + if (!libhal_device_claim_interface (halctx, + udi, + "org.freedesktop.Hal.Device.LaptopPanel", + " <method name=\"SetBrightness\">\n" + " <arg name=\"brightness_value\" direction=\"in\" type=\"i\"/>\n" + " <arg name=\"return_code\" direction=\"out\" type=\"i\"/>\n" + " </method>\n" + " <method name=\"GetBrightness\">\n" + " <arg name=\"brightness_value\" direction=\"out\" type=\"i\"/>\n" + " </method>\n", + &err)) { + HAL_ERROR (("Cannot claim interface 'org.freedesktop.Hal.Device.LaptopPanel'")); + return -4; + } + + dbus_error_init (&err); + if (!libhal_device_addon_is_ready (halctx, udi, &err)) { + return -4; + } + + main_loop = g_main_loop_new (NULL, FALSE); + g_main_loop_run (main_loop); + return 0; +} ++++++ hal-20080702-ipw-killswitch-addon.diff ++++++ ++++ 617 lines (skipped) ++++++ hal-info-20080702-fix-identify-cardreader.diff ++++++ From: Danny Kukawka <danny.kukawka(a)web.de> Subject: add more cardreaders Added one more match and changed one match as proposed in fd.o bug #16577. Signed-off-by: Danny Kukawka <danny.kukawka(a)web.de> --- 10-usb-card-readers.fdi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi index 4d0693c..06fac99 100644 --- a/fdi/information/10freedesktop/10-usb-card-readers.fdi +++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi @@ -28,7 +28,10 @@ <match key="storage.model" contains="HS-SM"> <merge key="storage.drive_type" type="string">smart_media</merge> </match> - <match key="storage.model" contains="HS-SD/MMC"> + <match key="storage.model" contains="HS-xD"> + <merge key="storage.drive_type" type="string">smart_media</merge> + </match> + <match key="storage.model" contains="HS-SD"> <merge key="storage.drive_type" type="string">sd_mmc</merge> </match> ++++++ hal-info-20080715-add-CDMA_USB_modem.diff ++++++ --- a/fdi/information/10freedesktop/10-modem.fdi 2008-07-15 22:53:04.000000000 +0200 +++ b/fdi/information/10freedesktop/10-modem.fdi 2008-07-15 22:53:59.000000000 +0200 @@ -128,6 +128,17 @@ </match> </match> +  + <match key="@info.parent:usb.vendor_id" int="0x16d8"> + <match key="@info.parent:usb.product_id" int="0x6280"> + <match key="@info.parent:usb.interface.number" int="1"> + <append key="info.capabilities" type="strlist">modem</append> + <append key="modem.command_sets" type="strlist">GSM-07.07</append> + <append key="modem.command_sets" type="strlist">GSM-07.05</append> + </match> + </match> + </match> +  <match key="@info.parent:usb.vendor_id" int="0x19d2"> <match key="@info.parent:usb.product_id" int="0x0001"> ++++++ hal-info-20080716-fix-acer-keymapping.diff ++++++ diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi index e544363..bf88700 100644 --- a/fdi/information/10freedesktop/30-keymap-acer.fdi +++ b/fdi/information/10freedesktop/30-keymap-acer.fdi @@ -7,45 +7,65 @@ <match key="@input.originating_device:info.linux.driver" string="atkbd"> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Acer"> - <append key="input.keymap.data" type="strlist">e025:help</append>  - <append key="input.keymap.data" type="strlist">e026:setup</append>  - <append key="input.keymap.data" type="strlist">e027:battery</append>  - <append key="input.keymap.data" type="strlist">e029:switchvideomode</append>  - <append key="input.keymap.data" type="strlist">e033:euro</append>  - <append key="input.keymap.data" type="strlist">e034:dollar</append>  - <append key="input.keymap.data" type="strlist">e054:bluetooth</append>  - <append key="input.keymap.data" type="strlist">e055:wlan</append>  - <append key="input.keymap.data" type="strlist">e056:wlan</append>  - <append key="input.keymap.data" type="strlist">e057:bluetooth</append>  - <append key="input.keymap.data" type="strlist">e058:bluetooth</append>  - <append key="input.keymap.data" type="strlist">e059:brightnessup</append>  - <append key="input.keymap.data" type="strlist">e06e:brightnessup</append>  - <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append>  - <append key="input.keymap.data" type="strlist">e071:f22</append>  - <append key="input.keymap.data" type="strlist">e072:f22</append>  - <append key="input.keymap.data" type="strlist">e073:prog2</append>  - <append key="input.keymap.data" type="strlist">e074:prog1</append>  - <append key="input.keymap.data" type="strlist">e075:presentation</append>  - <append key="input.keymap.data" type="strlist">e078:fn</append>  - <append key="input.keymap.data" type="strlist">e079:sync</append>  - <append key="info.capabilities" type="strlist">input.keymap</append> + <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop"> + <merge key="input.keymap.map" type="bool">true</merge> - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Extensa"> - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="5210;5220;5610;5620;5720"> - <remove key="input.keymap.data" type="strlist">e06e:brightnessup</remove> - <append key="input.keymap.data" type="strlist">e06e:lock</append>  - </match> - </match> - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="TravelMate"> -  - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="C300"> - <append key="input.keymap.data" type="strlist">0x67:f22</append>  - <append key="input.keymap.data" type="strlist">0x68:up</append> - <append key="input.keymap.data" type="strlist">0x69:down</append> - <append key="input.keymap.data" type="strlist">0x6b:fn</append> - <append key="input.keymap.data" type="strlist">0x6c:f23</append>  +  + + <match key="input.keymap.map" bool="true"> +  + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="TravelMate"> +  + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="C300"> + <append key="input.keymap.data" type="strlist">0x67:f22</append>  + <append key="input.keymap.data" type="strlist">0x68:up</append> + <append key="input.keymap.data" type="strlist">0x69:down</append> + <append key="input.keymap.data" type="strlist">0x6b:fn</append> + <append key="input.keymap.data" type="strlist">0x6c:f23</append>  + <append key="info.capabilities" type="strlist">input.keymap</append> + </match> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains=" 660"> + <append key="input.keymap.data" type="strlist">e042:help</append>  + <append key="input.keymap.data" type="strlist">e04b:setup</append>  + <append key="input.keymap.data" type="strlist">e04c:battery</append>  + <append key="info.capabilities" type="strlist">input.keymap</append> + </match> + </match> + +  + <match key="input.keymap.data" exists="false"> + <append key="input.keymap.data" type="strlist">e025:help</append>  + <append key="input.keymap.data" type="strlist">e026:setup</append>  + <append key="input.keymap.data" type="strlist">e027:battery</append>  + <append key="input.keymap.data" type="strlist">e029:switchvideomode</append>  + <append key="input.keymap.data" type="strlist">e033:euro</append>  + <append key="input.keymap.data" type="strlist">e034:dollar</append>  + <append key="input.keymap.data" type="strlist">e054:bluetooth</append>  + <append key="input.keymap.data" type="strlist">e055:wlan</append>  + <append key="input.keymap.data" type="strlist">e056:wlan</append>  + <append key="input.keymap.data" type="strlist">e057:bluetooth</append>  + <append key="input.keymap.data" type="strlist">e058:bluetooth</append>  + <append key="input.keymap.data" type="strlist">e059:brightnessup</append>  + <append key="input.keymap.data" type="strlist">e06e:brightnessup</append>  + <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append>  + <append key="input.keymap.data" type="strlist">e071:f22</append>  + <append key="input.keymap.data" type="strlist">e072:f22</append>  + <append key="input.keymap.data" type="strlist">e073:prog2</append>  + <append key="input.keymap.data" type="strlist">e074:prog1</append>  + <append key="input.keymap.data" type="strlist">e075:presentation</append>  + <append key="input.keymap.data" type="strlist">e078:fn</append>  + <append key="input.keymap.data" type="strlist">e079:sync</append>  + <append key="info.capabilities" type="strlist">input.keymap</append> + + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Extensa"> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="5210;5220;5610;5620;5720"> + <remove key="input.keymap.data" type="strlist">e06e:brightnessup</remove> + <append key="input.keymap.data" type="strlist">e06e:lock</append>  + </match> + </match> + </match> </match> - </match> + </match> </match> </match> </device> ++++++ hal-info-20080716-fix-Samsung-keymapping.diff ++++++ diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi index def976f..0fc397a 100644 --- a/fdi/information/10freedesktop/30-keymap-misc.fdi +++ b/fdi/information/10freedesktop/30-keymap-misc.fdi @@ -101,21 +101,29 @@ </match> </match> - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="SAMSUNG"> - <append key="input.keymap.data" type="strlist">0075:www</append>  - <append key="input.keymap.data" type="strlist">0078:mail</append>  - <append key="input.keymap.data" type="strlist">0074:prog1</append>  - <append key="input.keymap.data" type="strlist">e002:displaytoggle</append>  - <append key="input.keymap.data" type="strlist">e003:battery</append>  - <append key="input.keymap.data" type="strlist">e004:prog1</append>  - <append key="input.keymap.data" type="strlist">e006:wlan</append>  - <append key="input.keymap.data" type="strlist">e008:brightnessup</append>  - <append key="input.keymap.data" type="strlist">e009:brightnessdown</append>  - <append key="input.keymap.data" type="strlist">e031:prog2</append>  - <append key="input.keymap.data" type="strlist">e033:prog3</append>  - <append key="input.keymap.data" type="strlist">e077:f22</append>  - <append key="input.keymap.data" type="strlist">e079:f22</append>  - <append key="info.capabilities" type="strlist">input.keymap</append> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix_ncase="samsung"> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="SP55S;SQ45S70S"> + <append key="input.keymap.data" type="strlist">e002:displaytoggle</append>  + <append key="input.keymap.data" type="strlist">e003:battery</append>  + <append key="input.keymap.data" type="strlist">e004:prog1</append>  + <append key="input.keymap.data" type="strlist">e006:wlan</append>  + <append key="input.keymap.data" type="strlist">e008:brightnessup</append>  + <append key="input.keymap.data" type="strlist">e009:brightnessdown</append>  + <append key="input.keymap.data" type="strlist">e031:prog2</append>  + <append key="input.keymap.data" type="strlist">e033:prog3</append>  + <append key="input.keymap.data" type="strlist">0074:prog1</append>  + <append key="input.keymap.data" type="strlist">0075:www</append>  + <append key="input.keymap.data" type="strlist">e077:f22</append>  + <append key="input.keymap.data" type="strlist">0078:mail</append>  + <append key="input.keymap.data" type="strlist">e079:f22</append>  + <append key="info.capabilities" type="strlist">input.keymap</append> + </match> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="SX20S"> + <append key="input.keymap.data" type="strlist">0074:mute</append> + <append key="input.keymap.data" type="strlist">0075:mute</append> + <append key="input.keymap.data" type="strlist">0077:f21</append>  + <append key="input.keymap.data" type="strlist">0079:f21</append>  + </match> </match> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="TOSHIBA"> ++++++ hal-info-20080523.tar.bz2 -> hal-info-20080716.tar.bz2 ++++++ ++++ 1861 lines of diff (skipped) ++++++ rc.hal ++++++ --- hal/rc.hal 2008-05-09 13:24:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/hal/rc.hal 2008-07-15 20:40:09.000000000 +0200 @@ -156,7 +156,7 @@ fi fi - echo -n "Starting HAL daemon"; + echo -n "Starting HAL daemon" $HALDAEMON_BIN $HALDAEMON_PARA if [ -n "$INIT_VERSION" ] ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsmbios
by root＠Hilbert.suse.de 27 Jul '08

27 Jul '08

Hello community, here is the log from the commit of package libsmbios checked in at Sun Jul 27 11:59:04 CEST 2008. -------- --- arch/i386/libsmbios/libsmbios.changes 2008-06-02 17:55:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/libsmbios/libsmbios.changes 2008-07-27 01:40:29.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 7 20:19:32 CEST 2008 - dkukawka(a)suse.de + +- change naming of the lib package because of 'Shared Library + Packaging Policy' and rpmlint +- updated to latest version v2.0.2 + +------------------------------------------------------------------- @@ -18,0 +26,6 @@ +Tue Jan 8 19:00:09 CET 2008 - dkukawka(a)suse.de + +- added new patch: + - libsmbios-fix-compiler_warning_cgcc.diff + +------------------------------------------------------------------- @@ -23,0 +37,5 @@ +Wed Dec 19 18:47:41 CET 2007 - dkukawka(a)suse.de + +- updated to new version 0.13.13 + +------------------------------------------------------------------- Old: ---- libsmbios-0.13.12.tar.bz2 New: ---- libsmbios-2.0.2.tar.bz2 libsmbios-fix-compiler_warning_cgcc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsmbios.spec ++++++ --- /var/tmp/diff_new_pack.QY4377/_old 2008-07-27 11:58:39.000000000 +0200 +++ /var/tmp/diff_new_pack.QY4377/_new 2008-07-27 11:58:39.000000000 +0200 @@ -15,8 +15,6 @@ Url: http://linux.dell.com/libsmbios/main/index.html %define _unpackaged_files_terminate_build 0 %define build_static 0 -# automatically determine if we should build xml -%define build_xml %( ([ -e /usr/include/xercesc/ ] && echo 1) || echo 0 ) # automatically determine if we should build docs %define build_docs %( ( which doxygen > /dev/null 2>&1 && echo 1) || echo 0 ) %define run_cppunit %( ([ -e /usr/include/cppunit ] && echo 1) || echo 0) @@ -24,16 +22,18 @@ %{?_with_docs: %{expand: %%define build_docs 1}} %{?_without_cppunit: %{expand: %%define run_cppunit 0}} %{?_with_cppunit: %{expand: %%define run_cppunit 1}} -%define major 0 -%define minor 13 -%define sub 12 +%define major 2 +%define minor 0 +%define sub 2 %define extralevel %{nil} %define release_name libsmbios %define release_version %{major}.%{minor}.%{sub}%{extralevel} +%define LIBNAME libsmbios2 Version: %{major}.%{minor}.%{sub} -Release: 5 +Release: 7 License: BSD 3-Clause; GPL v2 or later; Other uncritical OpenSource License Source: %{name}-%{version}.tar.bz2 +Patch0: libsmbios-fix-compiler_warning_cgcc.diff Summary: Open BIOS parsing libs Group: System/Management BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,16 +52,18 @@ -------- Michael Brown +%if 0%{?suse_version} < 1100 + %package libs License: GPL v2 or later -Summary: Libsmbios shared libraries -Group: System/Management -Provides: %name = %version +%else -%package -n libsmbiosxml-libs -License: GPL v2 or later -Summary: Libsmbiosxml Shared Libraries +%package -n %LIBNAME + +%endif +Summary: Libsmbios shared libraries. Group: System/Management +Provides: %name = %version %package bin License: GPL v2 or later @@ -73,11 +75,6 @@ Summary: Unsupported sample binaries using libsmbios Group: System/Management -%package -n libsmbiosxml-bin -License: GPL v2 or later -Summary: sample binaries that use libsmbiosxml -Group: System/Management - %package devel License: GPL v2 or later Summary: development headers and archives @@ -87,6 +84,7 @@ License: GPL v2 or later; Other uncritical OpenSource License Summary: Open BIOS parsing libs Group: System/Management +%if 0%{?suse_version} < 1100 %description libs Libsmbios is a library and utilites that can be used by client programs @@ -98,12 +96,13 @@ -------- Michael Brown -%description -n libsmbiosxml-libs -Libsmbios is a library and utilites that can be used by client programs -to get information from standard BIOS tables, such as the SMBIOS table. - +%else +%description -n %LIBNAME +%endif +Libsmbios is a library and utilites that can be used by client programs +to get information from standard BIOS tables, such as the SMBIOS table. Authors: -------- Michael Brown @@ -145,18 +144,6 @@ -------- Michael Brown -%description -n libsmbiosxml-bin -Libsmbios is a library and utilites that can be used by client programs -to get information from standard BIOS tables, such as the SMBIOS table. - -This package contains some sample binaries that use libsmbios. - - - -Authors: --------- - Michael Brown - %description static Libsmbios is a library and utilites that can be used by client programs to get information from standard BIOS tables, such as the SMBIOS table. @@ -169,6 +156,7 @@ %prep %setup +%patch0 find . -type d -exec chmod -f 755 {} \; find doc include libraries bin-supported bin-unsupported build cppunit -type f -exec chmod -f 644 {} \; @@ -183,6 +171,7 @@ %endif %install +[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} make install DESTDIR=%{buildroot} mkdir -p %{buildroot}/usr/include cp -a include/smbios %{buildroot}/usr/include/ @@ -190,25 +179,30 @@ rm -f %{buildroot}/%{_libdir}/lib*.a %clean -rm -rf ${RPM_BUILD_ROOT} +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf ${RPM_BUILD_ROOT} +%if 0%{?suse_version} < 1100 %post libs -p /sbin/ldconfig +%else -%postun libs -p /sbin/ldconfig +%post -n %LIBNAME -p /sbin/ldconfig +%endif +%if 0%{?suse_version} < 1100 -%post -n libsmbiosxml-libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig +%else -%postun -n libsmbiosxml-libs -p /sbin/ldconfig +%postun -n %LIBNAME -p /sbin/ldconfig +%endif +%if 0%{?suse_version} < 1100 %files libs -%defattr(-,root,root) -%{_libdir}/libsmbios.so.*.* -%if %{build_xml} +%else -%files -n libsmbiosxml-libs -%defattr(-,root,root) -%{_libdir}/libsmbiosxml.so.*.* +%files -n %LIBNAME %endif +%defattr(-,root,root) +%{_libdir}/libsmbios.so.* %files devel %defattr(-,root,root) @@ -216,11 +210,8 @@ %if %{build_docs} %doc doc/full/html %endif -%{_libdir}/libsmbios.so -%{_libdir}/libsmbios.so.1 -%{_libdir}/libsmbiosxml.so -%{_libdir}/libsmbiosxml.so.1 /usr/include/smbios +%{_libdir}/libsmbios.so %files bin %defattr(644,root,root,755) @@ -231,16 +222,16 @@ %{_sbindir}/getSystemId %{_sbindir}/propertyTag %{_sbindir}/serviceTag -%{_sbindir}/tokenCtl %{_sbindir}/verifySmiPassword %{_sbindir}/wakeupCtl %{_sbindir}/dellLcdBrightness %{_sbindir}/dellWirelessCtl +%{_sbindir}/mkbiospkg.sh %files unsupported-bin %defattr(644,root,root,755) %doc COPYING-GPL COPYING-OSL README include/smbios/config/boost_LICENSE_1_0_txt bin-unsupported/getopts_LICENSE.txt -%defattr(555,root,root,-) +%defattr(555,root,root) %{_sbindir}/activateCmosToken %{_sbindir}/ascii2enUS_scancode %{_sbindir}/createUnitTestFiles @@ -253,12 +244,7 @@ %{_sbindir}/smitest %{_sbindir}/stateByteCtl %{_sbindir}/upBootCtl -%if %{build_xml} - -%files -n libsmbiosxml-bin -%defattr(555,root,root) %{_sbindir}/dumpSmbios -%endif %if %{build_static} %files static @@ -267,6 +253,10 @@ %endif %changelog +* Mon Jul 07 2008 dkukawka(a)suse.de +- change naming of the lib package because of 'Shared Library + Packaging Policy' and rpmlint +- updated to latest version v2.0.2 * Mon Jun 02 2008 dkukawka(a)suse.de - added: 'Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)' to specfile to get the package installed on Dell machines @@ -275,8 +265,13 @@ - dont buildrequire libxml, only libxml2 is used * Fri Mar 07 2008 dmueller(a)suse.de - fix documentation permissions +* Tue Jan 08 2008 dkukawka(a)suse.de +- added new patch: + - libsmbios-fix-compiler_warning_cgcc.diff * Sat Dec 29 2007 crrodriguez(a)suse.de - fix library-without-ldconfig-postun errors +* Wed Dec 19 2007 dkukawka(a)suse.de +- updated to new version 0.13.13 * Sun Nov 04 2007 dkukawka(a)suse.de - updated to new version 0.13.12: - removed upstream gone patch: ++++++ libsmbios-0.13.12.tar.bz2 -> libsmbios-2.0.2.tar.bz2 ++++++ ++++ 12859 lines of diff (skipped) ++++++ libsmbios-fix-compiler_warning_cgcc.diff ++++++ --- bin-supported/getopts.c 2008-01-08 18:57:17.000000000 +0100 +++ bin-supported/getopts.c 2008-01-08 18:57:46.000000000 +0100 @@ -55,7 +55,7 @@ printf(" --help,\t-h\t\t\tDisplays this information\n"); for (count = 0; opts[count].description; count++) { - char *cmd = 0; + char *cmd = NULL; if (opts[count].name && opts[count].shortName) { cmd = calloc(1, strlen(opts[count].name) + strlen(opts[count].shortName) + 15); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bind
by root＠Hilbert.suse.de 27 Jul '08

27 Jul '08

Hello community, here is the log from the commit of package bind checked in at Sun Jul 27 11:54:20 CEST 2008. -------- --- bind/bind.changes 2008-07-16 12:51:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/bind/bind.changes 2008-07-27 11:52:03.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 27 11:51:38 CEST 2008 - aj(a)suse.de + +- Remove .la files, they only introduce more problems and require + libxml2.la installation. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bind.spec ++++++ --- /var/tmp/diff_new_pack.G12843/_old 2008-07-27 11:53:33.000000000 +0200 +++ /var/tmp/diff_new_pack.G12843/_new 2008-07-27 11:53:33.000000000 +0200 @@ -18,7 +18,7 @@ BuildRequires: libcap libcap-devel libxml2-devel openssl openssl-devel Summary: Domain Name System (DNS) Server (named) Version: 9.5.0P1 -Release: 1 +Release: 4 %define SDB_LDAP_VERSION 1.0-beta License: BSD 3-Clause; X11/MIT Group: Productivity/Networking/DNS/Servers @@ -299,6 +299,7 @@ # remove useless .la files rm -f ${RPM_BUILD_ROOT}/%{_lib}/libidnkit.la rm -f ${RPM_BUILD_ROOT}/%{_lib}/libidnkitlite.la +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la mv vendor-files/config/named.conf ${RPM_BUILD_ROOT}/%{_sysconfdir} mv vendor-files/config/bind.reg ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d mv vendor-files/config/rndc-access.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/named.d @@ -614,15 +615,15 @@ %{_bindir}/isc-config.sh %{_libdir}/*.a %{_libdir}/*.so -%{_libdir}/libbind.la -%{_libdir}/libbind9.la -%{_libdir}/libdns.la -%{_libdir}/libidnkit.la -%{_libdir}/libidnkitlite.la -%{_libdir}/libisc.la -%{_libdir}/libisccc.la -%{_libdir}/libisccfg.la -%{_libdir}/liblwres.la +#%{_libdir}/libbind.la +#%{_libdir}/libbind9.la +#%{_libdir}/libdns.la +#%{_libdir}/libidnkit.la +#%{_libdir}/libidnkitlite.la +#%{_libdir}/libisc.la +#%{_libdir}/libisccc.la +#%{_libdir}/libisccfg.la +#%{_libdir}/liblwres.la %{_includedir}/bind %doc %{_mandir}/man3/* @@ -634,7 +635,7 @@ %files libs %defattr(-,root,root) %{_libdir}/*.so.* -%{_libdir}/libidnkitres.la +#%{_libdir}/libidnkitres.la %files lwresd %defattr(-,root,root) @@ -680,6 +681,9 @@ %doc %{_mandir}/man5/idnrc.5.gz %changelog +* Sun Jul 27 2008 aj(a)suse.de +- Remove .la files, they only introduce more problems and require + libxml2.la installation. * Wed Jul 16 2008 ug(a)suse.de - BIND 9.5 offers many new features, including many behind-the-scenes improvements. For the most part, the non-visible ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-storage
by root＠Hilbert.suse.de 27 Jul '08

27 Jul '08

Hello community, here is the log from the commit of package yast2-storage checked in at Sun Jul 27 11:46:12 CEST 2008. -------- --- yast2-storage/yast2-storage.changes 2008-07-22 17:21:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2008-07-26 18:52:16.308280000 +0200 @@ -1,0 +2,7 @@ +Sat Jul 26 13:39:53 CEST 2008 - aschnell(a)suse.de + +- added getUnusedPartitionSlots, nextFreeMd, computeMdSize, + byteToHumanString and humanStringToByte to libstorage +- version 2.17.4 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.17.3.tar.bz2 New: ---- yast2-storage-2.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.z26806/_old 2008-07-27 11:46:03.000000000 +0200 +++ /var/tmp/diff_new_pack.z26806/_new 2008-07-27 11:46:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.17.3) +# spec file for package yast2-storage (Version 2.17.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-storage -Version: 2.17.3 +Version: 2.17.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.17.3.tar.bz2 +Source0: yast2-storage-2.17.4.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel boost-devel docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings yast2-testsuite Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid kpartx cryptsetup @@ -51,7 +51,7 @@ Arvin Schnell <aschnell(a)suse.de> %prep -%setup -n yast2-storage-2.17.3 +%setup -n yast2-storage-2.17.4 %build %{prefix}/bin/y2tool y2autoconf @@ -173,6 +173,10 @@ %doc %{prefix}/share/doc/packages/yast2-storage/libstorage %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog +* Sat Jul 26 2008 aschnell(a)suse.de +- added getUnusedPartitionSlots, nextFreeMd, computeMdSize, + byteToHumanString and humanStringToByte to libstorage +- version 2.17.4 * Tue Jul 22 2008 aschnell(a)suse.de - added querying md state to libstorage (fate #303613) - version 2.17.3 ++++++ yast2-storage-2.17.3.tar.bz2 -> yast2-storage-2.17.4.tar.bz2 ++++++ ++++ 2403 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-mail
by root＠Hilbert.suse.de 27 Jul '08

27 Jul '08

Hello community, here is the log from the commit of package yast2-mail checked in at Sun Jul 27 11:45:53 CEST 2008. -------- --- yast2-mail/yast2-mail.changes 2008-07-25 06:35:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2008-07-26 06:26:36.246662000 +0200 @@ -1,0 +2,5 @@ +Sat Jul 26 06:25:23 CEST 2008 - varkoly(a)suse.de + +- Add missed Requires: perl-NetxAP + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.f26186/_old 2008-07-27 11:45:44.000000000 +0200 +++ /var/tmp/diff_new_pack.f26186/_new 2008-07-27 11:45:44.000000000 +0200 @@ -13,7 +13,7 @@ Name: yast2-mail Version: 2.16.7 -Release: 1 +Release: 2 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -21,11 +21,13 @@ Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite BuildRequires: yast2-ldap-server yast2-network yast2-perl-bindings yast2-users +BuildRequires: perl-NetxAP PreReq: %fillup_prereq # new firewall interface Requires: yast2 >= 2.16.23 Requires: yast2-users Requires: yast2-ldap +Requires: perl-NetxAP Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_sendmail.ycp Provides: yast2-config-sendmail yast2-config-sendmail-devel Obsoletes: yast2-config-sendmail yast2-config-sendmail-devel @@ -162,6 +164,8 @@ %dir /usr/share/YaST2/clients /usr/share/YaST2/clients/users* %changelog +* Sat Jul 26 2008 varkoly(a)suse.de +- Add missed Requires: perl-NetxAP * Thu Jul 24 2008 varkoly(a)suse.de - API changes in yast2-users and yast2-ldap * Fri Jun 27 2008 varkoly(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0