Hello community, here is the log from the commit of package irc-otr for openSUSE:Factory checked in at 2014-09-04 07:56:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irc-otr (Old) and /work/SRC/openSUSE:Factory/.irc-otr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "irc-otr" Changes: -------- --- /work/SRC/openSUSE:Factory/irc-otr/irc-otr.changes 2012-11-18 20:25:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.irc-otr.new/irc-otr.changes 2014-09-04 07:56:27.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Sep 3 22:32:04 UTC 2014 - [email protected] + +- irssi-otr 1.0.0: + * Add /otr info command + * Support split OTR message on receive. Bitlbee support. +- Built against libotr 4 +- Subpackage xchat-otr is no longer included in this source project + and was split into a separate package. +- General spec file cleanup +- Removed patches: + * irc-otr-build-xchat-0.3.patch + * irssi-otr-0.3-cmake-2.8.8-bug13125-fix.patch +- add irssi-otr-1.0.0-irssi-module-dir.patch from upstream to + fix build on 64 bit + +------------------------------------------------------------------- Old: ---- irc-otr-build-xchat-0.3.patch irssi-otr-0.3-cmake-2.8.8-bug13125-fix.patch irssi-otr-0.3.tar.bz2 xchat-plugin.h New: ---- irc-otr-1.0.0.tar.gz irssi-otr-1.0.0-irssi-module-dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irc-otr.spec ++++++ --- /var/tmp/diff_new_pack.26WzYi/_old 2014-09-04 07:56:28.000000000 +0200 +++ /var/tmp/diff_new_pack.26WzYi/_new 2014-09-04 07:56:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package irc-otr # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,31 +17,26 @@ Name: irc-otr -Version: 0.3 +Version: 1.0.0 Release: 0 -Url: http://irssi-otr.tuxfamily.org/ -Summary: Off-The-Record Messaging plugin for various irc clients +Summary: Off-The-Record Messaging plugin for irssi License: GPL-2.0+ Group: Productivity/Networking/Instant Messenger -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: cmake >= 2.4.7 +#Url: http://irssi-otr.tuxfamily.org/ +Url: https://github.com/cryptodotis/irssi-otr +Source: https://github.com/cryptodotis/irssi-otr/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch1: irssi-otr-1.0.0-irssi-module-dir.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: glib2-devel >= 2.12 -BuildRequires: irssi-devel -# Package does not build against libotr 4.0.0 in factory -%if 0%{?suse_version} > 1220 -BuildRequires: libotr2-devel >= 3.1.0 -BuildConflicts: libotr-devel >= 4.0.0 -%else -BuildRequires: libotr-devel >= 3.1.0 -%endif +BuildRequires: irssi-devel >= 0.8.15 +BuildRequires: libgcrypt-devel >= 1.5.0 +BuildRequires: libotr-devel >= 4.0.0 +BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python >= 2.5 -Source0: irssi-otr-%{version}.tar.bz2 -Source1: http://www.xchat.org/docs/xchat-plugin.h -Patch0: irc-otr-build-xchat-0.3.patch -# PATCH-FIX-OPENSUSE irssi-otr-0.3-cmake-2.8.8-bug13125-fix.patch [email protected] -Patch1: irssi-otr-0.3-cmake-2.8.8-bug13125-fix.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package provides modules which implement Off-The-Record (OTR) Messaging @@ -63,10 +58,6 @@ - If you lose control of your private keys, no previous conversation is compromised. -Authors: --------- - Ulim <[email protected]> - %package -n irssi-otr Summary: Off-The-Record messaging plugin for irssi Group: Productivity/Networking/Instant Messenger @@ -94,72 +85,23 @@ - If you lose control of your private keys, no previous conversation is compromised. -Authors: --------- - Ulim <[email protected]> - -%package -n xchat-otr -Summary: Off-The-Record messaging plugin for xchat -Group: Productivity/Networking/Instant Messenger -Requires: xchat - -%description -n xchat-otr -This plugin adds Off-the-Record messaging support for the xchat IRC client. -Although primarily designed for use with the bitlbee IRC2IM gateway, it -works within any query window, provided that the conversation partner's IRC -client supports OTR. - -OTR allows you to have private conversations over IM by providing: - - - Encryption - - No one else can read your instant messages. - - Authentication - - You are assured the correspondent is who you think it is. - - Deniability - - The messages you send do _not_ have digital signatures that are - checkable by a third party. Anyone can forge messages after a - conversation to make them look like they came from you. However, - _during_ a conversation, your correspondent is assured the messages - he sees are authentic and unmodified. - - Perfect forward secrecy - - If you lose control of your private keys, no previous conversation - is compromised. - -Authors: --------- - Ulim <[email protected]> - - %prep %setup -q -n irssi-otr-%{version} -%patch0 -p0 -%patch1 -p0 -mkdir xchat -%{__cp} %{SOURCE1} xchat/ -ln -s xchat/xchat-plugin.h . +%patch1 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS" -cmake -DCMAKE_INSTALL_PREFIX="%{_prefix}" -DDOCDIR="%{_docdir}/%{name}" -DLIB_SUFFIX="$(echo %_lib | cut -b4-)" . -%{__make} +./bootstrap +export CFLAGS="%{optflags}" +./configure --with-irssi-module-dir=%{_libdir}/irssi/modules +make %{?_smp_mflags} %install -%{__make} install DESTDIR="$RPM_BUILD_ROOT" -%{__mv} $RPM_BUILD_ROOT%{_docdir}/%{name} ./installed-docs - -%clean -%{__rm} -rf "$RPM_BUILD_ROOT" +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm %{buildroot}%{_datadir}/irssi/help/otr %files -n irssi-otr %defattr(-,root,root) -%doc installed-docs/* +%doc README.md LICENSE ChangeLog help/otr %{_libdir}/irssi/modules/libotr.so -%files -n xchat-otr -%defattr(-,root,root) -%doc installed-docs/* README.xchat -%dir %{_libdir}/xchat -%dir %{_libdir}/xchat/plugins -%{_libdir}/xchat/plugins/libxchatotr.so - %changelog ++++++ irssi-otr-1.0.0-irssi-module-dir.patch ++++++ From: Martin Milata <[email protected]> Date: Sun Mar 9 14:21:13 2014 +0100 Subject: Make irssi module directory configurable Upstream: Committed References: https://github.com/cryptodotis/irssi-otr/commit/13ae352b0fe854f8dff17d45440594f501533b83#diff-67e997bcfdac55191033d57a16d1408a The hardcoded path does not work on 64 bit. diff --git a/configure.ac b/configure.ac index 34fc64c..160130b 100644 --- a/configure.ac +++ b/configure.ac @@ -69,9 +69,16 @@ CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_S DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include" AC_SUBST(DEFAULT_INCLUDES) -# Hardcoded here since irssi only searches in $HOME/.irssi/modules or this path -# which is unfortunate... -IRSSI_MODULE_DIR="/usr/lib/irssi/modules" +# Irssi searches for modules in $HOME/.irssi/modules and $(libdir)/irssi/modules +# where the value of $(libdir) may depend on your distribution, architecture, +# and whether irssi was installed from package or from source. +# The hardcoded value should work for most systems but you need to override it for +# e.g. x86_64 Fedora. +AC_ARG_WITH([irssi-module-dir], + AS_HELP_STRING([--with-irssi-module-dir=DIR], [Irssi module directory]), + [IRSSI_MODULE_DIR="$withval"], + [IRSSI_MODULE_DIR="/usr/lib/irssi/modules"]) + AC_SUBST(IRSSI_MODULE_DIR) AC_CONFIG_FILES([ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
