rpms/evolution-sharp/devel evolution-sharp-0.11.1-libdir.patch, 1.2, 1.3 evolution-sharp-0.12.1-fix-assembly-dir.patch, 1.2, 1.3 .cvsignore, 1.17, 1.18 evolution-sharp.spec, 1.47, 1.48 sources, 1.17, 1.18

[Matthew Barnes (mbarnes)]

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-sharp.spec sources 
Added Files:
	evolution-sharp-0.11.1-libdir.patch 
	evolution-sharp-0.12.1-fix-assembly-dir.patch 
Log Message:

* Tue Apr 08 2008 Matthew Barnes <mbarnes at redhat.com> - 0.16.1-1.fc9
- Restore patches for RH bug #221555 and GNOME bug #516044.  Upstream
  accepted and then rejected the patches because upstream does multilib
  differently and they don't have a seperate directory configure option
  for Mono assemblies (I suggested --monodir=DIR but no one seemed
  interested).


evolution-sharp-0.11.1-libdir.patch:

Index: evolution-sharp-0.11.1-libdir.patch
===================================================================
RCS file: evolution-sharp-0.11.1-libdir.patch
diff -N evolution-sharp-0.11.1-libdir.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ evolution-sharp-0.11.1-libdir.patch	8 Apr 2008 12:41:58 -0000	1.3
@@ -0,0 +1,9 @@
+--- evolution-sharp-0.11.1/evolution-sharp.pc.in.libdir	2006-08-18 16:10:58.000000000 +0200
++++ evolution-sharp-0.11.1/evolution-sharp.pc.in	2006-08-18 16:11:12.000000000 +0200
+@@ -1,5 +1,5 @@
+ prefix=@prefix@
+-libdir=${prefix}/lib
++libdir=@libdir@
+ 
+ evolibdir=@EVO_SHELL_LIBDIR@
+ 

evolution-sharp-0.12.1-fix-assembly-dir.patch:

Index: evolution-sharp-0.12.1-fix-assembly-dir.patch
===================================================================
RCS file: evolution-sharp-0.12.1-fix-assembly-dir.patch
diff -N evolution-sharp-0.12.1-fix-assembly-dir.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ evolution-sharp-0.12.1-fix-assembly-dir.patch	8 Apr 2008 12:41:58 -0000	1.3
@@ -0,0 +1,21 @@
+--- evolution-sharp-0.12.1/evolution/Makefile.am.fix-assembly-dir	2007-01-03 12:12:08.000000000 -0500
++++ evolution-sharp-0.12.1/evolution/Makefile.am	2007-01-05 10:01:22.000000000 -0500
+@@ -74,14 +74,14 @@
+ 
+ install-data-local:
+ 	@if test -n '$(TARGET)'; then									\
+-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib";		\
+-	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1;		\
++	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";		\
++	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;		\
+ 	fi
+ 
+ uninstall-local:
+ 	@if test -n '$(TARGET)'; then									\
+-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib";		\
+-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1;	\
++	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";		\
++	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+ 	fi
+ 
+ evolution-sharp.pub: $(top_srcdir)/evolution-sharp.pub


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Mar 2008 17:11:06 -0000	1.17
+++ .cvsignore	8 Apr 2008 12:41:58 -0000	1.18
@@ -1 +1 @@
-evolution-sharp-0.16.0.tar.bz2
+evolution-sharp-0.16.1.tar.bz2


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- evolution-sharp.spec	10 Mar 2008 17:11:06 -0000	1.47
+++ evolution-sharp.spec	8 Apr 2008 12:41:58 -0000	1.48
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: evolution-sharp
-Version: 0.16.0
+Version: 0.16.1
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -13,6 +13,14 @@
 # Mono only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
+### Patches ###
+
+# GNOME bug #516044
+Patch1: evolution-sharp-0.11.1-libdir.patch
+
+# RH bug #221555 / GNOME bug #516044
+Patch2: evolution-sharp-0.12.1-fix-assembly-dir.patch
+
 ### Dependencies ###
 
 Requires: evolution-data-server
@@ -40,6 +48,8 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .libdir
+%patch2 -p1 -b .fix-assembly-dir
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -76,6 +86,13 @@
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Tue Apr 08 2008 Matthew Barnes <mbarnes at redhat.com> - 0.16.1-1.fc9
+- Restore patches for RH bug #221555 and GNOME bug #516044.  Upstream
+  accepted and then rejected the patches because upstream does multilib
+  differently and they don't have a seperate directory configure option
+  for Mono assemblies (I suggested --monodir=DIR but no one seemed
+  interested).
+
 * Mon Mar 10 2008 Matthew Barnes <mbarnes at redhat.com> - 0.16.0-1.fc9
 - Update to 0.16.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Mar 2008 17:11:06 -0000	1.17
+++ sources	8 Apr 2008 12:41:58 -0000	1.18
@@ -1 +1 @@
-866d3bca8a7e564035f42fc7f9096fe2  evolution-sharp-0.16.0.tar.bz2
+1f7ba3c3f99c17458af98c2c207001fd  evolution-sharp-0.16.1.tar.bz2