From 0a2b7ccbc590f62d2a79cceeaf98d55a3c87fc99 Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr@fedoraproject.org>
Date: Dec 01 2011 23:15:35 +0000
Subject: Change paths for mono assemblies according to updated packaging

guidelines (http://fedoraproject.org/wiki/Packaging:Mono)

---

diff --git a/gmime.spec b/gmime.spec
index 2211144..d89a96a 100644
--- a/gmime.spec
+++ b/gmime.spec
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -17,7 +17,6 @@ BuildRequires:  zlib-devel >= 1.2.1.1
 BuildRequires:  gettext-devel, gtk-doc
 BuildRequires:  automake autoconf
 
-Patch2: libdir.patch
 Patch3: gmime-2.5.8-gpg-error.patch
 
 # mono available only on selected architectures
@@ -66,7 +65,6 @@ for developing mono applications that use libgmime.
 
 %prep
 %setup -q
-%patch2 -p1 -b .libdir
 %patch3 -p1 -b .gpg-error
 
 %build
@@ -127,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Dec 02 2011 Christian Krause <chkr@fedoraproject.org> - 2.6.1-2
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Tue Nov 22 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.6.1-1
 - Update to 2.6.1
 
diff --git a/libdir.patch b/libdir.patch
deleted file mode 100644
index 3243979..0000000
--- a/libdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -up gmime-2.4.7/mono/gmime-sharp.pc.in.libdir gmime-2.4.7/mono/gmime-sharp.pc.in
---- gmime-2.4.7/mono/gmime-sharp.pc.in.libdir	2009-04-23 22:04:47.000000000 -0400
-+++ gmime-2.4.7/mono/gmime-sharp.pc.in	2009-07-18 22:19:43.355545728 -0400
-@@ -1,5 +1,5 @@
- prefix=@prefix@
--libdir=${prefix}/lib
-+libdir=@libdir@
- 
- Name: gmime-sharp 
- Version: @VERSION@
-diff -up gmime-2.4.7/mono/Makefile.in.libdir gmime-2.4.7/mono/Makefile.in
---- gmime-2.4.7/mono/Makefile.in.libdir	2009-04-27 10:52:06.000000000 -0400
-+++ gmime-2.4.7/mono/Makefile.in	2009-07-18 22:23:46.048524443 -0400
-@@ -476,22 +476,22 @@ $(ASSEMBLY): $(build_sources) generated-
- install-data-hook:
- 	@if test -n '$(TARGET)'; then									\
- 	  if test -n '$(DESTDIR)'; then								\
--	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib";		\
--	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib || exit 1;	\
-+	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)";		\
-+	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1;	\
- 	  else												\
--	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib";			\
--	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib || exit 1;		\
-+	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir)";			\
-+	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1;		\
- 	  fi;												\
- 	fi
- 
- uninstall-local:
- 	@if test -n '$(TARGET)'; then									\
- 	  if test -n '$(DESTDIR)'; then								\
--	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib";	\
--	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib || exit 1;  \
-+	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)";	\
-+	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1;  \
- 	  else												\
--	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib";	\
--	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib || exit 1;	\
-+	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir)";	\
-+	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1;	\
- 	  fi;												\
- 	fi
-