OBS User unknown 2008-06-06 15:35:43 +00:00 committed by Git OBS Bridge
parent 6a54a5bdc4
commit 7db90cd37d
6 changed files with 27 additions and 69 deletions

View File

@ -1,32 +0,0 @@
--- glib/Makefile
+++ glib/Makefile
@@ -1,19 +1,11 @@
-DBUS_SHARP_PREFIX=../../dbus-sharp
-
-# See How Not to Use VPATH: http://make.paulandlesley.org/vpath.html
-VPATH=$(DBUS_SHARP_PREFIX)/src
-
-#Note that this makefile isn't healthy, but it works for me
-#Makefile bug: doesn't seem to work with make -B
-
#.PHONY: all
all: NDesk.DBus.GLib.dll
-NDesk.DBus.GLib.dll: NDesk.DBus.dll AssemblyInfo.cs GLib.IO.cs GLib.cs ../ndesk.snk
+NDesk.DBus.GLib.dll: AssemblyInfo.cs GLib.IO.cs GLib.cs ../ndesk.snk
.PHONY:
install: NDesk.DBus.GLib.dll
$(GACUTIL) $(GACUTIL_FLAGS) -i NDesk.DBus.GLib.dll -f -package ndesk-dbus-glib-1.0
-include $(DBUS_SHARP_PREFIX)/include.mk
+include ../include.mk
--- ndesk-dbus-glib-1.0.pc.in
+++ ndesk-dbus-glib-1.0.pc.in
@@ -6,4 +6,4 @@
Description: GLib integration for NDesk.DBus, the D-Bus IPC library
Version: 0.3.0
Requires: ndesk-dbus-1.0
-Libs: -r:${libdir}/mono/lib/ndesk-dbus-glib-1.0/NDesk.DBus.GLib.dll
+Libs: -r:${libdir}/mono/ndesk-dbus-glib-1.0/NDesk.DBus.GLib.dll

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8a0e92fa358b879552556f254c43694e9bf791f586558a7aa905ef0267991ef
size 6050

View File

@ -1,22 +0,0 @@
#CSC_DEBUGFLAGS=-debug -d:TRACE
CSC_DEBUGFLAGS=-debug
CSC=gmcs $(CSC_DEBUGFLAGS)
MONO_DEBUGFLAGS=--debug
RUNTIME=mono $(MONO_DEBUGFLAGS)
GACUTIL=gacutil
GACUTIL_FLAGS=-root $(DESTDIR)$(prefix)/lib
#this isn't great
prefix=$(shell dirname `which gacutil`)/..
#%.exe:
%.exe %.dll %.module:
$(CSC) $(CSFLAGS) -out:$@ -t:$(TARGET) $(addprefix -pkg:,$(PKGS)) $(addprefix -r:,$(REFS)) $(addprefix -r:,$(filter %.dll,$^)) $(addprefix -addmodule:,$(filter %.module,$^)) $(addprefix -keyfile:,$(filter %.snk,$^)) $(filter %.cs,$^) `pkg-config --libs ndesk-dbus-1.0`
%.exe: TARGET = exe
%.dll: TARGET = library
%.module: TARGET = module
#$(MODULE)_SOURCES := foo.cs

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a6d5fe7be55b6301615d71b89507b712f287b4ba498b798301333ffabe06769
size 85471

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jun 3 22:22:16 CEST 2008 - wberrier@suse.de
- Update to 0.4.1. Fixes bnc#390845 (broken mono apps using dbus
on ppc)
-Build system for 0.4.1 works much better so we don't need
build-fix.patch or include.mk anymore
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 20 18:52:43 CET 2008 - mauro@suse.de Thu Mar 20 18:52:43 CET 2008 - mauro@suse.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package ndesk-dbus-glib (Version 0.3) # spec file for package ndesk-dbus-glib (Version 0.4.1)
# #
# Copyright (c) 2008 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 # This file and all modifications and additions to the pristine
@ -17,12 +17,10 @@ Requires: ndesk-dbus
Url: http://www.ndesk.org/DBusSharp Url: http://www.ndesk.org/DBusSharp
License: X11/MIT License: X11/MIT
Group: Development/Libraries/Other Group: Development/Libraries/Other
Version: 0.3 Version: 0.4.1
Release: 73 Release: 1
Summary: Ndesk-dbus-glib provides glib integration for NDesk.DBus Summary: Ndesk-dbus-glib provides glib integration for NDesk.DBus
Source0: dbus-sharp-glib-%{version}.tar.gz Source: ndesk-dbus-glib-%{version}.tar.gz
Source1: include.mk
Patch: build-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
@ -32,6 +30,7 @@ Ndesk-dbus-glibl provides glib integration for NDesk.DBus
%package devel %package devel
License: X11/MIT
Summary: Ndesk-dbus-glib provides glib integration for NDesk.DBus Summary: Ndesk-dbus-glib provides glib integration for NDesk.DBus
Group: Development/Libraries/Other Group: Development/Libraries/Other
AutoReqProv: on AutoReqProv: on
@ -43,17 +42,17 @@ Ndesk-dbus-glibl provides glib integration for NDesk.DBus
%prep %prep
%setup -n dbus-sharp-glib-%{version} %setup
%patch
cp %{SOURCE1} .
%build %build
./configure --prefix=%_prefix
make make
%install %install
make -C glib install DESTDIR="$RPM_BUILD_ROOT" prefix=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p "$RPM_BUILD_ROOT"%{_datadir}/pkgconfig # move .pc to usr/share
sed -e 's|@prefix@|%{_prefix}|g' < ndesk-dbus-glib-1.0.pc.in > "$RPM_BUILD_ROOT"%{_datadir}/pkgconfig/ndesk-dbus-glib-1.0.pc mkdir -p $RPM_BUILD_ROOT%_datadir/pkgconfig
mv $RPM_BUILD_ROOT/usr/lib/pkgconfig/ndesk-dbus-glib-1.0.pc $RPM_BUILD_ROOT%_datadir/pkgconfig
%clean %clean
rm -rf "$RPM_BUILD_ROOT" rm -rf "$RPM_BUILD_ROOT"
@ -69,6 +68,11 @@ rm -rf "$RPM_BUILD_ROOT"
%{_prefix}/lib/mono/ndesk-dbus-glib-1.0 %{_prefix}/lib/mono/ndesk-dbus-glib-1.0
%changelog %changelog
* Wed Jun 04 2008 wberrier@suse.de
- Update to 0.4.1. Fixes bnc#390845 (broken mono apps using dbus
on ppc)
-Build system for 0.4.1 works much better so we don't need
build-fix.patch or include.mk anymore
* Thu Mar 20 2008 mauro@suse.de * Thu Mar 20 2008 mauro@suse.de
- Added -devel subpackage as bnc#351512 requests. - Added -devel subpackage as bnc#351512 requests.
* Thu May 31 2007 - mauro@novell.com * Thu May 31 2007 - mauro@novell.com