--- a/ChangeLog	Thu Jul 24 14:30:09 2008 +0000
+++ b/ChangeLog	Thu Jul 24 15:01:48 2008 +0000
@@ -1,16 +1,25 @@
-2008-07-24  Matt Keenan  <[email protected]>
-
-    * patches/gnome-panel-07-restrict-app-launching.diff : Typos
-    * patches/gnome-panel-16-disable-lock-screen.diff : Typos
+2008-07-24  Damien Carbery <[email protected]>
+
+	* base-specs/libotr.spec: Added. Move libotr from pidgin-otr.spec to
+	  libotr.spec. This makes is easier to track for ARC and Legal reviews.
+	* base-specs/pidgin-otr.spec: Move libotr to libotr.spec. Remove unused
+	  %files sections.
+	* SUNWgnome-im-client.spec: Add libotr module. Delete .a/.la in
+	  %install.
 
 2008-07-24  Matt Keenan  <[email protected]>
 
-    * base-specs/gnome-panel.spec : Bump to 2.23.5
-    * patches/gnome-panel-07-restrict-app-launching.diff : Re-apply
-    * patches/gnome-panel-11-trusted-extensions.diff : Re-apply
-    * patches/gnome-panel-16-disable-lock-screen.diff : Re-apply
-    * patches/gnome-panel-19-add-libsocket.diff : Re-apply
-    * patches/gnome-panel-17-launcher-name-crash.diff : Removed, Upstream
+	* patches/gnome-panel-07-restrict-app-launching.diff : Typos
+	* patches/gnome-panel-16-disable-lock-screen.diff : Typos
+
+2008-07-24  Matt Keenan  <[email protected]>
+
+	* base-specs/gnome-panel.spec : Bump to 2.23.5
+	* patches/gnome-panel-07-restrict-app-launching.diff : Re-apply
+	* patches/gnome-panel-11-trusted-extensions.diff : Re-apply
+	* patches/gnome-panel-16-disable-lock-screen.diff : Re-apply
+	* patches/gnome-panel-19-add-libsocket.diff : Re-apply
+	* patches/gnome-panel-17-launcher-name-crash.diff : Removed, Upstream
 
 2008-07-24  Damien Carbery <[email protected]>
 

--- a/SUNWgnome-im-client.spec	Thu Jul 24 14:30:09 2008 +0000
+++ b/SUNWgnome-im-client.spec	Thu Jul 24 15:01:48 2008 +0000
@@ -1,7 +1,7 @@
 #
 # # spec file for package SUNWgnome-im-client
 #
-# includes module(s): pidgin, pidgin-otr
+# includes module(s): pidgin, pidgin-otr, libotr
 #
 # Copyright 2008 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
@@ -12,6 +12,7 @@
 %include Solaris.inc
 
 %use pidgin = pidgin.spec
+%use libotr = libotr.spec
 %use pidginotr = pidgin-otr.spec
 
 Name:                    SUNWgnome-im-client
@@ -80,6 +81,7 @@
 rm -rf %name-%version
 mkdir %name-%version
 %pidgin.prep -d %name-%version
+%libotr.prep -d %name-%version
 %pidginotr.prep -d %name-%version
 cd %{_builddir}/%name-%version
 gzcat %SOURCE0 | tar xf -
@@ -91,12 +93,24 @@
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="%_ldflags"
 %pidgin.build -d %name-%version
+%libotr.build -d %name-%version
+export ACLOCAL_FLAGS="-I %{_builddir}/%name-%version/libotr-%{libotr.version}"
+export CFLAGS="$CFLAGS -I %{_builddir}/%name-%version/libotr-%{libotr.version}/my_build_tmp"
+export RPM_OPT_FLAGS="$CFLAGS"
+export LDFLAGS="$LDFLAGS -L%{_builddir}/%name-%version/libotr-%{libotr.version}/src/.libs -lotr"
+export LIBOTR_BLD_DIR=%{_builddir}/%name-%version/libotr-%{libotr.version}
 %pidginotr.build -d %name-%version
 
 %install
 %pidgin.install -d %name-%version
+%libotr.install -d %name-%version
 %pidginotr.install -d %name-%version
 
+# Delete .a and .la files.
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+
 %if %build_l10n
 %else
 # REMOVE l10n FILES
@@ -208,6 +222,9 @@
 %endif
 
 %changelog
+* Thu Jul 23 2008 - [email protected]
+- Move libotr from pidgin-otr.spec to libotr.spec. This makes is easier to
+  track for ARC and Legal reviews.
 * Wed May 21 2008 - [email protected]
 - Add Build/Requires SUNWsqlite3, SUNWpr and SUNWtls to fix #6703993.
 * Fri Mar 07 2008  - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/libotr.spec	Thu Jul 24 15:01:48 2008 +0000
