[OTR-dev] Re: [OTR-announce] gaim-otr 0.9.0 is now online

[Paul Wouters]

On Tue, 30 Nov 2004, Ian Goldberg wrote:

> I've put 0.9.0 online.  The most notable change: the name of the plugin
> has changed from otr-plugin.so to gaim-otr.so.  This means that
> (depending on your packaging) you may need to manually delete the old
> /usr/lib/gaim/otr-plugin.so file,

Unless you were using rpm -Uhv gaim-otr-0.9.0.i386.rpm :)

Issues I found:
- missing 'Obsoletes: otr-plugin' line in packaging/fedora/gaim-otr.spec
- new unknown binaries that have no built target nor get cleaned:
    /usr/bin/otr_mackey
    /usr/bin/otr_modify
    /usr/bin/otr_parse
    /usr/bin/otr_readforge
    /usr/bin/otr_remac
    /usr/bin/otr_sesskeys
I see, there is a tools directory now.  there is a makefile target there.
   (nikita would fix this)
no clean target.
- added 'cd tools ; make' to the build process in spec file.
- unpackaged file errors because %doc files were installed with install,
   causing them to have double installations (%doc target means automaticly
   put it in /usr/share/doc/packagename/)
- unpackaged tools/ files now get mentioned in %files section

Diff of my changes to gaim-otr.spec attached.
SRC and i386 rpms available at http://www.xtdnet.nl/paul/otr/
-------------- next part --------------
*** gaim-otr-0.9.0/packaging/fedora/gaim-otr.spec	2004-11-30 20:55:07.000000000 +0100
--- /usr/src/redhat/SPECS/gaim-otr.spec	2004-12-01 00:41:19.186260072 +0100
***************
*** 13,18 ****
--- 13,19 ----
  License: GPL
  Group: Applications/Internet
  Provides: gaim-otr
+ Obsoletes: otr-plugin
  BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0, libgpg-error-devel gaim >= 1.0.0
  Requires: gaim >= 1.0.0, libgcrypt >= 1.2.0
  %define __spec_install_post /usr/lib/rpm/brp-compress || :
***************
*** 43,48 ****
--- 44,53 ----
  %{__make} \
    GAIM_SOURCE="/usr/include/gaim" \
    all
+ cd tools
+ %{__make} \
+   GAIM_SOURCE="/usr/include/gaim" \
+   all
  
  %install
  rm -rf ${RPM_BUILD_ROOT}
***************
*** 56,65 ****
  install -m0755 otr_modify %{buildroot}/usr/bin
  install -m0755 otr_remac %{buildroot}/usr/bin
  install -d -m755  %{buildroot}/usr/share/doc/gaim-otr
- install -m0644 README %{buildroot}/usr/share/doc/gaim-otr
- install -m0644 Protocol %{buildroot}/usr/share/doc/gaim-otr
- install -m0644 COPYING %{buildroot}/usr/share/doc/gaim-otr
- install -m0644 COPYING.LIB %{buildroot}/usr/share/doc/gaim-otr
  
  %clean
  rm -rf ${RPM_BUILD_ROOT}
--- 61,66 ----
***************
*** 67,75 ****
  %files
  %defattr(-,root,root)
  %attr(0755,root,root) /usr/lib/gaim/gaim-otr.so
! %doc README COPYING
  
  %changelog
  * Mon Nov 22 2004 Ian Goldberg <otr at cypherpunks.ca>
  - Bumped version to 0.8.1
  * Sun Nov 21 2004 Paul Wouters <paul at cypherpunks.ca>
--- 68,87 ----
  %files
  %defattr(-,root,root)
  %attr(0755,root,root) /usr/lib/gaim/gaim-otr.so
! %doc README COPYING COPYING.LIB Protocol
! %{_bindir}/otr_mackey
! %{_bindir}/otr_modify
! %{_bindir}/otr_parse
! %{_bindir}/otr_readforge
! %{_bindir}/otr_remac
! %{_bindir}/otr_sesskeys
! 
  
  %changelog
+ * Wed Dec  1 2004 Paul Wouters <paul at cypherpunks.ca>
+ - Bumped to version 0.9.0. 
+ - Fixed install for tools and cos
+ - AddeObsolete target for otr-plugin so rpm-Uhv gaim-otr removes it.
  * Mon Nov 22 2004 Ian Goldberg <otr at cypherpunks.ca>
  - Bumped version to 0.8.1
  * Sun Nov 21 2004 Paul Wouters <paul at cypherpunks.ca>