From paul at cypherpunks.ca  Tue Nov 30 18:46:07 2004
From: paul at cypherpunks.ca (Paul Wouters)
Date: Wed, 1 Dec 2004 00:46:07 +0100 (MET)
Subject: [OTR-dev] Re: [OTR-announce] gaim-otr 0.9.0 is now online
In-Reply-To: <E1CZENx-00049T-9J@smtp.paip.net>
References: <E1CZENx-00049T-9J@smtp.paip.net>
Message-ID: <Pine.LNX.4.61.0411302339000.21078@expansionpack.xtdnet.nl>

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>

From ian at cypherpunks.ca  Tue Nov 30 19:02:13 2004
From: ian at cypherpunks.ca (Ian Goldberg)
Date: Tue, 30 Nov 2004 19:02:13 -0500
Subject: [OTR-dev] Re: [OTR-announce] gaim-otr 0.9.0 is now online
In-Reply-To: <Pine.LNX.4.61.0411302339000.21078@expansionpack.xtdnet.nl>
References: <E1CZENx-00049T-9J@smtp.paip.net> <Pine.LNX.4.61.0411302339000.21078@expansionpack.xtdnet.nl>
Message-ID: <20041201000213.GU2278@smtp.paip.net>

On Wed, Dec 01, 2004 at 12:46:07AM +0100, Paul Wouters wrote:
> Unless you were using rpm -Uhv gaim-otr-0.9.0.i386.rpm :)

Cool.  :-)

> 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.

The top-level Makefile descends into each of the directories, including
tools.  And there *is* a clean target in each one.

> - added 'cd tools ; make' to the build process in spec file.

I don't see why this is needed; the top-level make should descend.

> - 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

Great.  That's what I get for editing a file format I know next to
nothing about.  Thanks!  :-)

>   Requires: gaim >= 1.0.0, libgcrypt >= 1.2.0

jbash just had an issue of otr not working with too-old (pre-2.4) gtk
libraries.  Can you add the appropriate Requires: ?  [0.9.0 actually
uses a feature that wasn't added until gtk+-2.4 (popups don't get
keyboard focus).]

> ***************
> *** 43,48 ****
> --- 44,53 ----
>   %{__make} \
>     GAIM_SOURCE="/usr/include/gaim" \
>     all
> + cd tools
> + %{__make} \
> +   GAIM_SOURCE="/usr/include/gaim" \
> +   all

As I said, I don't understand why you needed to do this.

   - Ian


From paul at cypherpunks.ca  Tue Nov 30 19:24:03 2004
From: paul at cypherpunks.ca (Paul Wouters)
Date: Wed, 1 Dec 2004 01:24:03 +0100 (MET)
Subject: [OTR-dev] Re: [OTR-announce] gaim-otr 0.9.0 is now online
In-Reply-To: <20041201000213.GU2278@smtp.paip.net>
References: <E1CZENx-00049T-9J@smtp.paip.net>
 <Pine.LNX.4.61.0411302339000.21078@expansionpack.xtdnet.nl>
 <20041201000213.GU2278@smtp.paip.net>
Message-ID: <Pine.LNX.4.61.0412010116460.27749@expansionpack.xtdnet.nl>

On Tue, 30 Nov 2004, Ian Goldberg wrote:

>> - added 'cd tools ; make' to the build process in spec file.
>
> I don't see why this is needed; the top-level make should descend.

You are right. I think the confusion came from both already getting the
binaries in the main directory, as well as 'make clean' not cleaning them.
It made them rather weird unknown files, and I didn't pay close attention
to the Makefile. I have removed it again.

btw. I really think you shouldn't ship a source tar.gz with binaries.

> jbash just had an issue of otr not working with too-old (pre-2.4) gtk
> libraries.  Can you add the appropriate Requires: ?  [0.9.0 actually
> uses a feature that wasn't added until gtk+-2.4 (popups don't get
> keyboard focus).]

I added that.

One thing I forgot to say. I am using .tar.gz and not .tgz in all my
references, and have to rename the .tgz in /usr/src/redhat/SOURCES into
.tar.gz. Is there a reason why you use tgz instead of .tar.gz?

Released as gaim-otr-0.9.0-2

Paul


From ian at cypherpunks.ca  Tue Nov 30 20:14:30 2004
From: ian at cypherpunks.ca (Ian Goldberg)
Date: Tue, 30 Nov 2004 20:14:30 -0500
Subject: [OTR-dev] Re: [OTR-announce] gaim-otr 0.9.0 is now online
In-Reply-To: <Pine.LNX.4.61.0412010116460.27749@expansionpack.xtdnet.nl>
References: <E1CZENx-00049T-9J@smtp.paip.net> <Pine.LNX.4.61.0411302339000.21078@expansionpack.xtdnet.nl> <20041201000213.GU2278@smtp.paip.net> <Pine.LNX.4.61.0412010116460.27749@expansionpack.xtdnet.nl>
Message-ID: <20041201011430.GW2278@smtp.paip.net>

On Wed, Dec 01, 2004 at 01:24:03AM +0100, Paul Wouters wrote:
> I added that.

Thanks.

> One thing I forgot to say. I am using .tar.gz and not .tgz in all my
> references, and have to rename the .tgz in /usr/src/redhat/SOURCES into
> .tar.gz. Is there a reason why you use tgz instead of .tar.gz?

Is there a reason to specifically use .tar.gz that I'm not aware of?

> Released as gaim-otr-0.9.0-2

Cool; can you post the new .spec file in the same web directory?

   - Ian