rpms/ipod-sharp/devel ipod-sharp-0.8.0-libdir.patch, NONE, 1.1 ipod-sharp.spec, 1.12, 1.13 ipod-sharp-0.6.2-monodir.patch, 1.1, NONE

Wed Feb 20 21:24:35 UTC 2008

Author: dnielsen

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

Modified Files:
	ipod-sharp.spec 
Added Files:
	ipod-sharp-0.8.0-libdir.patch 
Removed Files:
	ipod-sharp-0.6.2-monodir.patch 
Log Message:
Fix build and other assorted fixes


ipod-sharp-0.8.0-libdir.patch:

--- NEW FILE ipod-sharp-0.8.0-libdir.patch ---
diff -uarN ipod-sharp-0.8.0.orig/ipod-sharp.pc.in ipod-sharp-0.8.0/ipod-sharp.pc.in
--- ipod-sharp-0.8.0.orig/ipod-sharp.pc.in	2007-09-17 13:57:21.000000000 +0200
+++ ipod-sharp-0.8.0/ipod-sharp.pc.in	2008-02-01 09:14:38.000000000 +0100
@@ -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
diff -uarN ipod-sharp-0.8.0.orig/ipod-sharp-ui.pc.in ipod-sharp-0.8.0/ipod-sharp-ui.pc.in
--- ipod-sharp-0.8.0.orig/ipod-sharp-ui.pc.in	2007-09-17 13:57:21.000000000 +0200
+++ ipod-sharp-0.8.0/ipod-sharp-ui.pc.in	2008-02-01 09:14:50.000000000 +0100
@@ -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
diff -uarN ipod-sharp-0.8.0.orig/src/Firmware/Makefile.am ipod-sharp-0.8.0/src/Firmware/Makefile.am
--- ipod-sharp-0.8.0.orig/src/Firmware/Makefile.am	2007-10-12 18:13:35.000000000 +0200
+++ ipod-sharp-0.8.0/src/Firmware/Makefile.am	2008-02-01 09:17:00.000000000 +0100
@@ -1,7 +1,7 @@
 MCS_FLAGS = -debug
 ASSEMBLY = ipod-sharp-firmware.dll
 
-ipoddir = $(prefix)/lib/ipod-sharp
+ipoddir = $(libdir)/ipod-sharp
 ipod_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
 
 ASSEMBLY_SOURCES = \
diff -uarN ipod-sharp-0.8.0.orig/src/Firmware/Makefile.in ipod-sharp-0.8.0/src/Firmware/Makefile.in
--- ipod-sharp-0.8.0.orig/src/Firmware/Makefile.in	2007-12-19 00:34:46.000000000 +0100
+++ ipod-sharp-0.8.0/src/Firmware/Makefile.in	2008-02-01 09:16:47.000000000 +0100
@@ -150,7 +150,7 @@
 top_srcdir = @top_srcdir@
 MCS_FLAGS = -debug
 ASSEMBLY = ipod-sharp-firmware.dll
-ipoddir = $(prefix)/lib/ipod-sharp
+ipoddir = $(libdir)/ipod-sharp
 ipod_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
 ASSEMBLY_SOURCES = \
 	$(srcdir)/DmgImage.cs \
diff -uarN ipod-sharp-0.8.0.orig/src/Makefile.am ipod-sharp-0.8.0/src/Makefile.am
--- ipod-sharp-0.8.0.orig/src/Makefile.am	2007-10-12 18:13:35.000000000 +0200
+++ ipod-sharp-0.8.0/src/Makefile.am	2008-02-01 09:17:19.000000000 +0100
@@ -4,7 +4,7 @@
 
 ASSEMBLY = ipod-sharp.dll
 
-ipoddir = $(prefix)/lib/ipod-sharp
+ipoddir = $(libdir)/ipod-sharp
 ipod_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
 
 ASSEMBLY_SOURCES =			\
diff -uarN ipod-sharp-0.8.0.orig/src/Makefile.in ipod-sharp-0.8.0/src/Makefile.in
--- ipod-sharp-0.8.0.orig/src/Makefile.in	2007-12-19 00:34:46.000000000 +0100
+++ ipod-sharp-0.8.0/src/Makefile.in	2008-02-01 09:16:24.000000000 +0100
@@ -163,7 +163,7 @@
 SUBDIRS = Firmware
 MCS_FLAGS = -debug
 ASSEMBLY = ipod-sharp.dll
