Hello community,
here is the log from the commit of package hal for openSUSE:Factory
checked in at Fri Jul 10 16:25:37 CEST 2009.
--------
--- hal/hal-doc.changes 2009-04-16 22:46:31.000000000 +0200
+++ hal/hal-doc.changes 2009-07-10 16:24:31.160090000 +0200
@@ -1,0 +2,10 @@
+Mon Jun 29 17:08:55 CEST 2009 - kay.sievers@novell.com
+
+- update to 0.5.12 and hal-info 20090414
+- fully rebase on upstream tree
+- HAL is in maintenance mode now
+ no new features are accepted upstream
+- move private directory from /usr/lib64/hal to /usr/lib/hal
+- rename pre-checkin.sh to pre_checkin.sh
+
+-------------------------------------------------------------------
hal.changes: same change
calling whatdependson for head-i586
Old:
----
hal-20061124-allow_uid_for_ntfs.diff
hal-20070613-panasonic-acpi-suse.diff
hal-20070803-cleanup-deprecated_libhal-storage.diff
hal-20081112-fix-docking-support.diff
hal-20090302-smart-card.diff
hal-info-20090206.tar.bz2
pre-checkin.sh
New:
----
HEAD.patch
hal-info-20090414.tar.bz2
pre_checkin.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.W0wjT3/_old 2009-07-10 16:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.W0wjT3/_new 2009-07-10 16:24:43.000000000 +0200
@@ -26,42 +26,27 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20090206
-%define libsmbios_version 2.0.2
+%define hal_info_version 20090414
Version: 0.5.12
-Release: 26
+Release: 27
Url: http://freedesktop.org/Software/hal
-License: Dual GPLv2 or Academic Free License 2.1
+License: GPL v2 or later ; AFL2.0 or GPLv2.0
Group: System/Daemons
AutoReqProv: on
-Requires: pm-utils
-BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb-devel libvolume_id-devel parted-devel pciutils-devel perl-XML-Parser popt-devel update-desktop-files
-BuildRequires: libselinux-devel
-%ifarch %ix86 x86_64
-BuildRequires: libsmbios2 >= %libsmbios_version
-BuildRequires: libsmbios-devel >= %libsmbios_version
-BuildRequires: gcc-c++
-#!BuildIgnore: pciutils-ids
-%endif
-%if 0%{?suse_version} > 1020
-BuildRequires: fdupes
-Obsoletes: hal-gnome
-%endif
+BuildRequires: fdupes pkg-config
+BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool
+BuildRequires: libblkid-devel libexpat-devel libusb-devel pciutils-devel
+BuildRequires: libselinux-devel perl-XML-Parser popt-devel update-desktop-files
#
%if %build_doc
BuildRequires: gtk-doc xmlto
-Provides: hal:/usr/share/doc/packages/hal/README
%else
PreReq: /usr/sbin/groupadd /usr/sbin/useradd /etc/init.d/boot.localfs
PreReq: %insserv_prereq
-Requires: dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}, aaa_base, PolicyKit, ConsoleKit, pm-utils
-Provides: hotplugctl = 0.08
-Obsoletes: hotplugctl <= 0.08
-Provides: hotkey-setup = 0.1
-Obsoletes: hotkey-setup <= 0.1
-%ifarch %ix86 x86_64 ia64
-Requires: libsmbios2 >= %libsmbios_version
-%endif
+Requires: dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}
+Requires: PolicyKit, ConsoleKit, pm-utils
+Requires: udev >= 143
+Requires: util-linux >= 2.16
%ifarch %ix86 x86_64
Requires: setserial
%endif
@@ -71,68 +56,30 @@
Source0: hal-%{version}.tar.bz2
Source1: hal-info-%{hal_info_version}.tar.bz2
Source2: rc.hal
-Source3: pre-checkin.sh
+Source3: pre_checkin.sh
Source50: hal-doc-rpmlintrc
Source60: hal-rpmlintrc
-# SUSE specific patches
-Patch1: hal-20070613-panasonic-acpi-suse.diff
-Patch2: hal-20061124-allow_uid_for_ntfs.diff
-# SUSE specific temporary patches
-#Patch10:
-# submitted (or planed to do in next time) upstream patches
-Patch100: hal-20081112-fix-docking-support.diff
-# backports from git master:
-#Patch200: hal-update-to_.diff
-# backports from git ~dkukawka:
-Patch220: hal-20090302-smart-card.diff
-# revert from HEAD:
-#Patch250: hal-revert.diff
-# patches from ML:
-#Patch300: hal-ML.diff
-# hal-info related patches:
-#Patch400: hal-info-2008XX.diff
-# currently unused patches:
-Patch500: hal-20070803-cleanup-deprecated_libhal-storage.diff
-# temporary debug patches
-#Patch1000: hal-debug.diff
+Patch1: HEAD.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%description
-HAL is a hardware abstraction layer and aims to provide a live list
-ofdevices present in the system at any point in time. HAL tries to
+HAL is a hardware abstraction layer and aims to provide a live list of
+devices present in the system at any point in time. HAL tries to
understand both, physical devices (such as PCI and USB) and the device
classes (such as input, net, and block) physical devices have. Besides
it allows merging of information from device info files specific to a
-device. HAL provides a network API through D-BUS for querying devices
-and notifying when things change. Finally, HAL provides some monitoring
-(in an unintrusive way) of devices. Presently, ethernet link detection
-and volume mounts aremonitored. For further information, please refer
+device. HAL provides a API through D-BUS for querying devices and
+notifying when things change. Finally, HAL provides some monitoring (in
+an unintrusive way) of devices. For further information, please refer
to the HAL specification.
-
-
-Authors:
---------
- Danny Kukawka
- Kay Sievers
- Joe Shaw
- David Zeuthen
-
%if ! %build_doc
%package -n hal-devel
-License: Other uncritical OpenSource License; AFL2.0 or GPLv2.0
+License: Other uncritical OpenSource License ; AFL2.0 or GPLv2.0
Summary: Developer package for HAL
Requires: %{name} = %{version}-%{release}, dbus-1-devel >= %{dbus_version}-%{dbus_release}, dbus-1-glib-devel >= %{dbus_version}-%{dbus_release}
-%if 0%{?suse_version} > 1020
-Requires: libext2fs-devel, libblkid-devel, libuuid-devel, libcom_err-devel, libusb-devel
-%else
-Requires: e2fsprogs-devel
-%endif
-%ifarch %ix86 x86_64
-BuildRequires: libsmbios-devel >= %libsmbios_version
-%endif
AutoReqProv: on
Group: Development/Libraries/Other
#
@@ -152,77 +99,44 @@
This, and more, is all described in the HAL specification
-
-
-Authors:
---------
- Danny Kukawka
- Kay Sievers
- Joe Shaw
- David Zeuthen
-
%endif
%prep
%setup -n hal-%{version} -a1
chmod 644 tools/hal-functions
-# patch hal package if needed
-%patch1 -p0
-%patch2 -p1
-#%patch10 -p0
-%patch100 -p1
-#%patch200 -p1
-%patch220 -p1
-#%patch300 -p1
-#%patch1000 -p1
-# patch hal-info package if needed
+%patch1 -p1
pushd hal-info-%{hal_info_version}
-#%patch400 -p1
popd
%build
-export CFLAGS="${RPM_OPT_FLAGS} -fstack-protector"
-export CXXFLAGS="${RPM_OPT_FLAGS} -fstack-protector"
autoreconf -fi
-%configure --disable-static --with-pic \
- --libexecdir=%{_libexecdir}/hal \
+%configure \
+ --libexecdir=%{_prefix}/lib/hal \
--with-init-scripts=suse \
--with-hwdata=/usr/share \
--with-pid-file=/var/run/hald/haldaemon.pid \
--with-dbus-sys=/etc/dbus-1/system.d \
--with-hal-user=haldaemon \
--with-hal-group=haldaemon \
- --with-udev-prefix=/ \
+ --with-udev-prefix=/lib \
--docdir=%{_datadir}/doc/packages/hal \
--with-eject=/bin/eject \
- --enable-acl-management \
+ --enable-policy-kit \
+ --enable-console-kit \
+ --disable-pmu \
+ --without-keymaps \
+ --disable-acpi-proc \
+ --disable-static \
+ --with-pic \
%ifarch ppc ppc64
--disable-acpi \
--disable-acpi-acpid \
-%else
- --enable-acpi-acpid \
-%endif
- --disable-acpi-proc \
- --disable-acpi-ibm \
- --enable-parted \
- --enable-console-kit \
-%ifarch ia64 s390 s390 s390x
- --with-keymaps=no \
- --disable-pmu \
-%endif
-%ifarch %ix86 x86_64
- --disable-pmu \
- --enable-acpi-toshiba \
- --enable-sonypic \
- --with-dell-backlight=yes \
-%else
- --disable-sonypic \
%endif
%if %build_doc
--enable-gtk-doc \
--enable-docbook-docs \
%endif
- --enable-policy-kit
+ CFLAGS="${RPM_OPT_FLAGS} -fstack-protector"
make %{?jobs:-j%jobs}
# hal-info
pushd hal-info-%{hal_info_version}
@@ -246,7 +160,7 @@
%makeinstall
%if %build_doc
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal
-install -m 644 {README,AUTHORS,ChangeLog,COPYING,NEWS} $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/
+install -m 644 {README,COPYING,NEWS} $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/
%endif
#install hal-info
pushd hal-info-%{hal_info_version}
@@ -263,6 +177,7 @@
rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale
rm -rf $RPM_BUILD_ROOT/%{_datadir}/PolicyKit
rm -rf $RPM_BUILD_ROOT/%{_localstatedir}
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/lib/hal
rm -rf $RPM_BUILD_ROOT/lib/udev/rules.d/90-hal.rules
%else
mkdir -p $RPM_BUILD_ROOT/etc/hal
@@ -281,9 +196,7 @@
rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/libhal/
rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/libhal-storage
%endif
-%if 0%{?suse_version} > 1020
%fdupes %{buildroot}
-%endif
%clean
rm -rf %{buildroot}
@@ -317,9 +230,7 @@
/usr/sbin/useradd -r -g haldaemon -c "User for haldaemon" \
-d /var/run/hald -o haldaemon 2>/dev/null || :
fi
-%if 0%{?suse_version} > 1030
/usr/bin/polkit-auth --user haldaemon --grant org.freedesktop.policykit.read >& /dev/null || :
-%endif
%preun
%{stop_on_removal haldaemon}
@@ -342,7 +253,7 @@
%dir /lib/udev/rules.d
%dir %{_datadir}/hal
%dir %{_datadir}/hal/fdi
-%dir %{_libdir}/hal
+%dir %{_prefix}/lib/hal
%config %{_sysconfdir}/dbus-1/system.d/hal.conf
/lib/udev/rules.d/90-hal.rules
%{_sysconfdir}/hal/*
@@ -350,7 +261,7 @@
%{_datadir}/hal/fdi/*
%{_datadir}/PolicyKit/policy/*
%{_libdir}/*hal*.so.*
-%{_libexecdir}/hal/*
+%{_prefix}/lib/hal/*
%{_mandir}/man1/*
%{_mandir}/man8/*
%{_sbindir}/hal*
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.W0wjT3/_old 2009-07-10 16:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.W0wjT3/_new 2009-07-10 16:24:43.000000000 +0200
@@ -26,42 +26,27 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20090206
-%define libsmbios_version 2.0.2
+%define hal_info_version 20090414
Version: 0.5.12
-Release: 26
+Release: 27
Url: http://freedesktop.org/Software/hal
-License: GPL v2 or later; AFL2.0 or GPLv2.0
+License: GPL v2 or later ; AFL2.0 or GPLv2.0
Group: System/Daemons
AutoReqProv: on
-Requires: pm-utils
-BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb-devel libvolume_id-devel parted-devel pciutils-devel perl-XML-Parser popt-devel update-desktop-files
-BuildRequires: libselinux-devel
-%ifarch %ix86 x86_64
-BuildRequires: libsmbios2 >= %libsmbios_version
-BuildRequires: libsmbios-devel >= %libsmbios_version
-BuildRequires: gcc-c++
-#!BuildIgnore: pciutils-ids
-%endif
-%if 0%{?suse_version} > 1020
-BuildRequires: fdupes
-Obsoletes: hal-gnome
-%endif
+BuildRequires: fdupes pkg-config
+BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool
+BuildRequires: libblkid-devel libexpat-devel libusb-devel pciutils-devel
+BuildRequires: libselinux-devel perl-XML-Parser popt-devel update-desktop-files
#
%if %build_doc
BuildRequires: gtk-doc xmlto
-Provides: hal:/usr/share/doc/packages/hal/README
%else
PreReq: /usr/sbin/groupadd /usr/sbin/useradd /etc/init.d/boot.localfs
PreReq: %insserv_prereq
-Requires: dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}, aaa_base, PolicyKit, ConsoleKit, pm-utils
-Provides: hotplugctl = 0.08
-Obsoletes: hotplugctl <= 0.08
-Provides: hotkey-setup = 0.1
-Obsoletes: hotkey-setup <= 0.1
-%ifarch %ix86 x86_64 ia64
-Requires: libsmbios2 >= %libsmbios_version
-%endif
+Requires: dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}
+Requires: PolicyKit, ConsoleKit, pm-utils
+Requires: udev >= 143
+Requires: util-linux >= 2.16
%ifarch %ix86 x86_64
Requires: setserial
%endif
@@ -71,30 +56,10 @@
Source0: hal-%{version}.tar.bz2
Source1: hal-info-%{hal_info_version}.tar.bz2
Source2: rc.hal
-Source3: pre-checkin.sh
+Source3: pre_checkin.sh
Source50: hal-doc-rpmlintrc
Source60: hal-rpmlintrc
-# SUSE specific patches
-Patch1: hal-20070613-panasonic-acpi-suse.diff
-Patch2: hal-20061124-allow_uid_for_ntfs.diff
-# SUSE specific temporary patches
-#Patch10:
-# submitted (or planed to do in next time) upstream patches
-Patch100: hal-20081112-fix-docking-support.diff
-# backports from git master:
-#Patch200: hal-update-to_.diff
-# backports from git ~dkukawka:
-Patch220: hal-20090302-smart-card.diff
-# revert from HEAD:
-#Patch250: hal-revert.diff
-# patches from ML:
-#Patch300: hal-ML.diff
-# hal-info related patches:
-#Patch400: hal-info-2008XX.diff
-# currently unused patches:
-Patch500: hal-20070803-cleanup-deprecated_libhal-storage.diff
-# temporary debug patches
-#Patch1000: hal-debug.diff
+Patch1: HEAD.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -109,29 +74,12 @@
an unintrusive way) of devices. For further information, please refer
to the HAL specification.
-
-
-Authors:
---------
- Danny Kukawka
- Kay Sievers
- Joe Shaw
- David Zeuthen
-
%if ! %build_doc
%package -n hal-devel
-License: Other uncritical OpenSource License; AFL2.0 or GPLv2.0
+License: Other uncritical OpenSource License ; AFL2.0 or GPLv2.0
Summary: Developer package for HAL
Requires: %{name} = %{version}-%{release}, dbus-1-devel >= %{dbus_version}-%{dbus_release}, dbus-1-glib-devel >= %{dbus_version}-%{dbus_release}
-%if 0%{?suse_version} > 1020
-Requires: libext2fs-devel, libblkid-devel, libuuid-devel, libcom_err-devel, libusb-devel
-%else
-Requires: e2fsprogs-devel
-%endif
-%ifarch %ix86 x86_64
-BuildRequires: libsmbios-devel >= %libsmbios_version
-%endif
AutoReqProv: on
Group: Development/Libraries/Other
#
@@ -151,77 +99,44 @@
This, and more, is all described in the HAL specification
-
-
-Authors:
---------
- Danny Kukawka
- Kay Sievers
- Joe Shaw
- David Zeuthen
-
%endif
%prep
%setup -n hal-%{version} -a1
chmod 644 tools/hal-functions
-# patch hal package if needed
-%patch1 -p0
-%patch2 -p1
-#%patch10 -p0
-%patch100 -p1
-#%patch200 -p1
-%patch220 -p1
-#%patch300 -p1
-#%patch1000 -p1
-# patch hal-info package if needed
+%patch1 -p1
pushd hal-info-%{hal_info_version}
-#%patch400 -p1
popd
%build
-export CFLAGS="${RPM_OPT_FLAGS} -fstack-protector"
-export CXXFLAGS="${RPM_OPT_FLAGS} -fstack-protector"
autoreconf -fi
-%configure --disable-static --with-pic \
- --libexecdir=%{_libexecdir}/hal \
+%configure \
+ --libexecdir=%{_prefix}/lib/hal \
--with-init-scripts=suse \
--with-hwdata=/usr/share \
--with-pid-file=/var/run/hald/haldaemon.pid \
--with-dbus-sys=/etc/dbus-1/system.d \
--with-hal-user=haldaemon \
--with-hal-group=haldaemon \
- --with-udev-prefix=/ \
+ --with-udev-prefix=/lib \
--docdir=%{_datadir}/doc/packages/hal \
--with-eject=/bin/eject \
- --enable-acl-management \
+ --enable-policy-kit \
+ --enable-console-kit \
+ --disable-pmu \
+ --without-keymaps \
+ --disable-acpi-proc \
+ --disable-static \
+ --with-pic \
%ifarch ppc ppc64
--disable-acpi \
--disable-acpi-acpid \
-%else
- --enable-acpi-acpid \
-%endif
- --disable-acpi-proc \
- --disable-acpi-ibm \
- --enable-parted \
- --enable-console-kit \
-%ifarch ia64 s390 s390 s390x
- --with-keymaps=no \
- --disable-pmu \
-%endif
-%ifarch %ix86 x86_64
- --disable-pmu \
- --enable-acpi-toshiba \
- --enable-sonypic \
- --with-dell-backlight=yes \
-%else
- --disable-sonypic \
%endif
%if %build_doc
--enable-gtk-doc \
--enable-docbook-docs \
%endif
- --enable-policy-kit
+ CFLAGS="${RPM_OPT_FLAGS} -fstack-protector"
make %{?jobs:-j%jobs}
# hal-info
pushd hal-info-%{hal_info_version}
@@ -245,7 +160,7 @@
%makeinstall
%if %build_doc
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal
-install -m 644 {README,AUTHORS,ChangeLog,COPYING,NEWS} $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/
+install -m 644 {README,COPYING,NEWS} $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/
%endif
#install hal-info
pushd hal-info-%{hal_info_version}
@@ -262,6 +177,7 @@
rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale
rm -rf $RPM_BUILD_ROOT/%{_datadir}/PolicyKit
rm -rf $RPM_BUILD_ROOT/%{_localstatedir}
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/lib/hal
rm -rf $RPM_BUILD_ROOT/lib/udev/rules.d/90-hal.rules
%else
mkdir -p $RPM_BUILD_ROOT/etc/hal
@@ -280,9 +196,7 @@
rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/libhal/
rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/libhal-storage
%endif
-%if 0%{?suse_version} > 1020
%fdupes %{buildroot}
-%endif
%clean
rm -rf %{buildroot}
@@ -316,9 +230,7 @@
/usr/sbin/useradd -r -g haldaemon -c "User for haldaemon" \
-d /var/run/hald -o haldaemon 2>/dev/null || :
fi
-%if 0%{?suse_version} > 1030
/usr/bin/polkit-auth --user haldaemon --grant org.freedesktop.policykit.read >& /dev/null || :
-%endif
%preun
%{stop_on_removal haldaemon}
@@ -341,7 +253,7 @@
%dir /lib/udev/rules.d
%dir %{_datadir}/hal
%dir %{_datadir}/hal/fdi
-%dir %{_libdir}/hal
+%dir %{_prefix}/lib/hal
%config %{_sysconfdir}/dbus-1/system.d/hal.conf
/lib/udev/rules.d/90-hal.rules
%{_sysconfdir}/hal/*
@@ -349,7 +261,7 @@
%{_datadir}/hal/fdi/*
%{_datadir}/PolicyKit/policy/*
%{_libdir}/*hal*.so.*
-%{_libexecdir}/hal/*
+%{_prefix}/lib/hal/*
%{_mandir}/man1/*
%{_mandir}/man8/*
%{_sbindir}/hal*
++++++ HEAD.patch ++++++
++++ 1074 lines (skipped)
++++++ hal-0.5.12.tar.bz2 ++++++
++++ 117678 lines of diff (skipped)
++++++ hal-info-20090206.tar.bz2 -> hal-info-20090414.tar.bz2 ++++++
++++ 16973 lines of diff (skipped)
++++++ pre_checkin.sh ++++++
#!/bin/sh
function fail {
echo Something failed. Too bad.
exit 1
}
rm -f hal-doc.spec.tmp
cat hal.spec \
| sed 's/^Name: *hal/Name: hal-doc/g' \
| sed 's/^%define *build_doc 0/%define build_doc 1/g' \
> hal-doc.spec.tmp || fail
mv hal-doc.spec.tmp hal-doc.spec || fail
echo Fixed up hal-doc.spec.
cp hal.changes hal-doc.changes
echo Copied hal.changes to hal-doc.changes
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org