rpms/libbtctl/devel libbtctl-0.6.0-libdir.patch, NONE, 1.1 libbtctl.spec, 1.23, 1.24

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Feb 23 08:36:16 UTC 2006


Author: harald

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20079

Modified Files:
	libbtctl.spec 
Added Files:
	libbtctl-0.6.0-libdir.patch 
Log Message:
added mono components

libbtctl-0.6.0-libdir.patch:
 Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE libbtctl-0.6.0-libdir.patch ---
--- libbtctl-0.6.0/mono/libbtctl/Makefile.am.libdir	2004-05-31 00:04:16.000000000 +0200
+++ libbtctl-0.6.0/mono/libbtctl/Makefile.am	2006-02-23 09:26:26.000000000 +0100
@@ -29,7 +29,7 @@
 CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs btlist.exe btobex.exe
 DISTCLEANFILES = AssemblyInfo.cs
 
-gapidir=$(MONO_INSTDIR)/share/gapi
+gapidir=$(datadir)/gapi
 gapi_DATA = $(API)
 
 all: $(ASSEMBLY) btlist.exe btobex.exe
@@ -64,12 +64,12 @@
 
 install-data-local:
 	if test -n '$(TARGET)'; then \
-		$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(MONO_INSTDIR)/lib || exit 1; \
+		$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \
 	fi
 
 uninstall-local:
 	if test -n '$(TARGET)'; then \
-		$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(MONO_INSTDIR)/lib || exit 1; \
+		$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \
 	fi
 
 


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libbtctl.spec	16 Feb 2006 14:05:26 -0000	1.23
+++ libbtctl.spec	23 Feb 2006 08:36:13 -0000	1.24
@@ -10,8 +10,9 @@
 Requires: python-abi = %{pyver}
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: autoconf >= 0:2.57 bluez-libs-devel glib2-devel gtk-doc openobex-devel >= 0:1.1 python pygtk2-devel gtk2-devel
-BuildRequires: mono-devel
+BuildRequires: mono-devel gtk-sharp-gapi gtk-sharp
 ExcludeArch: s390 s390x
+Patch1: libbtctl-0.6.0-libdir.patch
 Patch2: libbtctl-0.4.1-pydir.patch
 
 %description
@@ -32,6 +33,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
+%patch1 -p1 -b .libdir
 %patch2 -p1 -b .pydir
 aclocal
 automake -a
@@ -65,6 +67,10 @@
 %doc AUTHORS COPYING ChangeLog NEWS README 
 %{_libdir}/lib*.so.*
 %{_libdir}/python?.?/site-packages/*btctl*
+%{_libdir}/mono/gac/btctl/*/btctl.dll
+%{_libdir}/mono/libbtctl/btctl.dll
+%{_datadir}/gapi/btctl-api.xml
+
 
 %files devel
 %defattr(-, root, root)
@@ -73,6 +79,7 @@
 %{_libdir}/pkgconfig/libbtctl.pc
 %{_includedir}/libbtctl
 %{_datadir}/gtk-doc/html/libbtctl
+%{_libdir}/pkgconfig/libbtctl-sharp.pc
 
 
 %changelog




More information about the fedora-cvs-commits mailing list