rpms/hal/devel hal-0.5.11rc1-acl-list.patch, NONE, 1.1 hal-0.5.11rc1-build.patch, NONE, 1.1 .cvsignore, 1.53, 1.54 hal.spec, 1.147, 1.148 sources, 1.55, 1.56 hal-0.5.11-vio.patch, 1.1, NONE
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Sat Mar 15 14:58:19 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/hal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32625/devel
Modified Files:
.cvsignore hal.spec sources
Added Files:
hal-0.5.11rc1-acl-list.patch hal-0.5.11rc1-build.patch
Removed Files:
hal-0.5.11-vio.patch
Log Message:
hal-0.5.11rc1
hal-0.5.11rc1-acl-list.patch:
--- NEW FILE hal-0.5.11rc1-acl-list.patch ---
diff -urp hal-0.5.11rc1.orig/tools/hal-acl-tool.c hal-0.5.11rc1/tools/hal-acl-tool.c
--- hal-0.5.11rc1.orig/tools/hal-acl-tool.c 2008-03-13 22:37:04.000000000 +0100
+++ hal-0.5.11rc1/tools/hal-acl-tool.c 2008-03-15 13:29:01.000000000 +0100
@@ -37,7 +37,7 @@
/* How this works (or "An introduction to this code")
*
- * - all ACL's granted by this tool is kept in /var/run/hal/acl-list
+ * - all ACL's granted by this tool is kept in /var/run/hald/acl-list
* See below for the format.
*
* - every time tool is launched we read this file and keep each line
@@ -82,7 +82,7 @@
*
*/
-/* Each entry here represents a line in the /var/run/hal/acl-list file
+/* Each entry here represents a line in the /var/run/hald/acl-list file
* of ACL's that have been set by HAL and as such are currently
* applied
*
@@ -220,7 +220,7 @@ acl_apply_changes (GSList *new_acl_list,
*
* The variable 'only_update_acllist' is set to TRUE only on
* device_remove events. It effectively means "only update the
- * /var/run/hal/acl-list, do not apply ACL's on disk". So this
+ * /var/run/hald/acl-list, do not apply ACL's on disk". So this
* is done for systems where /dev is dynamic and we know for
* sure that the device file is gone.
*
@@ -258,7 +258,7 @@ acl_apply_changes (GSList *new_acl_list,
}
/* success; now atomically set the new list */
- g_file_set_contents (PACKAGE_LOCALSTATEDIR "/run/hal/acl-list",
+ g_file_set_contents (PACKAGE_LOCALSTATEDIR "/run/hald/acl-list",
new_acl_file_contents,
strlen (new_acl_file_contents),
NULL);
@@ -360,9 +360,9 @@ get_current_acl_list (GSList **l)
f = NULL;
ret = FALSE;
- f = fopen (PACKAGE_LOCALSTATEDIR "/run/hal/acl-list", "r");
+ f = fopen (PACKAGE_LOCALSTATEDIR "/run/hald/acl-list", "r");
if (f == NULL) {
- printf ("%d: cannot open " PACKAGE_LOCALSTATEDIR "/run/hal/acl-list\n", getpid ());
+ printf ("%d: cannot open " PACKAGE_LOCALSTATEDIR "/run/hald/acl-list\n", getpid ());
goto out;
}
@@ -1154,11 +1154,11 @@ acl_lock (void)
if (lock_acl_fd >= 0)
return TRUE;
- printf ("%d: attempting to get lock on " PACKAGE_LOCALSTATEDIR "/run/hal/acl-list\n", getpid ());
+ printf ("%d: attempting to get lock on " PACKAGE_LOCALSTATEDIR "/run/hald/acl-list\n", getpid ());
- lock_acl_fd = open (PACKAGE_LOCALSTATEDIR "/run/hal/acl-list", O_CREAT | O_RDWR, 0644);
+ lock_acl_fd = open (PACKAGE_LOCALSTATEDIR "/run/hald/acl-list", O_CREAT | O_RDWR, 0644);
if (lock_acl_fd < 0) {
- printf ("%d: error opening/creating " PACKAGE_LOCALSTATEDIR "/run/hal/acl-list\n", getpid ());
+ printf ("%d: error opening/creating " PACKAGE_LOCALSTATEDIR "/run/hald/acl-list\n", getpid ());
return FALSE;
}
@@ -1177,7 +1177,7 @@ tryagain:
printf ("\n");
printf ("****************************************************\n");
- printf ("%d: got lock on " PACKAGE_LOCALSTATEDIR "/run/hal/acl-list\n", getpid ());
+ printf ("%d: got lock on " PACKAGE_LOCALSTATEDIR "/run/hald/acl-list\n", getpid ());
return TRUE;
}
@@ -1186,7 +1186,7 @@ acl_unlock (void)
{
printf ("\n");
printf ("****************************************************\n");
- printf ("%d: releasing lock on " PACKAGE_LOCALSTATEDIR "/run/hal/acl-list\n", getpid ());
+ printf ("%d: releasing lock on " PACKAGE_LOCALSTATEDIR "/run/hald/acl-list\n", getpid ());
#if sun
lockf (lock_acl_fd, F_ULOCK, 0);
#else
diff -urp hal-0.5.11rc1.orig/tools/Makefile.am hal-0.5.11rc1/tools/Makefile.am
--- hal-0.5.11rc1.orig/tools/Makefile.am 2008-03-13 22:37:07.000000000 +0100
+++ hal-0.5.11rc1/tools/Makefile.am 2008-03-15 13:26:58.000000000 +0100
@@ -220,10 +220,5 @@ check:
fi; \
done;
-install-data-local:
- -$(mkdir_p) $(DESTDIR)$(localstatedir)/lib/hal
- -chown $(HAL_USER):$(HAL_GROUP) $(DESTDIR)$(localstatedir)/lib/hal
- -chmod 0700 $(DESTDIR)$(localstatedir)/lib/hal
-
clean-local :
rm -f *~
diff -urp hal-0.5.11rc1.orig/tools/Makefile.in hal-0.5.11rc1/tools/Makefile.in
--- hal-0.5.11rc1.orig/tools/Makefile.in 2008-03-13 22:41:47.000000000 +0100
+++ hal-0.5.11rc1/tools/Makefile.in 2008-03-15 13:27:40.000000000 +0100
@@ -1081,9 +1081,6 @@ check:
done;
install-data-local:
- -$(mkdir_p) $(DESTDIR)$(localstatedir)/lib/hal
- -chown $(HAL_USER):$(HAL_GROUP) $(DESTDIR)$(localstatedir)/lib/hal
- -chmod 0700 $(DESTDIR)$(localstatedir)/lib/hal
clean-local :
rm -f *~
hal-0.5.11rc1-build.patch:
--- NEW FILE hal-0.5.11rc1-build.patch ---
From: Danny Kukawka <danny.kukawka at web.de>
Date: Fri, 14 Mar 2008 12:32:07 +0000 (+0100)
Subject: fixed several addons to build correctly
X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=8a6d7392d7a103ff498d3c9ccbbe81f71aaea854
fixed several addons to build correctly
Fixed several issues in the linux addons:
- include config.h if you use e.g. HAVE_POLKIT
- addon-imac-backlight.c: added missing include of string.h, made
'LibHalContext *halctx' global static to allow usage in functions.
- addon-macbook-backlight.c: made 'LibHalContext *halctx' global
static to allow usage in functions
---
--- a/hald/linux/addons/addon-dell-backlight.cpp
+++ b/hald/linux/addons/addon-dell-backlight.cpp
@@ -23,7 +23,10 @@
*
**************************************************************************/
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <string.h>
#include <glib/gmain.h>
--- a/hald/linux/addons/addon-imac-backlight.c
+++ b/hald/linux/addons/addon-imac-backlight.c
@@ -20,8 +20,11 @@
*
*/
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/io.h>
@@ -33,6 +36,8 @@
#include "libhal/libhal.h"
#include "../../logger.h"
+static LibHalContext *halctx = NULL;
+
static void
backlight_set(int value)
{
@@ -172,7 +177,6 @@ filter_function (DBusConnection * connec
int
main (int argc, char **argv)
{
- LibHalContext *halctx;
DBusConnection *conn;
GMainLoop *main_loop;
const char *udi;
--- a/hald/linux/addons/addon-macbook-backlight.c
+++ b/hald/linux/addons/addon-macbook-backlight.c
@@ -48,15 +48,20 @@
* of the backlight when it is enabled.
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <pci/pci.h>
#include <glib.h>
+#include <fcntl.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <sys/mman.h>
-#include <fcntl.h>
#include <unistd.h>
-#include <stdlib.h>
#define DBUS_API_SUBJECT_TO_CHANGE
@@ -73,6 +78,7 @@
#define ACCESS_INDEX (ACCESS_OFFSET >> 2)
static unsigned int *register_page;
+static LibHalContext *halctx = NULL;
static unsigned long
determine_video_base_address (void)
@@ -296,7 +302,6 @@ filter_function (DBusConnection * connec
int
main (int argc, char **argv)
{
- LibHalContext *halctx;
DBusConnection *conn;
GMainLoop *main_loop;
const char *udi;
--- a/hald/linux/addons/addon-macbookpro-backlight.c
+++ b/hald/linux/addons/addon-macbookpro-backlight.c
@@ -24,7 +24,10 @@
*
**************************************************************************/
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
--- a/hald/linux/addons/addon-omap-backlight.c
+++ b/hald/linux/addons/addon-omap-backlight.c
@@ -25,7 +25,10 @@
*
**************************************************************************/
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore 4 Mar 2008 20:12:01 -0000 1.53
+++ .cvsignore 15 Mar 2008 14:57:44 -0000 1.54
@@ -1,48 +1 @@
-hal-0.2.97.cvs20040901.tar.gz
-hal-0.2.98.tar.gz
-hal-0.2.98.cvs20040923.tar.gz
-hal-0.2.98.cvs20040927.tar.gz
-hal-0.2.98.cvs20040929.tar.gz
-hal-0.4.0.tar.gz
-hal-0.4.2.cvs20041210.tar.gz
-hal-0.4.5.tar.gz
-hal-0.4.6.tar.gz
-hal-0.4.7.tar.gz
-hal-0.5.0.tar.gz
-hal-0.5.0.cvs20050310.tar.gz
-hal-0.5.0.cvs20050318.tar.gz
-hal-0.5.0.cvs20050322.tar.gz
-hal-0.5.0.cvs20050322b.tar.gz
-hal-0.5.0.cvs20050404.tar.gz
-hal-0.5.0.cvs20050404b.tar.gz
-hal-0.5.1.tar.gz
-hal-0.5.2.tar.gz
-hal-0.5.3.tar.gz
-hal-0.5.4.tar.gz
-hal-0.5.4.cvs20051111.tar.gz
-hal-0.5.5.1.tar.gz
-hal-0.5.5.1.cvs20060105.tar.gz
-hal-0.5.5.1.cvs20060109.tar.gz
-hal-0.5.6.tar.gz
-hal-0.5.5.1.cvs20060111.tar.gz
-hal-0.5.7-0.cvs20060213.tar.gz
-hal-0.5.7.tar.gz
-hal-0.5.7.1.tar.gz
-hal-0.5.8.1.tar.gz
-hal-0.5.9.git20070206.tar.gz
-hal-info-20070206.tar.gz
-hal-0.5.9.git20070218.tar.gz
-hal-info-20070304.tar.gz
-hal-0.5.9.git20070304.tar.gz
-hal-info-20070326.tar.gz
-hal-0.5.9.git20070326.tar.gz
-hal-info-20070328.tar.gz
-hal-0.5.9.git20070401.tar.gz
-hal-0.5.9.tar.gz
-hal-info-20070402.tar.gz
-hal-0.5.10rc1.tar.gz
-hal-0.5.10rc2.tar.gz
-hal-0.5.10.git20070925.tar.gz
-hal-0.5.10.tar.gz
-hal-0.5.11.git20080304.tar.gz
-hal-0.5.11.git20080304.2.tar.gz
+hal-0.5.11rc1.tar.gz
Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- hal.spec 10 Mar 2008 19:00:05 -0000 1.147
+++ hal.spec 15 Mar 2008 14:57:44 -0000 1.148
@@ -1,15 +1,15 @@
%define expat_version 1.95.5
%define glib2_version 2.6.0
%define dbus_version 0.90
-%define dbus_glib_version 0.70
-%define dbus_python_version 0.70
-%define pygtk2 2.0.0
-%define gnome_python2 2.0.0
+%define dbus_glib_version 0.70
+%define dbus_python_version 0.70
+%define pygtk2 2.0.0
+%define gnome_python2 2.0.0
%define udev_version 089-1
%define util_linux_version 2.12a-16
%define initscripts_version 8.04-1
%define kernel_version 2.6.17
-%define gettext_version 0.14.1-14
+%define gettext_version 0.14.1-14
%define libusb_version 0.1.10a-1
%define pciutils_version 2.2.1
%define dmidecode_version 2.7
@@ -26,13 +26,14 @@
Summary: Hardware Abstraction Layer
Name: hal
Version: 0.5.11
-Release: 0.git20080304.4%{?dist}
+Release: 0.1.rc1%{?dist}
URL: http://www.freedesktop.org/Software/hal
-Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20080304.2.tar.gz
-Patch0: hal-0.5.11-vio.patch
+Source0: http://hal.freedesktop.org/releases/%{name}-%{version}rc1.tar.gz
Patch1: hal-0.5.10-set-property-direct.patch
+Patch2: hal-0.5.11rc1-build.patch
+Patch3: hal-0.5.11rc1-acl-list.patch
-License: AFL/GPL
+License: AFL or GPLv2
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig
@@ -122,15 +123,31 @@
API docs for HAL.
%prep
-%setup -q
-%patch0 -p1 -b .vio
+%setup -q -n %{name}-%{version}rc1
%patch1 -p1 -b .direct
+%patch2 -p1 -b .build
+%patch3 -p1 -b .acl-list
%build
-%configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
-make
+%configure \
+ --enable-docbook-docs \
+ --docdir=%{_docdir}/%{name}-%{version} \
+ --with-os-type=redhat \
+ --enable-console-kit \
+ --enable-policy-kit \
+ --enable-acl-management \
+ --enable-umount-helper \
+ --enable-acpi-ibm \
+ --enable-acpi-toshiba \
+ --with-eject=%{_sbindir}/eject
+
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags}
%install
+rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
cp README AUTHORS NEWS COPYING HACKING $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
@@ -138,13 +155,16 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+# So that this can be %ghost-ed
+touch $RPM_BUILD_ROOT%{_localstatedir}/run/hald/acl-list
+
%clean
rm -rf $RPM_BUILD_ROOT
%pre
# Add the "haldaemon" user
/usr/sbin/useradd -c 'HAL daemon' -u %{hal_user_uid} \
- -s /sbin/nologin -r -d '/' haldaemon 2> /dev/null || :
+ -s /sbin/nologin -r -d '/' haldaemon 2> /dev/null || :
# User haldaemon needs to be able to read authorizations
/usr/bin/polkit-auth --user haldaemon --grant org.freedesktop.policykit.read >& /dev/null || :
@@ -175,6 +195,12 @@
/bin/cp -f fstab.replace /etc/fstab
fi
+%triggerpostun -- hal < 0.5.11-0.1.rc1
+if [ "$1" -ge "1" ]; then
+ mv -uf %{_localstatedir}/lib/hal/acl-list %{_localstatedir}/run/hald 2>/dev/null || :
+ rm -rf %{_localstatedir}/lib/hal
+fi
+
%files
%defattr(-,root,root,-)
@@ -214,7 +240,8 @@
%{_datadir}/PolicyKit/policy/*
%attr(0700,haldaemon,haldaemon) %dir %{_localstatedir}/cache/hald
-%attr(0700,haldaemon,haldaemon) %dir %{_localstatedir}/lib/hal
+%attr(0700,haldaemon,haldaemon) %dir %{_localstatedir}/run/hald
+%ghost %{_localstatedir}/run/hald/acl-list
%files libs
%defattr(-,root,root,-)
@@ -240,6 +267,15 @@
%{_datadir}/gtk-doc/html/libhal-storage/*
%changelog
+* Sat Mar 15 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.5.11-0.1.rc1
+- hal-0.5.11rc1
+- Move acl list from older versions to proper place
+- Fix license tag
+- Fix macro use in changelog
+- Drop the vio patch
+- Nuke rpaths
+- Parallel build
+
* Mon Mar 10 2008 Adam Jackson <ajax at redhat.com> 0.5.11-0.git20080304.4
- hal-0.5.10-set-property-direct.patch: Add --direct option to
hal-set-property(1).
@@ -401,7 +437,7 @@
* Tue Sep 26 2006 David Zeuthen <davidz at redhat.com> - 0.5.8.1-1%{?dist}
- upgrade to upstream release 0.5.8.1
-- helpers have moved to %libdir/hal/scripts
+- helpers have moved to %%libdir/hal/scripts
- require gtk-doc instead of Doxygen
- drop upstreamed patches
- patch for correctly detecting FUSE mounts (e.g. ntfs-fuse)
@@ -799,7 +835,7 @@
the file system mounting script in /etc/hal/device.d
* Wed May 12 2004 John (J5) Palmieri <johnp at redhat.com> 0.2.90.cvs20040511-2
-- added the %{_sysconfigdir}/hal directory tree to %files
+- added the %%{_sysconfigdir}/hal directory tree to %files
* Tue May 11 2004 John (J5) Palmieri <johnp at redhat.com> 0.2.90.cvs20040511-1
- update to CVS head as of 5-11-2004
@@ -813,4 +849,4 @@
* Mon Apr 19 2004 John (J5) Palmieri <johnp at redhat.com> 0.2-1
- initial checkin to package repository
- added dependency to the dbus-python package
-- added %{_libexecdir}/hal.dev to teh %files section
+- added %%{_libexecdir}/hal.dev to teh %%files section
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources 4 Mar 2008 20:12:02 -0000 1.55
+++ sources 15 Mar 2008 14:57:44 -0000 1.56
@@ -1 +1 @@
-63f7ef41ead14da1447ff30f1e37a4dc hal-0.5.11.git20080304.2.tar.gz
+cf985c31324f2480590de01599ac7b74 hal-0.5.11rc1.tar.gz
--- hal-0.5.11-vio.patch DELETED ---
More information about the fedora-extras-commits
mailing list