Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13260
Modified Files:
dbus.info dbus.patch
Log Message:
a number of dbus fixes
Index: dbus.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/dbus.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dbus.info 6 Jan 2007 23:42:18 -0000 1.11
+++ dbus.info 25 Feb 2007 21:35:16 -0000 1.12
@@ -1,21 +1,33 @@
Package: dbus
Version: 1.0.2
-Revision: 13
+Revision: 15
Description: Message bus system for applications
License: OSI-Approved
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Depends: %N-shlibs (>= %v-%r), daemonic, expat1-shlibs
-BuildDepends: expat1, gettext-tools, glib2-dev (>= 2.8.6-1), libgettext3-dev,
libiconv-dev, pkgconfig, x11-dev
+Depends: <<
+ %N-shlibs (>= %v-%r),
+ daemonic,
+ expat1-shlibs
+<<
+BuildDepends: <<
+ expat1,
+ gettext-tools,
+ glib2-dev,
+ libgettext3-dev,
+ libiconv-dev,
+ pkgconfig,
+ x11-dev
+<<
Source: http://%n.freedesktop.org/releases/%n/%n-%v.tar.gz
-Source2: http://%n.freedesktop.org/releases/%n-0.62.tar.gz
-Source3: http://%n.freedesktop.org/releases/%n-glib/%n-glib-0.72.tar.gz
-Source2ExtractDir: %n-%v
-Source3ExtractDir: %n-%v
Source-MD5: 0552a9b54beb4a044951b7cdbc8fc855
+Source2: http://%n.freedesktop.org/releases/%n-0.62.tar.gz
Source2-MD5: ba7692f63d0e9f1ef06703dff56cb650
+Source2ExtractDir: %n-%v
+Source3: http://%n.freedesktop.org/releases/%n-glib/%n-glib-0.72.tar.gz
Source3-MD5: 6e92993aed234f13ea41c674dec40889
+Source3ExtractDir: %n-%v
PatchScript: /usr/bin/sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch |
/usr/bin/patch -p1
SetCFLAGS: -Os -g
@@ -90,25 +102,40 @@
END
chmod 755 %i/etc/profile.d/*
+ install -d -m 755 %i/share/%N
+ mv %i/bin/dbus-uuidgen %i/share/%N
<<
DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README
SplitOff: <<
Package: %N-shlibs
- Depends: glib2-shlibs (>= 2.8.6-1), libgettext3-shlibs, libiconv
+ Depends: <<
+ glib2-shlibs,
+ libgettext3-shlibs,
+ libiconv
+ <<
DocFiles: COPYING
Files: <<
lib/libdbus-1.*.dylib
lib/libdbus-glib-1.*.dylib
+ share/%N/dbus-uuidgen
<<
Shlibs: <<
%p/lib/libdbus-1.2.dylib 3.0.0 %n (>= 0.60-1)
%p/lib/libdbus-1.3.dylib 4.0.0 %n (>= 0.92-1)
%p/lib/libdbus-glib-1.2.dylib 3.0.0 %n (>= 0.60-1)
<<
+ PostInstScript: <<
+if [ "$1" = "configure" ]; then
+ %p/share/%N/dbus-uuidgen --ensure >>/tmp/%N-postinst.log 2>&1 || :
+fi
+ <<
<<
SplitOff2: <<
Package: %N-dev
- Depends: %N-shlibs (= %v-%r), pkgconfig
+ Depends: <<
+ %N-shlibs (= %v-%r),
+ pkgconfig
+ <<
BuildDependsOnly: true
DocFiles: COPYING
Files: <<
@@ -118,17 +145,20 @@
<<
PostInstScript: <<
- if [ -x "%p/bin/daemonic" ]; then
- %p/bin/daemonic install %N >/dev/null 2>&1 || :
- %p/bin/daemonic enable %N >/dev/null 2>&1 || :
+ if [ "$1" = "configure" ]; then
+ if [ -x "%p/bin/daemonic" ]; then
+ %p/bin/daemonic install %N >/dev/null 2>&1 || :
+ %p/bin/daemonic enable %N >/dev/null 2>&1 || :
+ fi
fi
- %p/bin/dbus-uuidgen --ensure >>/tmp/dbus-postinst.log 2>&1 || :
%p/bin/start-system-bus.sh >/tmp/dbus-postinst.log 2>&1 || :
<<
PostRmScript: <<
- if [ -x "%p/bin/daemonic" ]; then
- %p/bin/daemonic disable %N >/dev/null 2>&1 || :
- %p/bin/daemonic remove %N >/dev/null 2>&1 || :
+ if [ "$1" = "remove" ]; then
+ if [ ! -x "%p/bin/daemonic" ]; then
+ %p/bin/daemonic disable %N >/dev/null 2>&1 || :
+ %p/bin/daemonic remove %N >/dev/null 2>&1 || :
+ fi
fi
<<
DaemonicFile: <<
Index: dbus.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/dbus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dbus.patch 13 Nov 2006 16:14:58 -0000 1.2
+++ dbus.patch 25 Feb 2007 21:35:16 -0000 1.3
@@ -1,6 +1,6 @@
---- dbus-1.0.0/dbus-glib-0.72/tools/Makefile.in 2006-10-25
17:14:33.000000000 -0400
-+++ dbus-1.0.0-new/dbus-glib-0.72/tools/Makefile.in 2006-11-10
09:14:40.000000000 -0500
+--- dbus-1.0.2/dbus-glib-0.72/tools/Makefile.in 2006-10-25
17:14:33.000000000 -0400
++++ dbus-1.0.2-new/dbus-glib-0.72/tools/Makefile.in 2007-01-09
17:15:08.000000000 -0500
@@ -492,7 +492,7 @@
$(top_builddir)/dbus/dbus-binding-tool --mode=glib-client
--prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
@@ -10,11 +10,13 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
---- dbus-1.0.0/start-session-bus.sh 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.0.0-new/start-session-bus.sh 2006-11-10 09:14:30.000000000
-0500
-@@ -0,0 +1,37 @@
+--- dbus-1.0.2/start-session-bus.sh 1969-12-31 19:00:00.000000000 -0500
++++ dbus-1.0.2-new/start-session-bus.sh 2007-01-09 17:15:22.000000000
-0500
+@@ -0,0 +1,39 @@
+#!/bin/sh
+
++. @FINKPREFIX@/bin/init.sh
++
+DO_SH=0
+DO_CSH=0
+
@@ -50,11 +52,13 @@
+fi
+
+exit 0
---- dbus-1.0.0/start-system-bus.sh 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.0.0-new/start-system-bus.sh 2006-11-10 09:14:30.000000000 -0500
-@@ -0,0 +1,13 @@
+--- dbus-1.0.2/start-system-bus.sh 1969-12-31 19:00:00.000000000 -0500
++++ dbus-1.0.2-new/start-system-bus.sh 2007-01-09 17:15:31.000000000 -0500
+@@ -0,0 +1,15 @@
+#!/bin/sh
+
++. @FINKPREFIX@/bin/init.sh
++
+if [ -f "@FINKPREFIX@/var/run/dbus/pid" ]; then
+ PID=`cat "@FINKPREFIX@/var/run/dbus/pid"`
+ if [ `/bin/ps -p "${PID}" | grep -c "^ *${PID} "` -eq 0 ]; then
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