-ipoddir = $(prefix)/lib/ipod-sharp
+ipoddir = $(libdir)/ipod-sharp
 ipod_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
 ASSEMBLY_SOURCES = \
 	$(srcdir)/Album.cs	\
diff -uarN ipod-sharp-0.8.0.orig/ui/Makefile.am ipod-sharp-0.8.0/ui/Makefile.am
--- ipod-sharp-0.8.0.orig/ui/Makefile.am	2007-10-17 23:27:20.000000000 +0200
+++ ipod-sharp-0.8.0/ui/Makefile.am	2008-02-01 09:15:55.000000000 +0100
@@ -3,7 +3,7 @@
 
 ASSEMBLY = ipod-sharp-ui.dll
 
-ipodsharpdir = $(prefix)/lib/ipod-sharp
+ipodsharpdir = $(libdir)/ipod-sharp
 ipodsharp_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
 
 ASSEMBLY_SOURCES =			\
diff -uarN ipod-sharp-0.8.0.orig/ui/Makefile.in ipod-sharp-0.8.0/ui/Makefile.in
--- ipod-sharp-0.8.0.orig/ui/Makefile.in	2007-12-19 00:34:46.000000000 +0100
+++ ipod-sharp-0.8.0/ui/Makefile.in	2008-02-01 09:15:41.000000000 +0100
@@ -150,7 +150,7 @@
 top_srcdir = @top_srcdir@
 MCS_FLAGS = -debug
 ASSEMBLY = ipod-sharp-ui.dll
-ipodsharpdir = $(prefix)/lib/ipod-sharp
+ipodsharpdir = $(libdir)/ipod-sharp
 ipodsharp_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
 ASSEMBLY_SOURCES = \
 	$(srcdir)/AssemblyInfo.cs	\


Index: ipod-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipod-sharp/devel/ipod-sharp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ipod-sharp.spec	18 Feb 2008 22:15:26 -0000	1.12
+++ ipod-sharp.spec	20 Feb 2008 21:23:42 -0000	1.13
@@ -1,13 +1,13 @@
 Name:    ipod-sharp
 Version: 0.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Support for high level features of Apple's iPod
 
 Group:   Development/Libraries
 License: LGPLv2+
 URL:     http://banshee-project.org/Subprojects/Ipod-sharp
 Source0: http://banshee-project.org/files/ipod-sharp/%{name}-%{version}.tar.gz
-Patch0:  ipod-sharp-0.6.2-monodir.patch
+Patch0:  ipod-sharp-0.8.0-libdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -16,20 +16,32 @@
 BuildRequires: podsleuth-devel
 BuildRequires: mono-devel
 BuildRequires: gtk-sharp2-devel
+BuildRequires: libipoddevice-devel
+BuildRequires: ndesk-dbus-devel
 
 %description
 ipod-sharp provies support for high level features of Apple's iPod,
 like support for audio content, including reading and writing of the
 iTunes/iPod database, and syncing music.
 
+%package devel
+Summary: Development files for ipod-sharp
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} 
+Requires: pkgconfig
+
+%description devel
+Development files for ipod-sharp
+
 %prep
 %setup -q
-%patch0 -p1 -b .monodir
+%patch0 -p1 -b .libdir
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure --disable-docs
-make %{?_smp_mflags}
+# Breaks with smp make flag
+make
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -43,14 +55,20 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING
-%{_libdir}/pkgconfig/ipod-sharp.pc
-%{_libdir}/pkgconfig/ipod-sharp-ui.pc
-%dir %{_libdir}/ipod-sharp
-%{_libdir}/ipod-sharp/ipod-sharp.dll
-%{_libdir}/ipod-sharp/ipod-sharp-ui.dll
-%{_libdir}/ipod-sharp/ipod-sharp-firmware.dll
+%{_libdir}/ipod-sharp/
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/
+
 
 %changelog
+* Wed Feb 20 2008 David Nielsen <david at lovesunix.net> 0.8.0-3
+- Add libipoddevice and ndesk-dbus to build dependencies
+- Update libdir patch
+- make singlethreaded to avoid build error
+- split out development files
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.8.0-2
 - Autorebuild for GCC 4.3
 


--- ipod-sharp-0.6.2-monodir.patch DELETED ---


