rpms/ipod-sharp/devel ipod-sharp-0.5.15-monodir.patch, NONE, 1.1 ipod-sharp.spec, 1.2, 1.3

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/ipod-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23310

Modified Files:
	ipod-sharp.spec 
Added Files:
	ipod-sharp-0.5.15-monodir.patch 
Log Message:
* Mon Aug 28 2006 Christopher Aillon <caillon at redhat.com> 0.5.15-3
- Rebuild against newer mono stack


ipod-sharp-0.5.15-monodir.patch:

--- NEW FILE ipod-sharp-0.5.15-monodir.patch ---
--- ipod-sharp-0.5.15/ipod-sharp.pc.in.monodir	2006-02-12 22:13:27.000000000 -0500
+++ ipod-sharp-0.5.15/ipod-sharp.pc.in	2006-08-28 03:51:39.000000000 -0400
@@ -2,7 +2,7 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Libraries=@prefix@/lib/ipod-sharp/ipod-sharp.dll
+Libraries=@libdir@/ipod-sharp/ipod-sharp.dll
 
 Name: ipod-sharp
 Description: ipod-sharp - Library for interfacing with Apple iPod devices
--- ipod-sharp-0.5.15/src/Makefile.in.monodir	2006-08-28 03:53:46.000000000 -0400
+++ ipod-sharp-0.5.15/src/Makefile.in	2006-08-28 03:53:59.000000000 -0400
@@ -147,7 +147,7 @@
 DOC_ASSEMBLER = @MDASSEMBLER@ --out ipod-sharp-docs --ecma
 MCS_FLAGS = -debug
 ASSEMBLY = ipod-sharp.dll
-ipoddir = $(prefix)/lib/ipod-sharp
+ipoddir = $(libdir)/ipod-sharp
 ipod_DATA = $(ASSEMBLY)
 ASSEMBLY_SOURCES = \
 	$(srcdir)/AssemblyInfo.cs	\
--- ipod-sharp-0.5.15/src/Makefile.am.monodir	2006-02-12 22:13:27.000000000 -0500
+++ ipod-sharp-0.5.15/src/Makefile.am	2006-08-28 03:51:39.000000000 -0400
@@ -6,7 +6,7 @@
 
 ASSEMBLY = ipod-sharp.dll
 
-ipoddir = $(prefix)/lib/ipod-sharp
+ipoddir = $(libdir)/ipod-sharp
 ipod_DATA = $(ASSEMBLY)
 
 ASSEMBLY_SOURCES =			\
--- ipod-sharp-0.5.15/ipod-sharp-ui.pc.in.monodir	2006-02-12 22:13:27.000000000 -0500
+++ ipod-sharp-0.5.15/ipod-sharp-ui.pc.in	2006-08-28 03:51:39.000000000 -0400
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-Libraries=@prefix@/lib/ipod-sharp/ipod-sharp-ui.dll
+Libraries=@libdir@/ipod-sharp/ipod-sharp-ui.dll
 
 Name: ipod-sharp-ui
 Description: ipod-sharp-ui - Widgets useful for working with ipod-sharp
--- ipod-sharp-0.5.15/ui/Makefile.in.monodir	2006-08-28 03:53:25.000000000 -0400
+++ ipod-sharp-0.5.15/ui/Makefile.in	2006-08-28 03:53:42.000000000 -0400
@@ -144,7 +144,7 @@
 target_vendor = @target_vendor@
 MCS_FLAGS = -debug
 ASSEMBLY = ipod-sharp-ui.dll
-ipodsharpdir = $(prefix)/lib/ipod-sharp
+ipodsharpdir = $(libdir)/ipod-sharp
 ipodsharp_DATA = $(ASSEMBLY)
 ASSEMBLY_SOURCES = \
 	$(srcdir)/AssemblyInfo.cs	\
--- ipod-sharp-0.5.15/ui/Makefile.am.monodir	2006-02-12 22:13:27.000000000 -0500
+++ ipod-sharp-0.5.15/ui/Makefile.am	2006-08-28 03:51:39.000000000 -0400
@@ -3,7 +3,7 @@
 
 ASSEMBLY = ipod-sharp-ui.dll
 
-ipodsharpdir = $(prefix)/lib/ipod-sharp
+ipodsharpdir = $(libdir)/ipod-sharp
 ipodsharp_DATA = $(ASSEMBLY)
 
 ASSEMBLY_SOURCES =			\


Index: ipod-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/ipod-sharp/devel/ipod-sharp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ipod-sharp.spec	3 Mar 2006 06:05:11 -0000	1.2
+++ ipod-sharp.spec	28 Aug 2006 07:57:25 -0000	1.3
@@ -1,17 +1,18 @@
 Name:    ipod-sharp
 Version: 0.5.15
-Release: 2
+Release: 3%{?dist}
 Summary: Support for high level features of Apple's iPod
 
 Group:   Development/Libraries
 License: LGPL
 URL:     http://banshee-project.org/Subprojects/Ipod-sharp
 Source0: http://banshee-project.org/files/ipod-sharp/%{name}-%{version}.tar.gz
+Patch0:  ipod-sharp-0.5.15-monodir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libipoddevice-devel
 BuildRequires: mono-devel
-BuildRequires: gtk-sharp2
+BuildRequires: gtk-sharp2-devel
 
 %description
 ipod-sharp provies support for high level features of Apple's iPod,
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .monodir
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -30,7 +32,8 @@
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-make install DESTDIR=${RPM_BUILD_ROOT} GACUTIL_FLAGS="/package ipod-sharp /gacdir %{_prefix}/lib /root ${RPM_BUILD_ROOT}%{_prefix}/lib"
+make install DESTDIR=${RPM_BUILD_ROOT} \
+             GACUTIL_FLAGS="/package %{name} /gacdir %{_libdir} /root ${RPM_BUILD_ROOT}%{_libdir}"
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -40,11 +43,14 @@
 %doc COPYING
 %{_libdir}/pkgconfig/ipod-sharp.pc
 %{_libdir}/pkgconfig/ipod-sharp-ui.pc
-%dir %{_prefix}/lib/ipod-sharp
-%{_prefix}/lib/ipod-sharp/ipod-sharp.dll
-%{_prefix}/lib/ipod-sharp/ipod-sharp-ui.dll
+%dir %{_libdir}/ipod-sharp
+%{_libdir}/ipod-sharp/ipod-sharp.dll
+%{_libdir}/ipod-sharp/ipod-sharp-ui.dll
 
 %changelog
+* Mon Aug 28 2006 Christopher Aillon <caillon at redhat.com> 0.5.15-3
+- Rebuild against newer mono stack
+
 * Fri Mar  3 2006 Christopher Aillon <caillon at redhat.com> 0.5.15-2
 - Build on 64bit platforms