From 084266ec1bb314b35c439cbdd06ec29727ffc43a Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mar 26 2013 09:38:41 +0000 Subject: Add a couple of patches --- diff --git a/meanwhile-file-transfer.patch b/meanwhile-file-transfer.patch new file mode 100644 index 0000000..8300484 --- /dev/null +++ b/meanwhile-file-transfer.patch @@ -0,0 +1,21 @@ +# User Mikael Berthe +# Date 1194544713 -3600 +Fix file transfers with recent Sametime servers + +It seems that the last guint32_get() fails when Meanwhile receives +the FT offer. +I think we can skip it -- works for me but I can't check it with an +older server. + +diff -r 4aabc56c0e5f src/srvc_ft.c +--- a/src/srvc_ft.c Tue Nov 06 11:46:26 2007 +0100 ++++ b/src/srvc_ft.c Thu Nov 08 18:58:33 2007 +0100 +@@ -142,7 +142,7 @@ static void recv_channelCreate(struct mw + mwString_get(b, &fnm); /* offered filename */ + mwString_get(b, &txt); /* offering message */ + guint32_get(b, &size); /* size of offered file */ +- guint32_get(b, &junk); /* unknown */ ++ /* guint32_get(b, &junk); */ /* unknown */ + /* and we just skip an unknown guint16 at the end */ + + b_err = mwGetBuffer_error(b); diff --git a/meanwhile-status-timestamp-workaround.patch b/meanwhile-status-timestamp-workaround.patch new file mode 100644 index 0000000..397d1fa --- /dev/null +++ b/meanwhile-status-timestamp-workaround.patch @@ -0,0 +1,21 @@ +# User Mikael Berthe +# Date 1195749751 -3600 +Fix Awareness status timestamps with recent Sametime clients + +For some reason the status timestamps I receive from people with a recent +Sametime client make no sense. This patch simply sets the timestamp to 0, +as I have no idea how to interpret these time values. + +diff -r 17977a4e7da1 -r e7601af90b31 src/common.c +--- a/src/common.c Thu Nov 08 18:58:33 2007 +0100 ++++ b/src/common.c Thu Nov 22 17:42:31 2007 +0100 +@@ -688,6 +688,9 @@ void mwUserStatus_get(struct mwGetBuffer + guint16_get(b, &stat->status); + guint32_get(b, &stat->time); + mwString_get(b, &stat->desc); ++ ++ // Quick'n ugly hack for recent Sametime clients ++ stat->time = 0; + } + + diff --git a/meanwhile.spec b/meanwhile.spec index 704f311..591c046 100644 --- a/meanwhile.spec +++ b/meanwhile.spec @@ -1,75 +1,77 @@ -# -# spec file for meanwhile - sametime client library -# - -Name: meanwhile -Summary: Lotus Sametime Community Client library -License: LGPLv2+ -Group: Applications/Internet -Version: 1.1.0 -Release: 8%{?dist} -# The source for this package was pulled from upstream's vcs. Use the -# following commands to generate the tarball: -# cvs -d:pserver:anonymous@meanwhile.cvs.sourceforge.net:/cvsroot/meanwhile login +Name: meanwhile +Version: 1.1.0 +Release: 9%{?dist} +Summary: Lotus Sametime Community Client library +Group: Applications/Internet +License: LGPLv2+ +URL: http://%{name}.sourceforge.net + +# The source for this package was pulled from upstream's vcs. Use the following +# commands to generate the tarball: +# cvs -d:pserver:anonymous@%{name}.cvs.sourceforge.net:/cvsroot/%{name} login # [hit return for the password] -# cvs -d:pserver:anonymous@meanwhile.cvs.sourceforge.net:/cvsroot/meanwhile co -d meanwhile-1.1.0 -r meanwhile_v1_1_0 meanwhile -# cd meanwhile-1.1.0 +# cvs -d:pserver:anonymous@%{name}.cvs.sourceforge.net:/cvsroot/%{name} co -d %{name}-1.1.0 -r %{name}_v1_1_0 %{name} +# cd %{name}-1.1.0 # ./autogen.sh # make dist -Source: meanwhile-%{version}.tar.gz -Patch0: meanwhile-crash.patch -Patch1: meanwhile-fix-glib-headers.patch -URL: http://meanwhile.sourceforge.net -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glib2-devel, doxygen +Source: %{name}-%{version}.tar.gz +Patch0: %{name}-crash.patch +Patch1: %{name}-fix-glib-headers.patch +Patch2: %{name}-file-transfer.patch +Patch3: %{name}-status-timestamp-workaround.patch +Patch4: %{name}-presence.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: glib2-devel +BuildRequires: doxygen %description -The heart of the Meanwhile Project is the Meanwhile library, providing the -basic Lotus Sametime session functionality along with the core services; -Presence Awareness, Instant Messaging, Multi-user Conferencing, Preferences -Storage, Identity Resolution, and File Transfer. This extensible client -interface allows additional services to be added to a session at runtime, -allowing for simple integration of future service handlers such as the user -directory and whiteboard and screen-sharing. +The heart of the %{name} Project is the %{name} library, providing the basic +Lotus Sametime session functionality along with the core services; Presence +Awareness, Instant Messaging, Multi-user Conferencing, Preferences Storage, +Identity Resolution, and File Transfer. %package devel -Summary: Header files, libraries and development documentation for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: glib2-devel +Summary: Header files, libraries and development documentation for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: glib2-devel %description devel This package contains the header files, static libraries and development -documentation for %{name}. If you like to develop programs using %{name}, -you will need to install %{name}-devel. +documentation for %{name}. If you like to develop programs using %{name}, you +will need to install %{name}-devel. %package doc -Summary: Documentation for the Meanwhile library -Group: Applications/Internet -License: GFDL +Summary: Documentation for the %{name} library +Group: Applications/Internet +License: GFDL %description doc -Documentation for the Meanwhile library +Documentation for the %{name} library. %prep %setup -q -%patch0 -p0 -%patch1 -p1 +%patch0 -p0 -b .crash +%patch1 -p1 -b .fix-glib-headers +%patch2 -p1 -b .file-transfer +%patch3 -p1 -b .status-timestamp-workaround %build %configure --enable-doxygen make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -%{makeinstall} +rm -rf %{buildroot} +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # Remove the latex documentation. Nobody reads it, it installs a font for # some unknown reason, and people have to build it themselves. Dumb. -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-doc-%{version}/latex -rm -rf $RPM_BUILD_ROOT%{_libdir}/libmeanwhile.a +rm -rf %{buildroot}%{_datadir}/doc/%{name}-doc-%{version}/latex \ + %{buildroot}%{_libdir}/lib%{name}.a \ + %{buildroot}%{_libdir}/lib%{name}.la %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -77,21 +79,25 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root, -) -%doc AUTHORS ChangeLog COPYING README TODO INSTALL LICENSE NEWS -%{_libdir}/libmeanwhile.so.* +%doc AUTHORS ChangeLog COPYING README TODO LICENSE NEWS +%{_libdir}/lib%{name}.so.* %files devel %defattr(-, root, root, -) -%{_includedir}/meanwhile/ -%exclude %{_libdir}/libmeanwhile.la -%{_libdir}/libmeanwhile.so -%{_libdir}/pkgconfig/meanwhile.pc +%{_includedir}/%{name}/ +%{_libdir}/lib%{name}.so +%{_libdir}/pkgconfig/%{name}.pc %files doc %defattr(-, root, root, -) %{_datadir}/doc/%{name}-doc-%{version}/ %changelog +* Tue Mar 26 2013 Simone Caronni - 1.1.0-9 +- Added patches for file transfer and status time workaround: + http://www.lilotux.net/~mikael/pub/meanwhile/ +- Spec file formatting. + * Thu Feb 14 2013 Fedora Release Engineering - 1.1.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -108,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild * Fri Jan 29 2010 Josh Boyer - 1.1.0-4 -- Remove libmeanwhile.a (#556084) +- Remove lib%{name}.a (#556084) * Tue Jan 12 2010 Dan Winship - 1.1.0-3 - Fix Source tag to indicate a CVS snapshot build. @@ -118,59 +124,4 @@ rm -rf $RPM_BUILD_ROOT - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Fri Mar 13 2009 Josh Boyer - 1.1.0-1 -- Update to meanwhile_v1_1_0 branch from upstream CVS. Fixes bug 490088 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.0.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 18 2009 Josh Boyer - 1.0.2-9 -- Kill the latex stuff from the doc subpackage - -* Thu Aug 28 2008 Josh Boyer - 1.0.2-8 -- Add patch to fix crash when server removes contact list - -* Thu Aug 7 2008 Tom "spot" Callaway - 1.0.2-7 -- fix license tag - -* Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-6 -- Autorebuild for GCC 4.3 - -* Fri Aug 03 2007 - jwboyer@jdub.homelinux.org 1.0.2-5 -- Update license field - -* Fri May 4 2007 - jwboyer@jdub.homelinux.org 1.0.2-4 -- Rebuild for F7 to pick up ppc64 - -* Sun Aug 27 2006 - jwboyer@jdub.homelinux.org 1.0.2-3 -- Bump for FE6 rebuild - -* Tue Feb 14 2006 - jwboyer@jdub.homelinux.org 1.0.2-2 -- Bump for FE5 rebuild - -* Tue Jan 3 2006 - jwboyer@jdub.homelinux.org 1.0.2-1 -- Update to latest release -- Fixes crash when merging buddy list with server - -* Fri Dec 16 2005 - jwboyer@jdub.homelinux.org 1.0.1-1 -- Update to latest release -- Fixes mpi conflict with mozilla-nss - -* Wed Dec 14 2005 - jwboyer@jdub.homelinux.org 1.0.0-1 -- Update to latest release -- gmp and gmp-devel are no longer required since meanwhile uses mpi now - -* Sat Oct 29 2005 - jwboyer@jdub.homelinux.org 0.5.0-1 -- Update to latest release - -* Wed Jun 15 2005 - jwboyer@jdub.homelinux.org 0.4.2-2 -- Bump release for rebuild against latest development - -* Tue May 31 2005 - jwboyer@jdub.homelinux.org 0.4.2-1 -- Update to latest version -- Fix typo in last changelog - -* Tue May 24 2005 - jwboyer@jdub.homelinux.org 0.4.1-2 -- Updates from review comments - -* Mon May 23 2005 - jwboyer@jdub.homelinux.org 0.4.1-1 -- Initial package, adapted from spec file by Dag Wieers +- Update to %{name}_v1_1_0 branch from upstream CVS. Fixes bug 490088