Author: qboosh Date: Wed Jan 11 16:11:26 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.6.4
- package gmime-{uudecode,uuencode} (conflicting tools renamed upstream)
- added mono patch to restore prefix/lib install dir for mono files
---- Files affected:
packages/gmime:
gmime.spec (1.96 -> 1.97) , gmime-mono.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/gmime/gmime.spec
diff -u packages/gmime/gmime.spec:1.96 packages/gmime/gmime.spec:1.97
--- packages/gmime/gmime.spec:1.96 Tue Dec 27 08:52:05 2011
+++ packages/gmime/gmime.spec Wed Jan 11 17:11:20 2012
@@ -10,13 +10,14 @@
Summary: GMIME library
Summary(pl.UTF-8): Biblioteka GMIME
Name: gmime
-Version: 2.6.3
+Version: 2.6.4
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gmime/2.6/%{name}-%{version}.tar.xz
-# Source0-md5: db9d8e40c2b3f969aca28f56c4ea1803
+# Source0-md5: fc76389af2ddc82ee69154c6a6efd536
Patch0: %{name}-link.patch
+Patch1: %{name}-mono.patch
URL: http://spruce.sourceforge.net/gmime/
BuildRequires: autoconf >= 2.54
BuildRequires: automake >= 1:1.9
@@ -111,6 +112,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -132,8 +134,6 @@
DESTDIR=$RPM_BUILD_ROOT \
HTML_DIR=%{_gtkdocdir}
-# packaged in sharutils
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/uu{de,en}code
# obsoleted by pkg-config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgmime-2.6.la
@@ -146,6 +146,8 @@
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README TODO
+%attr(755,root,root) %{_bindir}/gmime-uudecode
+%attr(755,root,root) %{_bindir}/gmime-uuencode
%attr(755,root,root) %{_libdir}/libgmime-2.6.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgmime-2.6.so.0
@@ -181,6 +183,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.97 2012/01/11 16:11:20 qboosh
+- updated to 2.6.4
+- package gmime-{uudecode,uuencode} (conflicting tools renamed upstream)
+- added mono patch to restore prefix/lib install dir for mono files
+
Revision 1.96 2011/12/27 07:52:05 qboosh
- updated to 2.6.3
================================================================
Index: packages/gmime/gmime-mono.patch
diff -u /dev/null packages/gmime/gmime-mono.patch:1.3
--- /dev/null Wed Jan 11 17:11:26 2012
+++ packages/gmime/gmime-mono.patch Wed Jan 11 17:11:20 2012
@@ -0,0 +1,27 @@
+--- gmime-2.6.4/mono/gmime-sharp.pc.in.orig 2012-01-08 17:07:59.000000000
+0100
++++ gmime-2.6.4/mono/gmime-sharp.pc.in 2012-01-11 17:00:21.702203948 +0100
+@@ -1,5 +1,5 @@
+ exec_prefix=@prefix@
+-libdir=@libdir@
++libdir=@prefix@/lib
+
+ Name: gmime-sharp
+ Version: @VERSION@
+--- gmime-2.6.4/mono/Makefile.am.orig 2012-01-08 17:07:59.000000000 +0100
++++ gmime-2.6.4/mono/Makefile.am 2012-01-11 17:02:20.072207912 +0100
+@@ -84,11 +84,11 @@
+ install-data-hook:
+ @if test -n '$(TARGET)'; then
\
+ if test -n '$(DESTDIR)'; then
\
+- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root
$(DESTDIR)$(libdir)"; \
+- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root
$(DESTDIR)$(libdir) || exit 1; \
++ 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; \
+ else
\
+- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP)
/gacdir $(libdir)"; \
+- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir
$(libdir) || exit 1; \
++ echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP)
/gacdir $(prefix)/lib"; \
++ $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir
$(prefix)/lib || exit 1; \
+ fi;
\
+ fi
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gmime/gmime.spec?r1=1.96&r2=1.97&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gmime/gmime-mono.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
