From: Bjoern V. <bj...@cs...> - 2004-01-06 17:35:00
|
Hello! the gaim.spec(.in) file included in gaim is not suitable for SuSE Linux. SuSE has some other package names, for instance SuSE has mozilla-devel instead of mozilla-nss-devel for the NSS libs. As a result, the users must compile which rpm(build) --nodeps and NSS is not found. =20 This patch includes the dependencies for SuSE 8.2 and 9.0 and sets the paths for SuSE's Mozilla NSS libs. ----------------------------------------------------------------- --- gaim.spec.in.orig=092004-01-06 16:29:37.000000000 +0100 +++ gaim.spec.in=092004-01-06 18:07:25.000000000 +0100 @@ -14,6 +14,9 @@ Requires: gtk+2.0 >=3D 2.0.0, libnss3 BuildRequires: libao-devel, libgtk+2.0_0-devel, gtkspell-devel, libtool, a= udiofile-devel, pkgconfig, libnss3-devel, perl-devel Provides: libgaim-remote0 +%elseif "%{_vendor}" =3D=3D "suse" +Requires: gtk2 >=3D 2.0.0, mozilla, gtkspell, audiofile, libao, startup-= notification +BuildRequires: libao-devel, gtk2-devel, gtkspell-devel, libtool, audiofile= -devel, pkgconfig, mozilla-devel, startup-notification-devel %else Requires: gtk2 >=3D 2.0.0, mozilla-nss, gtkspell, audiofile, libao BuildRequires: libao-devel, gtk2-devel, gtkspell-devel, libtool, audiofile= -devel, pkgconfig, mozilla-nss-devel @@ -46,6 +49,21 @@ %setup =20 %build +%if "%{_vendor}" =3D=3D "suse" +CFLAGS=3D"$RPM_OPT_FLAGS -Wl,-rpath=3D/opt/mozilla/lib" ./configure --pref= ix=3D%{_prefix} \ + --bindir=3D%{_bindir} \ + --datadir=3D%{_datadir} \ + --includedir=3D%{_includedir} \ + --libdir=3D%{_libdir} \ + --mandir=3D%{_mandir} \ + --sysconfdir=3D%{_sysconfdir} \ + --with-perl-lib=3D%{buildroot}%{_prefi= x} \ + --enable-nss=3Dyes \ + --with-nss-includes=3D/opt/mozilla/inc= lude/nss \ + --with-nss-libs=3D/opt/mozilla/lib \ + --with-nspr-includes=3D/opt/mozilla/in= clude/nspr \ + --with-nspr-libs=3D/opt/mozilla/lib +%else CFLAGS=3D"$RPM_OPT_FLAGS" ./configure --prefix=3D%{_prefix} \ --bindir=3D%{_bindir} \ --datadir=3D%{_datadir} \ @@ -54,6 +72,7 @@ --mandir=3D%{_mandir} \ --sysconfdir=3D%{_sysconfdir} \ --with-perl-lib=3D%{buildroot}%{_prefi= x} +%endif make %{?_smp_mflags} =20 %install @@ -101,6 +120,9 @@ %{_includedir}/gaim-remote/*.h =20 %changelog +* Tue Jan 6 2004 Bjoern Voigt <bj...@cs...> +- Added dependencies for SuSE Linux + * Sun Jul 20 2003 Bjoern Voigt <bj...@cs...> - Added pkgconfig build dependency. - if "%{_vendor}" !=3D "MandrakeSoft" now also works with rpm 3.x. ----------------------------------------------------------------- I have tested this patch with SuSE Linux 9.0 which includes Gaim 0.67 with all necessary dependencies. SuSE 8.2 has Gaim 0.59 and no gtkspell package. If there are SuSE users here, please test the patch. There is a small remaining problem: SuSE Linux 8.2 and 9.0 uses /opt/gnome as Gaim's prefix. Gaim's spec file uses %{_prefix} which is normally /usr as the prefix. I have not changed this because this causes much changes in the gaim.spec file.=20 If there are no problems, please include the patch for Gaim 0.75. Bj=F6rn |
From: James O. <jam...@pi...> - 2004-01-07 08:39:26
Attachments:
gaim.spec
|
> If there are SuSE users here, please test the patch. > There is a small remaining problem: SuSE Linux 8.2 and 9.0 uses > /opt/gnome as Gaim's prefix. Gaim's spec file uses %{_prefix} which is > normally /usr as the prefix. I have not changed this because this > causes much changes in the gaim.spec file. No no no, this is all wrong, SuSE 8.2 uses /opt/gnome2 for a start... Gosh, what else is wrong, you need to use rpath to make sure the Mozilla libs are picked up. Yes, SuSE 8.2 lacks gtkspell, but it's available from the usr-local-bin APT repository. I've attached the spec file I use for www.usr-local-bin.org's packages - if I have time, I may merge it into the distributed spec and then produce a diff, or it could just be included as a separate file. -- James Ogley, Unix Systems Administrator, Pinnacle Insurance Plc Work: jam...@pi... www.pinnacle.co.uk +44 (0) 20 8731 3619 Personal: ja...@ru... www.rubberturnip.org.uk Updated GNOME RPMs for SuSE Linux: www.usr-local-bin.org *********************************************************************** CONFIDENTIALITY. This e-mail and any attachments are confidential and may also be privileged. If you are not the named recipient, please notify the sender immediately and do not disclose the contents to another person, use it for any purpose, or store or copy the information in any medium. Any views expressed in this message are those of the individual sender, except where the sender specifically states them to be the views of Pinnacle Insurance Plc. If you have received this e-mail in error please immediately notify our Helpdesk on +44 (0) 20 8207 9555. This footnote also confirms that this email message has been swept by MIMEsweeper for the presence of computer viruses. www.mimesweeper.com ********************************************************************** |
From: Bjoern V. <bj...@cs...> - 2004-01-07 12:25:23
|
On 7.1.2004 James Ogley <jam...@pi...> wrote: > > If there are SuSE users here, please test the patch. > > There is a small remaining problem: SuSE Linux 8.2 and 9.0 uses > > /opt/gnome as Gaim's prefix. Gaim's spec file uses %{_prefix} which is > > normally /usr as the prefix. I have not changed this because this > > causes much changes in the gaim.spec file.=20 >=20 > No no no, this is all wrong, SuSE 8.2 uses /opt/gnome2 for a start... Not really. SuSE 8.2 uses /opt/gnome for GNOME 1.4 programs and /opt/gnome2 for GNOME 2.2 programs. SuSE 8.2 includes Gaim 0.59.8. This is a GTK1 program and SuSE puts this in /opt/gnome. I checked this in ARCHIVES.gz (first CDROM of SuSE 8.2).=20 If usr-local-bin builds Gaim>0.60 in /opt/gnome2 this is also good.=20 But what is the consequence, if Gaim's new rpm spec file builds Gaim in a different location, for instance /usr (my patch) or /opt/gnome2? All this paths are in $PATH and Gaim is found. The only problem can be, that Gaim doesn't show up in the menus of Gnome or KDE. This may be hard to fix, because SuSE<=3D8.2 uses the susewm system and SuSE 9.0 uses a new menu system which is backported from KDE 3.2 and uses a freedesktop standard.=20 I know that Gaim's rpm spec file cannot be as good as a hand-optimized rpm spec file for a specific distribution.=20 But I want a spec file, which is usable for SuSE without modifications for people who like to install Gaim from source with=20 rpm(build) --tarball -tb gaim-0.75cvs.tar.gz or something similar. usr-local-bin's build will be even better. By the way, thanks for www.usr-local-bin.org, it's great! > Gosh, what else is wrong, you need to use rpath to make sure the Mozilla > libs are picked up. If has downloaded the spec file from www.usr-local-bin.org for Gaim 0.74 and compared it with my version. My spec patch also has rpath. Please take a lot on it.=20 > Yes, SuSE 8.2 lacks gtkspell, but it's available from the usr-local-bin > APT repository. This is true. But I don't know, if everyone knows it. gtkspell is hard to find. If gtkspell is optional it may be better to remove it from the dependencies. > I've attached the spec file I use for www.usr-local-bin.org's packages - > if I have time, I may merge it into the distributed spec and then > produce a diff, or it could just be included as a separate file. Good idea. You have much experience with rpm, please take a look on it. Regards, Bj=F6rn |