@@ -0,0 +1,107 @@
+#
+# spec file for package libotr
+#
+# Copyright (c) 2008 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Owner: rickju
+# bugdb :
+#
+Name:		libotr
+Version:	3.2.0
+Release:        1
+License:	GPL
+Group:		Applications/Internet
+Distribution:	Java Desktop System
+Vendor:		Sun Microsystems, Inc.
+Summary:	Off-the-Record (OTR) Messaging plugin for GAIM
+Source:		http://www.cypherpunks.ca/otr/libotr-%{version}.tar.gz
+URL:		http://www.cypherpunks.ca/otr/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+Docdir:		%{_defaultdocdir}/pidgin
+Autoreqprov:	on
+
+%description
+Off-the-Record (OTR) Messaging allows you to have private
+conversations over instant messaging.
+This is a plugin for pdgin which implements Off-the-Record
+Messaging over any IM network pidgin supports. 
+
+%prep
+%setup -q
+
+%build
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+  CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+  CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+  CPUS=1
+fi
+
+#build libotr
+cd ../libotr*
+glib-gettextize -f
+libtoolize --force
+aclocal $ACLOCAL_FLAGS -I .
+autoheader
+automake -a -c -f
+autoconf
+
+CFLAGS="$RPM_OPT_FLAGS -DG_IMPLEMENT_INLINES -DG_HAVE_ISO_VARARGS" \
+LD_LIBRARY_PATH="%{_libdir}:$LD_LIBRARY_PATH"
+./configure 				\
+	--prefix=%{_prefix} 		\
+	--mandir=%{_mandir}		\
+	--sysconfdir=%{_sysconfdir}
+make -j $CPUS
+ 
+# pidgin-otr looks for files like <libotr/message.h> so we must copy them to
+# my_build_tmp/libotr and point CFLAGS to my_build_tmp to be found.
+if [ -d my_build_tmp ]; then rm -rf my_build_tmp; fi;
+mkdir my_build_tmp; mkdir my_build_tmp/libotr;
+cp src/*.h my_build_tmp/libotr
+cp toolkit/*.h my_build_tmp/libotr
+
+
+%install
+make DESTDIR=$RPM_BUILD_ROOT install \
+    SITEPREFIX=/dummy VENDORPREFIX=/dummy PERLPREFIX=/dummy
+
+
+%clean
+rm -r $RPM_BUILD_ROOT
+
+%changelog
+* Thu Jul 23 2008 - [email protected]
+- Move libotr from pidgin-otr.spec to libotr.spec. This makes is easier to
+  track for ARC and Legal reviews.
+
+* Mon Jul 21 2008 - [email protected]
+- Bump to 3.2.0.
+
+* Tue Nov 06 2007 - [email protected]
+- bump to libotr 3.1.0 and pidgin-otr 3.1.0
+
+* Tue Jun 01 2007 - [email protected]
+- fix the source0 url
+
+* Tue May 30 2007 - [email protected]
+- bump to pidgin-otr 3.0.1
+
+* Tue Apr 03 2007 - [email protected]
+- Add a gaim-otr-03-gtk-dialog.diff for bug#632728
+
+* Thu Jan 18 2007 - [email protected]
+- Remove the code from %install that deletes $RPM_BUILD_ROOT as it trashes the
+  'make install' of gaim when part of SUNWgnome-im-client build.
+
+* Thu Dec 21 2006 - [email protected]
+- Remove *.a and *.la files in %install.
+
+* Mon Dec 18 2006 - [email protected]
+- Add this new spec for libotr and gaim-otr

--- a/base-specs/pidgin-otr.spec	Thu Jul 24 14:30:09 2008 +0000
+++ b/base-specs/pidgin-otr.spec	Thu Jul 24 15:01:48 2008 +0000
@@ -1,7 +1,7 @@
 #
 # spec file for package pidgin-otr
 #
-# Copyright (c) 2005 Sun Microsystems, Inc.
+# Copyright (c) 2008 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,7 +10,6 @@
 #
 Name:		pidgin-otr
 Version:	3.2.0
-%define libotr_version 3.2.0
 Release:        1
 License:	GPL
 Group:		Applications/Internet
@@ -18,7 +17,6 @@
 Vendor:		Sun Microsystems, Inc.
 Summary:	Off-the-Record (OTR) Messaging plugin for GAIM
 Source0:        http://www.cypherpunks.ca/otr/%{name}-%{version}.tar.gz
-Source1:	http://www.cypherpunks.ca/otr/libotr-%{libotr_version}.tar.gz
 # owner:rickju date:2007-03-07 type:bug bugster:6524858 state:upstream
 Patch1:         pidgin-otr-01-gtk-ui.diff
 URL:		http://www.cypherpunks.ca/otr/
@@ -47,11 +45,7 @@
 Messaging over any IM network pidgin supports. 
 
 %prep
-%setup -q -b 1 -n %{name}*
-#patch for libotr
-cd ../libotr*
-#patch for pidgin-otr
-cd ../pidgin-otr*
+%setup -q
 %patch1 -p1
 
 %build
@@ -66,8 +60,6 @@
   CPUS=1
 fi
 
-#build libotr
-cd ../libotr*
 glib-gettextize -f
 libtoolize --force
 aclocal $ACLOCAL_FLAGS -I .
@@ -75,83 +67,31 @@
 automake -a -c -f
 autoconf
 
-CFLAGS="$RPM_OPT_FLAGS -DG_IMPLEMENT_INLINES -DG_HAVE_ISO_VARARGS" \
-LD_LIBRARY_PATH="%{_libdir}:$LD_LIBRARY_PATH"
-./configure 				\
-	--prefix=%{_prefix} 		\
-	--mandir=%{_mandir}		\
-	--sysconfdir=%{_sysconfdir}
-make -j $CPUS
-
-# get root dir
-cd ..
-export MYDIR=`pwd`
-
-#build pidgin-otr
-cd libotr*
-if [ -d my_build_tmp ]; then rm -rf my_build_tmp; fi;
-mkdir my_build_tmp; mkdir my_build_tmp/libotr;
-cp src/*.h my_build_tmp/libotr
-cp toolkit/*.h my_build_tmp/libotr
-
-cd ../pidgin-otr*
-glib-gettextize -f
-libtoolize --force
-aclocal $ACLOCAL_FLAGS -I . -I ${MYDIR}/libotr-%{libotr_version}
-autoheader
-automake -a -c -f
-autoconf
-
-CFLAGS="$RPM_OPT_FLAGS -DG_IMPLEMENT_INLINES -DG_HAVE_ISO_VARARGS -I${MYDIR}/libotr-%{libotr_version}/my_build_tmp/libotr"
-LD_LIBRARY_PATH="%{_libdir}:$LD_LIBRARY_PATH -L${MYDIR}/libotr-%{libotr_version}/src/.libs"
+CFLAGS="$RPM_OPT_FLAGS -DG_IMPLEMENT_INLINES -DG_HAVE_ISO_VARARGS"
+LD_LIBRARY_PATH="%{_libdir}:$LD_LIBRARY_PATH -L$LIBOTR_BLD_DIR/src/.libs"
 ./configure 				\
 	--prefix=%{_prefix} 		\
 	--mandir=%{_mandir}		\
 	--sysconfdir=%{_sysconfdir}     \
-	--with-libotr-inc-prefix=${MYDIR}/libotr-%{libotr_version}/my_build_tmp \
-	--with-libotr-prefix=${MYDIR}/libotr-%{libotr_version}/src/.libs
+	--with-libotr-inc-prefix=$LIBOTR_BLD_DIR/my_build_tmp \
+	--with-libotr-prefix=$LIBOTR_BLD_DIR/src/.libs
 make -j $CPUS
 
 %install
-# install libotr
-cd ../libotr*
-make DESTDIR=$RPM_BUILD_ROOT install \
-    SITEPREFIX=/dummy VENDORPREFIX=/dummy PERLPREFIX=/dummy
-# install pidgin-otr
-cd ../pidgin-otr*
 make DESTDIR=$RPM_BUILD_ROOT install \
     SITEPREFIX=/dummy VENDORPREFIX=/dummy PERLPREFIX=/dummy
 
-rm $RPM_BUILD_ROOT%{_libdir}/*.a
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
-
-%files
-%defattr(-, root, root)
-# libotr
-%attr(755, root, root) %{_libdir}/*.so
-%{_bindir}/*
-%{_mandir}/man1/*
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.a
-# pidgin-otr
-%attr(755, root, root) %{_libdir}/pidgin/*.so
-%{_libdir}/pidgin/*.la
-%{_libdir}/lib*.la
-
-%files devel
-%defattr(-, root, root)
-# libotr
-%{_includedir}/libotr/*
-%{_datadir}/aclocal
-# pidgin-otr
 
 %clean
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jul 23 2008 - [email protected]
+- Move libotr from pidgin-otr.spec to libotr.spec. This makes is easier to
+  track for ARC and Legal reviews.
+
 * Mon Jul 21 2008 - [email protected]
-- bump to libotr 3.2.0 and pidgin-otr 3.2.0
+- Bump to 3.2.0.
 
 * Tue Nov 06 2007 - [email protected]
 - bump to libotr 3.1.0 and pidgin-otr 3.1.0