Hello community,
here is the log from the commit of package yast2-hardware-detection
checked in at Tue Nov 14 19:33:12 CET 2006.
--------
--- yast2-hardware-detection/yast2-hardware-detection.changes 2006-10-13 01:10:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-hardware-detection/yast2-hardware-detection.changes 2006-11-14 11:25:38.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Nov 14 11:24:32 CET 2006 - mvidner@suse.cz
+
+- Use pkg-config to determine libraries needed by hwinfo.
+- Convenience: enable compilation with hwinfo < 13.6.
+- Commented BuildRequires, removed unneeded hal-devel (required
+ transitively).
+- 2.14.0
+
+-------------------------------------------------------------------
Old:
----
yast2-hardware-detection-2.13.5.tar.bz2
yast2-hardware-detection-nosysfs.patch
New:
----
yast2-hardware-detection-2.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-hardware-detection.spec ++++++
--- /var/tmp/diff_new_pack.JOHolr/_old 2006-11-14 19:32:57.000000000 +0100
+++ /var/tmp/diff_new_pack.JOHolr/_new 2006-11-14 19:32:57.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-hardware-detection (Version 2.13.5)
+# spec file for package yast2-hardware-detection (Version 2.14.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,33 @@
# norootforbuild
Name: yast2-hardware-detection
-Version: 2.13.5
-Release: 2
-License: GPL
+Version: 2.14.0
+Release: 1
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-hardware-detection-2.13.5.tar.bz2
-Patch: yast2-hardware-detection-nosysfs.patch
+Source0: yast2-hardware-detection-2.14.0.tar.bz2
prefix: /usr
-BuildRequires: blocxx-devel doxygen gcc-c++ hal-devel hwinfo-devel libxcrypt-devel openssl-devel yast2-core-devel yast2-devtools
+# obviously
+BuildRequires: gcc-c++
+# needed for all yast packages
+BuildRequires: yast2-devtools
+# autodocs
+BuildRequires: doxygen
+# this is a yast plugin, needs core
+BuildRequires: yast2-core-devel
+# liby2.la
+BuildRequires: blocxx-devel
+# libycp.la wants libxcrypt.la
+BuildRequires: libxcrypt-devel
+# libycp.la
+BuildRequires: openssl-devel
+# da library
+BuildRequires: hwinfo-devel
+# we check for hwinfo
+BuildRequires: pkg-config
Summary: YaST2 Hardware Detection Interface
-# hwinfo-11.10: hd_change_config_status(hd_data, ...)
+# hwinfo-13.6: s_hd_t.driver_module
Requires: hwinfo >= 13.6
%description
@@ -37,8 +53,7 @@
Stefan Hundhammer
%prep
-%setup -n yast2-hardware-detection-2.13.5
-%patch
+%setup -n yast2-hardware-detection-2.14.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -70,6 +85,12 @@
%doc %{prefix}/share/doc/packages/yast2-hardware-detection
%changelog -n yast2-hardware-detection
+* Tue Nov 14 2006 - mvidner@suse.cz
+- Use pkg-config to determine libraries needed by hwinfo.
+- Convenience: enable compilation with hwinfo < 13.6.
+- Commented BuildRequires, removed unneeded hal-devel (required
+ transitively).
+- 2.14.0
* Fri Oct 13 2006 - ro@suse.de
- do not link against libsysfs (not used anymore)
* Tue Oct 10 2006 - fehr@suse.de
++++++ yast2-hardware-detection-2.13.5.tar.bz2 -> yast2-hardware-detection-2.14.0.tar.bz2 ++++++
++++ 14768 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/yast2-hardware-detection-2.13.5/Makefile.am new/yast2-hardware-detection-2.14.0/Makefile.am
--- old/yast2-hardware-detection-2.13.5/Makefile.am 2006-07-31 15:22:32.000000000 +0200
+++ new/yast2-hardware-detection-2.14.0/Makefile.am 2006-11-14 11:25:48.000000000 +0100
@@ -7,7 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -19,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -33,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -66,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
@@ -95,7 +95,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +116,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +143,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -199,10 +199,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
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/yast2-hardware-detection-2.13.5/VERSION new/yast2-hardware-detection-2.14.0/VERSION
--- old/yast2-hardware-detection-2.13.5/VERSION 2006-10-10 12:41:41.000000000 +0200
+++ new/yast2-hardware-detection-2.14.0/VERSION 2006-11-14 11:25:06.000000000 +0100
@@ -1 +1 @@
-2.13.5
+2.14.0
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/yast2-hardware-detection-2.13.5/autodocs-cc-base.ami new/yast2-hardware-detection-2.14.0/autodocs-cc-base.ami
--- old/yast2-hardware-detection-2.13.5/autodocs-cc-base.ami 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-hardware-detection-2.14.0/autodocs-cc-base.ami 2006-11-14 11:25:48.000000000 +0100
@@ -0,0 +1,24 @@
+# -*- makefile -*- Automake include file
+# $Id: autodocs-cc.ami 23704 2005-06-10 17:36:13Z mvidner $
+
+# This is a common base for autodocs-cc-{,off}.ami
+# and should NOT be used directly
+
+# Builds source documentation for C++ sources
+# Uses doxygen (ydoxygen)
+# PARAMETERS:
+# AUTODOCS_CC: Directories that the C++ autodocs is built from
+# Optional - the default is $(srcdir)/../../src
+# AUTODOCS_DEPS: dependencies of the docs, default is $(AUTODOCS_CC)/*.h
+# AUTODOCS_PARAMS: more params for ydoxygen
+
+AUTODOCS_CC ?= $(srcdir)/../../src
+AUTODOCS_DEPS ?= $(AUTODOCS_CC)/*.h
+
+html_data = index.html $(wildcard *.html *.png) doxygen.css @RPMNAME@.tag
+CLEANFILES = $(html_data) doxygen.log doxygen.conf installdox
+
+doxygen.css @RPMNAME@.tag: index.html
+
+index.html: $(AUTODOCS_DEPS)
+ ${YDOXYGEN} PROJECT_NAME=@RPMNAME@ INPUT=$(AUTODOCS_CC) $(AUTODOCS_PARAMS)
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/yast2-hardware-detection-2.13.5/autodocs-cc.ami new/yast2-hardware-detection-2.14.0/autodocs-cc.ami
--- old/yast2-hardware-detection-2.13.5/autodocs-cc.ami 2006-07-31 15:22:32.000000000 +0200
+++ new/yast2-hardware-detection-2.14.0/autodocs-cc.ami 2006-11-14 11:25:48.000000000 +0100
@@ -1,24 +1,14 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-cc.ami 23704 2005-06-10 17:36:13Z mvidner $
+# $Id: autodocs-cc.ami 28248 2006-02-21 14:14:07Z mvidner $
-# Builds source documentation for C++ sources
-# Uses doxygen (ydoxygen)
-# PARAMETERS:
-# AUTODOCS_CC: Directories that the C++ autodocs is built from
-# Optional - the default is $(srcdir)/../../src
-# AUTODOCS_DEPS: dependencies of the docs, default is $(AUTODOCS_CC)/*.h
+# Builds source documentation for C++ sources.
+# Builds and installs by default, intended for base packages where the
+# docs is useful for developers of leaf packages.
+
+# PARAMETERS: (additional to those of autodocs-cc-base)
# AUTODOCS_SUBDIR: htmldir will be $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-# AUTODOCS_PARAMS: more params for ydoxygen
-AUTODOCS_CC ?= $(srcdir)/../../src
-AUTODOCS_DEPS ?= $(AUTODOCS_CC)/*.h
+include $(top_srcdir)/autodocs-cc-base.ami
htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-
-html_DATA = index.html $(wildcard *.html *.png) doxygen.css @RPMNAME@.tag
-CLEANFILES = $(html_DATA) doxygen.log doxygen.conf installdox
-
-doxygen.css @RPMNAME@.tag: index.html
-
-index.html: $(AUTODOCS_DEPS)
- ${YDOXYGEN} PROJECT_NAME=@RPMNAME@ INPUT=$(AUTODOCS_CC) $(AUTODOCS_PARAMS)
+html_DATA = $(html_data)
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/yast2-hardware-detection-2.13.5/config.h.in new/yast2-hardware-detection-2.14.0/config.h.in
--- old/yast2-hardware-detection-2.13.5/config.h.in 2006-07-31 15:22:53.000000000 +0200
+++ new/yast2-hardware-detection-2.14.0/config.h.in 2006-11-14 11:26:51.000000000 +0100
@@ -18,6 +18,9 @@
/* Define to 1 if you have the header file. */
#undef HAVE_DLFCN_H
+/* Define if s_hd_t.driver_module exists */
+#undef HAVE_DRIVER_MODULE
+
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
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/yast2-hardware-detection-2.13.5/configure.in new/yast2-hardware-detection-2.14.0/configure.in
--- old/yast2-hardware-detection-2.13.5/configure.in 2006-07-31 15:22:32.000000000 +0200
+++ new/yast2-hardware-detection-2.14.0/configure.in 2006-11-14 11:25:48.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-hardware-detection
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-hardware-detection, 2.13.3, http://www.suse.de/feedback, yast2-hardware-detection)
+AC_INIT(yast2-hardware-detection, 2.14.0, http://bugs.opensuse.org/, yast2-hardware-detection)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.3"
+VERSION="2.14.0"
RPMNAME="yast2-hardware-detection"
MAINTAINER="Martin Vidner "
@@ -117,6 +117,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -171,6 +173,19 @@
AC_MSG_ERROR([Headers for hwinfo are missing. Please install the package hwinfo-devel.])
fi
+AH_TEMPLATE([HAVE_DRIVER_MODULE], [Define if s_hd_t.driver_module exists])
+HWINFO_VERSION=`pkg-config --print-errors --modversion hwinfo`
+if test -z "$HWINFO_VERSION"; then
+ HWINFO_VERSION=0.0
+fi
+HWINFO_VERSION_MAJOR=`echo $HWINFO_VERSION | sed 's/\..*//'`
+HWINFO_VERSION_MINOR=`echo $HWINFO_VERSION | sed 's/.*\.//'`
+if test "$HWINFO_VERSION_MAJOR" -eq 13 -a "$HWINFO_VERSION_MINOR" -ge 6; then
+ AC_DEFINE([HAVE_DRIVER_MODULE], 1)
+fi
+
+PKG_CHECK_MODULES([HWINFO], [hwinfo])
+
AC_CONFIG_FILES(Makefile conf/Makefile
doc/autodocs/Makefile
doc/Makefile
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/yast2-hardware-detection-2.13.5/configure.in.in new/yast2-hardware-detection-2.14.0/configure.in.in
--- old/yast2-hardware-detection-2.13.5/configure.in.in 2006-02-02 15:28:03.000000000 +0100
+++ new/yast2-hardware-detection-2.14.0/configure.in.in 2006-11-14 10:41:17.000000000 +0100
@@ -1,4 +1,4 @@
-## SCR agent configure.in.in
+## SCR agent configure.in.in -*- autoconf -*-
## initialize
@YAST2-INIT-COMMON@
@@ -21,5 +21,18 @@
AC_MSG_ERROR([Headers for hwinfo are missing. Please install the package hwinfo-devel.])
fi
+AH_TEMPLATE([HAVE_DRIVER_MODULE], [Define if s_hd_t.driver_module exists])
+HWINFO_VERSION=`pkg-config --print-errors --modversion hwinfo`
+if test -z "$HWINFO_VERSION"; then
+ HWINFO_VERSION=0.0
+fi
+HWINFO_VERSION_MAJOR=`echo $HWINFO_VERSION | sed 's/\..*//'`
+HWINFO_VERSION_MINOR=`echo $HWINFO_VERSION | sed 's/.*\.//'`
+if test "$HWINFO_VERSION_MAJOR" -eq 13 -a "$HWINFO_VERSION_MINOR" -ge 6; then
+ AC_DEFINE([HAVE_DRIVER_MODULE], 1)
+fi
+
+PKG_CHECK_MODULES([HWINFO], [hwinfo])
+
## and generate the output
@YAST2-OUTPUT@
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/yast2-hardware-detection-2.13.5/src/HwParse.cc new/yast2-hardware-detection-2.14.0/src/HwParse.cc
--- old/yast2-hardware-detection-2.13.5/src/HwParse.cc 2006-10-10 12:39:33.000000000 +0200
+++ new/yast2-hardware-detection-2.14.0/src/HwParse.cc 2006-11-14 10:24:06.000000000 +0100
@@ -10,6 +10,9 @@
*/
+#ifdef HAVE_CONFIG_H
+#include
+#endif
#include
#include
#include
@@ -1434,8 +1437,12 @@
if (hd->driver != 0)
out->add (YCPString ("driver"), YCPString (hd->driver));
+#ifdef HAVE_DRIVER_MODULE
if (hd->driver_module != 0)
out->add (YCPString ("driver_module"), YCPString (hd->driver_module));
+#else
+#warning "Omitting driver_module"
+#endif
// model (combined vendor and device names)
// since model may already be inserted by the cpu stuff above we have
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/yast2-hardware-detection-2.13.5/src/Makefile.am new/yast2-hardware-detection-2.14.0/src/Makefile.am
--- old/yast2-hardware-detection-2.13.5/src/Makefile.am 2006-02-02 15:28:02.000000000 +0100
+++ new/yast2-hardware-detection-2.14.0/src/Makefile.am 2006-11-14 10:36:02.000000000 +0100
@@ -2,7 +2,7 @@
# Makefile.am for core/agent-probe/src
#
-AM_CXXFLAGS = -DY2LOG=\"agent-probe\"
+AM_CXXFLAGS = -DY2LOG=\"agent-probe\" $(HWINFO_CFLAGS)
plugin_LTLIBRARIES = libpy2ag_hwprobe.la
noinst_LTLIBRARIES = liby2ag_hwprobe.la
@@ -14,11 +14,11 @@
HwParse.cc
liby2ag_hwprobe_la_LDFLAGS = -version-info 2:0
-liby2ag_hwprobe_la_LIBADD = @AGENT_LIBADD@ -lhd -lsysfs -liw
+liby2ag_hwprobe_la_LIBADD = @AGENT_LIBADD@ $(HWINFO_LIBS)
libpy2ag_hwprobe_la_SOURCES = \
$(liby2ag_hwprobe_la_SOURCES) \
Y2CCHwProbe.cc
libpy2ag_hwprobe_la_LDFLAGS = -version-info 2:0
-libpy2ag_hwprobe_la_LIBADD = @AGENT_LIBADD@ -lhd -lsysfs -liw
+libpy2ag_hwprobe_la_LIBADD = @AGENT_LIBADD@ $(HWINFO_LIBS)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org