From 86b728f0684848e3e701c027c26440a28c6f28a7 Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cse.cem@gmail.com>
Date: Dec 15 2013 02:25:45 +0000
Subject: Bump to git HEAD for libotr 4.0.0 update (# 992580)


---

diff --git a/.gitignore b/.gitignore
index 62a1433..522c7cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 irc-otr-0.3.tar.gz
+/irc-otr-0.3-9ea5cc4.tar.gz
diff --git a/irc-otr.spec b/irc-otr.spec
index 0d6024e..04d454a 100644
--- a/irc-otr.spec
+++ b/irc-otr.spec
@@ -1,11 +1,19 @@
+%global         gitrev 9ea5cc4
+
 Name:           irc-otr
 Version:        0.3
-Release:        8%{?dist}
+Release:        9.git%{gitrev}%{?dist}
 Summary:        Off-The-Record Messaging plugin for various irc clients
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://irssi-otr.tuxfamily.org/
-Source0:        ftp://download.tuxfamily.org/irssiotr/irc-otr-%{version}.tar.gz
+# This comes from git HEAD, for libotr 4 support.
+# git clone git://git.tuxfamily.org/gitroot/irssiotr/irssiotr.git \
+#   irc-otr-0.3
+# tar --exclude-vcs -czf irc-otr-0.3-%{gitrev}.tar.gz irc-otr-0.3
+Source0:        irc-otr-%{version}-%{gitrev}.tar.gz
+# Was:
+#Source0:        ftp://download.tuxfamily.org/irssiotr/irc-otr-%{version}.tar.gz
 Source1:        http://www.xchat.org/docs/xchat-plugin.h
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,16 +58,18 @@ for X-Chat.
 
 %prep
 %setup -q
-mkdir xchat
 cp %{SOURCE1} xchat/
 ln -s xchat/xchat-plugin.h
 sed -i -e \
   "s@FIND_PATH(XCHAT_INCLUDE_DIR NAMES xchat/xchat-plugin.h)@FIND_PATH(XCHAT_INCLUDE_DIR NAMES xchat/xchat-plugin.h PATH .)@" \
   CMakeLists.txt
+sed -i -e \
+  's@INSTALL(FILES README LICENSE DESTINATION ${DOCDIR})@INSTALL(FILES ../README ../LICENSE DESTINATION ${DOCDIR})@' \
+  irssi/CMakeLists.txt xchat/CMakeLists.txt
 
 
 %build
-%cmake .
+%cmake -DIRCOTR_VERSION=%{version} .
 make %{?_smp_mflags}
 
 
@@ -67,6 +77,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT%{_docdir}/irssi-otr ./installed-docs
+rm -f $RPM_BUILD_ROOT%{_docdir}/xchat-otr/{README,LICENSE}
 
 
 %clean
@@ -86,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 14 2013 Conrad Meyer <cemeyer@uw.edu> - 0.3-9.git9ea5cc4
+- Bump to git HEAD for libotr 4.0.0 update (# 992580)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 038c672..918a274 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f9746a1156a4060f8d4256be43c4adf  irc-otr-0.3.tar.gz
+de82414bc0cb5cc69e901b91285adbb9  irc-otr-0.3-9ea5cc4.tar.gz