packages: mulberry/Linux-Make.header-patch.diff (NEW), mulberry/jxinit-patc...

[glen]

Author: glen                         Date: Wed Sep 22 20:47:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- initial, but nothing functional yet

---- Files affected:
packages/mulberry:
   Linux-Make.header-patch.diff (NONE -> 1.1)  (NEW), jxinit-patch.diff (NONE -> 1.1)  (NEW), mulberry.spec (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mulberry/Linux-Make.header-patch.diff
diff -u /dev/null packages/mulberry/Linux-Make.header-patch.diff:1.1
--- /dev/null	Wed Sep 22 22:47:54 2010
+++ packages/mulberry/Linux-Make.header-patch.diff	Wed Sep 22 22:47:49 2010
@@ -0,0 +1,16 @@
+Index: Linux/Make.header
+===================================================================
+--- Linux/Make.header	(revision 105)
++++ Linux/Make.header	(working copy)
+@@ -88,8 +88,8 @@
+ 			${LINK_STATIC} \
+ 				-ljx-${JX_LIB_VERSION} \
+ 				-ljcore-${JX_LIB_VERSION} \
++			${LINK_DYNAMIC} \
+ 				-lACE-${ACE_LIB_VERSION} \
+-			${LINK_DYNAMIC} \
+ 			${J_X11_LIBS} \
+ 			-lldap -llber \
+ 			${LINK_STATIC} \
+
+]

================================================================
Index: packages/mulberry/jxinit-patch.diff
diff -u /dev/null packages/mulberry/jxinit-patch.diff:1.1
--- /dev/null	Wed Sep 22 22:47:54 2010
+++ packages/mulberry/jxinit-patch.diff	Wed Sep 22 22:47:49 2010
@@ -0,0 +1,34 @@
+Index: trunk/Makefile-Linux
+===================================================================
+--- trunk/Makefile-Linux	(revision 105)
++++ trunk/Makefile-Linux	(working copy)
+@@ -21,18 +21,18 @@
+ 
+ jxinit:
+ 	(cd ${JX_HOME}/include; \
+-	 ln -s ../libjcore/code jcore; \
+-	 ln -s ../libjx/code jx; \
+-	 ln -s ../libjx/image jximage; \
+-	 ln -s ../libjx/strings jxstrings)
++	 ln -sf ../libjcore/code jcore; \
++	 ln -sf ../libjx/code jx; \
++	 ln -sf ../libjx/image jximage; \
++	 ln -sf ../libjx/strings jxstrings)
+ 	(cd ${JX_HOME}/lib; \
+-	 ln -s ../ACE/ACE_wrappers/ace/libACE.a libACE-5_4_7.a; \
+-	 ln -s ../ACE/ACE_wrappers/ace/libACE.so libACE-5_4_7.so; \
+-	 ln -s ../ACE/ACE_wrappers/ace/libACE.so.5.4.7 libACE.so.5.4.7; \
+-	 ln -s ../libjcore/libjcore-2_5_0.a libjcore-2_5_0.a; \
+-	 ln -s ../libjcore/libjcore-2_5_0.so libjcore-2_5_0.so; \
+-	 ln -s ../libjx/libjx-2_5_0.a libjx-2_5_0.a; \
+-	 ln -s ../libjx/libjx-2_5_0.so libjx-2_5_0.so)
++	 ln -sf ../ACE/ACE_wrappers/ace/libACE.a libACE-5_4_7.a; \
++	 ln -sf ../ACE/ACE_wrappers/ace/libACE.so libACE-5_4_7.so; \
++	 ln -sf ../ACE/ACE_wrappers/ace/libACE.so.5.4.7 libACE.so.5.4.7; \
++	 ln -sf ../libjcore/libjcore-2_5_0.a libjcore-2_5_0.a; \
++	 ln -sf ../libjcore/libjcore-2_5_0.so libjcore-2_5_0.so; \
++	 ln -sf ../libjx/libjx-2_5_0.a libjx-2_5_0.a; \
++	 ln -sf ../libjx/libjx-2_5_0.so libjx-2_5_0.so)
+ 	touch ${JX_HOME}/ACE/ACE_wrappers/ace/Svc_Conf_l.cpp
+ 
+ mulberryinit:

================================================================
Index: packages/mulberry/mulberry.spec
diff -u /dev/null packages/mulberry/mulberry.spec:1.1
--- /dev/null	Wed Sep 22 22:47:54 2010
+++ packages/mulberry/mulberry.spec	Wed Sep 22 22:47:49 2010
@@ -0,0 +1,61 @@
+# $Revision$, $Date$
+%define		svnrev	354
+%define		rel		1
+Summary:	Mulberry email and calendar client
+Name:		mulberry
+Version:	4.0.8
+Release:	0.%{svnrev}.%{rel}
+License:	Apache v2.0
+Group:		Applications
+# svn co http://svn.mulberrymail.com/mulberry/Mulberry/trunk mulberry
+# tar -cjf mulberry-$(svnversion mulberry).tar.bz2 --exclude-vcs mulberry
+# ../dropin mulberry-$(svnversion mulberry).tar.bz2
+Source0:	%{name}-%{svnrev}.tar.bz2
+# Source0-md5:	a0dcb50b1f35c54a209ae7456097b24d
+Patch0:		jxinit-patch.diff
+Patch1:		Linux-Make.header-patch.diff
+URL:		http://www.mulberrymail.com/
+BuildRequires:	aspell-devel
+BuildRequires:	esound-devel
+BuildRequires:	flex
+BuildRequires:	freetype-devel
+BuildRequires:	libstdc++-devel
+BuildRequires:	openldap-devel
+BuildRequires:	openssl-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Mulberry email and calendar client.
+
+%prep
+%setup -qn %{name}
+%patch0 -p1
+%patch1 -p0
+
+%build
+%{__make} -f Makefile-Linux jxinit
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc TODO
+
+%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1  2010/09/22 20:47:49  glen
+- initial, but nothing functional yet
================================================================