SPECS: gaim.spec - version 2.0.0 release 1.beta6.3: merged from DEVEL
radek
radek at pld-linux.org
Fri Mar 23 16:30:53 CET 2007
Author: radek Date: Fri Mar 23 15:30:53 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- version 2.0.0 release 1.beta6.3: merged from DEVEL
---- Files affected:
SPECS:
gaim.spec (1.163 -> 1.164)
---- Diffs:
================================================================
Index: SPECS/gaim.spec
diff -u SPECS/gaim.spec:1.163 SPECS/gaim.spec:1.164
--- SPECS/gaim.spec:1.163 Tue Feb 13 08:16:44 2007
+++ SPECS/gaim.spec Fri Mar 23 16:30:48 2007
@@ -4,54 +4,76 @@
# - kerberos 4 with zephyr support?
# - external zephyr?
# http://packages.qa.debian.org/z/zephyr.html
-# - kill -ui-gtk? (is there any other ui?)
#
+%bcond_without cap # without Contact Availability Prediction
+%bcond_without dbus # without dbus (for gaim-remote and others)
%bcond_without doc # do not generate and include documentation
%bcond_without evolution # compile without the Gaim-Evolution plugin
%bcond_without gtkspell # without gtkspell support
+%bcond_without meanwhile # without meanwhile support
+%bcond_without text # don't build text UI
#
-%include /usr/lib/rpm/macros.perl
+%define _pre beta6
+%include /usr/lib/rpm/macros.perl
Summary: A client compatible with AOL's 'Instant Messenger'
+Summary(de.UTF-8): Gaim ist ein Instant Messenger
Summary(ko.UTF-8): AOL 인스턴트 메신저와 호환되는 클라이언트
Summary(pl.UTF-8): Klient kompatybilny z AOL Instant Messenger
Summary(pt_BR.UTF-8): Um cliente para o AOL Instant Messenger (AIM)
-Summary(de.UTF-8): Gaim ist ein Instant Messenger
Name: gaim
-Version: 1.5.0
-Release: 3
+Version: 2.0.0
+Release: 1.%{_pre}.3
Epoch: 1
License: GPL
Group: Applications/Communications
-Source0: http://dl.sourceforge.net/gaim/%{name}-%{version}.tar.bz2
-# Source0-md5: 9205321ac11fad271c90f2f0d7c5e7ce
+Source0: http://dl.sourceforge.net/gaim/%{name}-%{version}%{_pre}.tar.bz2
+# Source0-md5: 404dcec261f911bcb56f69e5ea192583
+#Source0: http://dl.sourceforge.net/gaim/%{name}-%{version}.tar.bz2
Patch0: %{name}-nolibs.patch
-Patch1: %{name}-desktop.patch
Patch2: %{name}-GG-evo.patch
+Patch3: %{name}-dbus-dir.patch
+Patch4: %{name}-libgadu.patch
URL: http://gaim.sourceforge.net/
+BuildRequires: GConf2-devel >= 2.16.0
BuildRequires: audiofile-devel
BuildRequires: autoconf
BuildRequires: automake
-%{?with_evolution:BuildRequires: evolution-data-server-devel >= 0.0.95}
+BuildRequires: bind-devel
+%{?with_dbus:BuildRequires: dbus-glib-devel >= 0.71}
+%{?with_evolution:BuildRequires: evolution-data-server-devel >= 1.8.1}
+BuildRequires: gettext-autopoint
BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 1:2.2.0
-%{?with_gtkspell:BuildRequires: gtkspell-devel >= 2.0.4}
-BuildRequires: libao-devel
+BuildRequires: gnutls-devel
+BuildRequires: gstreamer-devel >= 0.10.10
+BuildRequires: gtk+2-devel >= 2:2.10.6
+%{?with_gtkspell:BuildRequires: gtkspell-devel >= 2.0.11}
+BuildRequires: intltool
+BuildRequires: mdns-howl-devel
+%{?with_meanwhile:BuildRequires: meanwhile-devel}
+BuildRequires: libgadu-devel
BuildRequires: libtool
+BuildRequires: libxml2-devel >= 2.6.26
BuildRequires: perl-devel
BuildRequires: pkgconfig
+BuildRequires: python-modules
BuildRequires: rpm-perlprov
+BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.177
BuildRequires: tcl-devel
BuildRequires: tk-devel
-BuildRequires: xcursor-devel
+%{?with_text:BuildRequires: ncurses-ext-devel}
+%if %{with cap}
+BuildRequires: sqlite3-devel >= 3.3
+%endif
%if %{with doc}
BuildRequires: doxygen
BuildRequires: graphviz
%endif
-Requires: gaim-ui = %{epoch}:%{version}-%{release}
-#Requires: libao
+Requires(post,preun): GConf2 >= 2.16.0
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
# weird: it *should* break after DynaLoader's version change, but it doesn't
#Requires: perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
+Obsoletes: gaim-ui
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -88,26 +110,24 @@
auf Microsoft Windows und Mac OS X lauffähig ist und mit vielen
Plugins stark erweitert werden kann.
-%package ui-gtk
-Summary: gtk+ user interface for gaim
-Summary(pl.UTF-8): Interfejs użytkownika gaim korzystający z gtk+
-Group: Applications/Communications
-Provides: gaim-ui = %{epoch}:%{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
+%package libs
+Summary: Gaim client library
+Summary(pl.UTF-8): Biblioteka klienta Gaim
+Group: Libraries
+Epoch: 1
-%description ui-gtk
-gtk+ user interface for gaim.
+%description libs
+Gaim client library.
-%description ui-gtk -l pl.UTF-8
-Interfejs użytkownika gaim korzystający z gtk+.
+%description libs -l pl.UTF-8
+Biblioteka klienta Gaim.
%package devel
-Summary: Development files for gaim
-Summary(pl.UTF-8): Pliki programistyczne biblioteki gaim-remote
+Summary: Development files for Gaim client library
+Summary(pl.UTF-8): Pliki programistyczne biblioteki klienta Gaim
Group: Development/Libraries
-Requires: %{name}-plugin-remote = %{epoch}:%{version}-%{release}
-Requires: glib2-devel >= 2.0.0
-Requires: gtk+2-devel >= 1:2.2.0
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: gtk+2-devel >= 2:2.10.6
%description devel
Development files for gaim.
@@ -117,7 +137,7 @@
%package perl
Summary: Gaim files for Perl scripts
-Summary(pl.UTF-8): Pliki Gaima dla skryptów w Perlu
+Summary(pl.UTF-8): Pliki Gaima dla skryptów w Perlu
Group: Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
@@ -131,7 +151,7 @@
%package tcl
Summary: Gaim files for Tcl scripts
-Summary(pl.UTF-8): Pliki Gaima dla skryptów w Tcl-u
+Summary(pl.UTF-8): Pliki Gaima dla skryptów w Tcl-u
Group: Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
@@ -145,7 +165,7 @@
%package plugin-evolution
Summary: Plugin for Ximian Evolution integration
-Summary(pl.UTF-8): Wtyczka do integracji z Evolution
+Summary(pl.UTF-8): Wtyczka do integracji z Evolution
Group: Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
@@ -157,7 +177,7 @@
%package plugin-remote
Summary: Gaim Remote Control
-Summary(pl.UTF-8): Zdalne sterowanie Gaimem
+Summary(pl.UTF-8): Zdalne sterowanie Gaimem
Group: Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
@@ -171,7 +191,7 @@
%package doc
Summary: Gaim documentation for developers (HTML format)
-Summary(pl.UTF-8): Dokumentacja Gaim dla programistów (format HTML)
+Summary(pl.UTF-8): Dokumentacja Gaim dla programistów (format HTML)
Group: Documentation
%description doc
@@ -187,15 +207,15 @@
EOF
%prep
-%setup -q
+%setup -qn %{name}-%{version}%{_pre}
%patch0 -p1
-%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
%{__libtoolize}
-%{__gettextize}
-%{__aclocal}
+%{__aclocal} -I m4macros
%{__autoheader}
%{__autoconf}
%{__automake}
@@ -203,8 +223,12 @@
--disable-nas \
--enable-nss=no \
--with-perl-lib=vendor \
+ --%{?with_cap:en}%{!?with_cap:dis}able-cap \
+ %{?with_dbus:--enable-dbus --with-dbus-session-dir=/usr/share/dbus-1/services} \
+ %{!?with_dbus:--disable-dbus} \
%{!?with_evolution:--disable-gevolution} \
- %{!?with_gtkspell:--disable-gtkspell}
+ %{!?with_gtkspell:--disable-gtkspell} \
+ --%{?with_text:en}%{!?with_text:dis}able-consoleui
%{__make}
%{?with_doc:%{__make} docs}
@@ -215,39 +239,76 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/{,private}/*.la
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{ca at valencia,ca_ES at valencian,my_MM}
-# for future my_MM not supported by glibc yet
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/my{_MM,}
+%find_lang %{name} --with-gnome
+rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/Gaim/{,GtkUI}/.packlist}
-%find_lang %{name} --with-gnome --all-name
+%if %{with dbus}
+rm $RPM_BUILD_ROOT{%{_bindir}/gaim-client-example,%{_libdir}/gaim/dbus-example.so}
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
-%post plugin-remote -p /sbin/ldconfig
-%postun plugin-remote -p /sbin/ldconfig
+%post
+%gconf_schema_install gaim.schemas
+
+%preun
+%gconf_schema_uninstall gaim.schemas
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README* HACKING doc/{CREDITS,FAQ}
+%doc AUTHORS ChangeLog{,.API} HACKING NEWS PLUGIN_HOWTO PROGRAMMING_NOTES README* doc/FAQ
+%attr(755,root,root) %{_bindir}/gaim
%dir %{_libdir}/gaim
-%attr(755,root,root) %{_libdir}/gaim/autorecon.so
-%attr(755,root,root) %{_libdir}/gaim/docklet.so
+%dir %{_libdir}/gaim/private
+%if %{with cap}
+%attr(755,root,root) %{_libdir}/gaim/autoaccept.so
+%attr(755,root,root) %{_libdir}/gaim/autoreply.so
+%attr(755,root,root) %{_libdir}/gaim/buddynote.so
+%attr(755,root,root) %{_libdir}/gaim/cap.so
+%endif
+%attr(755,root,root) %{_libdir}/gaim/convcolors.so
+#%attr(755,root,root) %{_libdir}/gaim/docklet.so
%attr(755,root,root) %{_libdir}/gaim/extplacement.so
+%attr(755,root,root) %{_libdir}/gaim/gaimrc.so
%attr(755,root,root) %{_libdir}/gaim/gestures.so
+%if %{with text}
+%attr(755,root,root) %{_bindir}/gaim-text
+%attr(755,root,root) %{_libdir}/gaim/gntgf.so
+%attr(755,root,root) %{_libdir}/gaim/gnthistory.so
+%attr(755,root,root) %{_libdir}/gaim/gntlastlog.so
+%attr(755,root,root) %{_libdir}/gaim/s.so
+%endif
%attr(755,root,root) %{_libdir}/gaim/history.so
+%attr(755,root,root) %{_libdir}/gaim/iconaway.so
%attr(755,root,root) %{_libdir}/gaim/idle.so
+%attr(755,root,root) %{_libdir}/gaim/libaim.so
+%attr(755,root,root) %{_libdir}/gaim/libbonjour.so
%attr(755,root,root) %{_libdir}/gaim/libgg.so
+%attr(755,root,root) %{_libdir}/gaim/libicq.so
%attr(755,root,root) %{_libdir}/gaim/libirc.so
%attr(755,root,root) %{_libdir}/gaim/libjabber.so
%attr(755,root,root) %{_libdir}/gaim/libmsn.so
-%attr(755,root,root) %{_libdir}/gaim/libnapster.so
%attr(755,root,root) %{_libdir}/gaim/libnovell.so
%attr(755,root,root) %{_libdir}/gaim/liboscar.so
+%attr(755,root,root) %{_libdir}/gaim/liboscar.so.*
+%attr(755,root,root) %{_libdir}/gaim/libqq.so
+%{?with_meanwhile:%attr(755,root,root) %{_libdir}/gaim/libsametime.so}
+%attr(755,root,root) %{_libdir}/gaim/libsimple.so
%attr(755,root,root) %{_libdir}/gaim/libyahoo.so
%attr(755,root,root) %{_libdir}/gaim/libzephyr.so
+%attr(755,root,root) %{_libdir}/gaim/log_reader.so
+%attr(755,root,root) %{_libdir}/gaim/markerline.so
+%attr(755,root,root) %{_libdir}/gaim/newline.so
%attr(755,root,root) %{_libdir}/gaim/notify.so
+%attr(755,root,root) %{_libdir}/gaim/offlinemsg.so
+%attr(755,root,root) %{_libdir}/gaim/psychic.so
%attr(755,root,root) %{_libdir}/gaim/relnot.so
%attr(755,root,root) %{_libdir}/gaim/spellchk.so
%attr(755,root,root) %{_libdir}/gaim/ssl-gnutls.so
@@ -256,32 +317,67 @@
%attr(755,root,root) %{_libdir}/gaim/statenotify.so
%attr(755,root,root) %{_libdir}/gaim/ticker.so
%attr(755,root,root) %{_libdir}/gaim/timestamp.so
-%{_pixmapsdir}/*
-%{_mandir}/man?/*
+%attr(755,root,root) %{_libdir}/gaim/timestamp_format.so
+%attr(755,root,root) %{_libdir}/gaim/xmppconsole.so
+%if %{with dbus}
+%attr(755,root,root) %{_bindir}/gaim-url-handler
+%attr(755,root,root) %{_libdir}/gaim/musicmessaging.so
+%attr(755,root,root) %{_bindir}/gaim-send
+%attr(755,root,root) %{_bindir}/gaim-send-async
+%{_datadir}/dbus-1/services/gaim.service
+%endif
+%{_sysconfdir}/gconf/schemas/gaim.schemas
%{_datadir}/sounds/%{name}
+%{_mandir}/man?/*
-%files ui-gtk
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gaim
-%attr(755,root,root) %{_libdir}/gaim/iconaway.so
%{_desktopdir}/gaim.desktop
+%{_pixmapsdir}/*
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgaim.so.*.*.*
+%if %{with text}
+%attr(755,root,root) %{_libdir}/libgnt.so.*.*.*
+%endif
+%if %{with dbus}
+%attr(755,root,root) %{_libdir}/libgaim-client.so.*.*.*
+%endif
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgaim-remote.so
-%{_libdir}/libgaim-remote.la
+%if %{with dbus}
+%attr(755,root,root) %{_libdir}/libgaim-client.so
+%attr(755,root,root) %{_libdir}/libgaim.so
+%{_libdir}/libgaim-client.la
+%{_libdir}/libgaim.la
+%endif
+%{_aclocaldir}/*.m4
%dir %{_includedir}/gaim
%{_includedir}/gaim/*.h
%{_pkgconfigdir}/*
+%if %{with text}
+%attr(755,root,root) %{_libdir}/libgnt.so
+%{_libdir}/libgnt.la
+%dir %{_includedir}/gaim/gnt
+%dir %{_includedir}/gnt
+%{_includedir}/gaim/gnt/*.h
+%{_includedir}/gnt/*.h
+%endif
%files perl
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gaim/private/libgaimperl.so
%attr(755,root,root) %{_libdir}/gaim/perl.so
%{perl_vendorarch}/*.pm
%dir %{perl_vendorarch}/auto/Gaim
%{perl_vendorarch}/auto/Gaim/*.ix
%{perl_vendorarch}/auto/Gaim/*.bs
+%dir %{perl_vendorarch}/auto/Gaim/GtkUI
+%{perl_vendorarch}/auto/Gaim/GtkUI/*.bs
+%dir %{perl_vendorarch}/Gaim
+%{perl_vendorarch}/Gaim/*.pm
%attr(755,root,root) %{perl_vendorarch}/auto/Gaim/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Gaim/GtkUI/*.so
%files tcl
%defattr(644,root,root,755)
@@ -293,11 +389,11 @@
%attr(755,root,root) %{_libdir}/gaim/gevolution.so
%endif
+%if %{with dbus}
%files plugin-remote
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/gaim-remote
-%attr(755,root,root) %{_libdir}/libgaim-remote.so.0.0.0
-%attr(755,root,root) %{_libdir}/gaim/gaim-remote.so
+%endif
%if %{with doc}
%files doc
@@ -311,34 +407,99 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.163 2007/02/13 07:16:44 glen
-- tabs in preamble
+Revision 1.164 2007/03/23 15:30:48 radek
+- version 2.0.0 release 1.beta6.3: merged from DEVEL
+
+Revision 1.154.2.28 2007/03/23 15:23:52 radek
+- bcond_without meanwhile (BR: meanwhile-devel), BR: rpm-pythonprov
+
+Revision 1.154.2.27 2007/03/23 14:57:38 radek
+- BR: intltool, bind-devel
-Revision 1.162 2007/02/12 00:48:50 baggins
+Revision 1.154.2.26 2007/02/15 14:56:14 qrczak
+- Added missing libraries.
+- Release 1.beta6.2
+
+Revision 1.154.2.25 2007/02/12 13:20:12 baggins
- converted to UTF-8
-Revision 1.161 2006/05/21 15:20:01 freetz
-- rel.3 for rebuild with new libedataserver, STBR
+Revision 1.154.2.24 2007/02/09 20:42:12 radek
+- version 2.0.0 beta6
+- bcond --without cap
+- removed -desktop.patch (+- applied)
+- update %%files (so it can be built using misc --without)
+
+Revision 1.154.2.23 2007/01/12 13:25:35 radek
+- release 0._pre.2: bcond_without text for text ui
+
+Revision 1.154.2.22 2006/11/12 18:43:56 rotom
+- up to 2.0beta5
+
+Revision 1.154.2.21 2006/10/27 14:03:11 grzegol
+- updated to 2.0beta4
+- removed outdated libadd patch (applied upstream)
+
+Revision 1.154.2.20 2006/08/24 16:58:20 freetz
+- 2.0.0beta3.1, bump numbers to make it upgradeable
+
+Revision 1.154.2.19 2006/08/16 05:32:53 freetz
+- reverted bogus change
+
+Revision 1.154.2.18 2006/08/15 22:53:23 czarny
+ - BR dbus-glib-devel => dbus-devel
+
+Revision 1.154.2.17 2006/08/10 21:12:39 freetz
+- rel.2, bleeding edge deps, libadd patch added
+
+Revision 1.154.2.16 2006/06/24 21:54:11 freetz
+- remove unsupported locale
+
+Revision 1.154.2.15 2006/04/07 21:50:32 freetz
+- updated changelog
+
+Revision 1.154.2.14 2006/04/07 21:49:41 freetz
+- 2.0.0beta3, re-enabled dbus (works at last), added libgadu patch
+ removed va patch (already included)
+
+Revision 1.154.2.13 2006/02/16 17:47:08 freetz
+- disabled dbus support (works propably only in sommer [of code])
+
+Revision 1.154.2.12 2006/02/16 14:53:50 freetz
+- oops, one more dbus fix
+
+Revision 1.154.2.11 2006/02/16 14:40:29 freetz
+- fix dbus services dir
+
+Revision 1.154.2.10 2006/02/16 11:39:34 freetz
+- allow use of avahi-compat-howl
+
+Revision 1.154.2.9 2006/02/07 17:48:44 glen
+- add dbus dir patch
+
+Revision 1.154.2.8 2006/01/25 12:24:15 qboosh
+- fixed files inconsistency
+
+Revision 1.154.2.7 2006/01/25 07:27:56 aredridel
+- up to 2.0.0beta2
-Revision 1.160 2006/04/19 10:10:08 charles
-- -ui-gtk req. base
+Revision 1.154.2.6 2006/01/03 14:27:44 glen
+- fixed broken dbus build, added dbus bcond
-Revision 1.159 2005/12/20 17:16:57 glen
-- reverted, 2.0.0 has been started on DEVEL
+Revision 1.154.2.5 2006/01/03 13:35:24 glen
+- BR gettext-autopoint
-Revision 1.158 2005/12/20 17:04:32 aredridel
-- up to 2.0.0beta1
-- Builds, needs clean-up
+Revision 1.154.2.4 2005/12/19 21:07:30 qboosh
+- BR: dbus-glib-devel
-Revision 1.157 2005/10/05 12:43:59 arekm
-- rel 2
+Revision 1.154.2.3 2005/12/19 20:55:46 qboosh
+- added va patch
-Revision 1.156 2005/08/15 08:31:59 glen
-- 1.5.0 was security update; please STBR
+Revision 1.154.2.2 2005/12/19 15:25:00 freetz
+- 2.0.0beta1, BR/R/file list updated, dropped gtk-ui, added libs subpkg,
+ dbus stuff not packaged yet
-Revision 1.155 2005/08/12 18:55:39 jack
-- updated to 1.5.0
- fixes CAN-2005-2102, CAN-2005-2103
+Revision 1.154.2.1 2005/08/02 21:33:37 freetz
+- 2.0.0 devel series - 20050802 snap
Revision 1.154 2005/07/17 09:16:12 glen
- add missing line continuation
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gaim.spec?r1=1.163&r2=1.164&f=u
More information about the pld-cvs-commit
mailing list