SPECS: gossip.spec - merged from DEVEL branch

[freetz]

Author: freetz                       Date: Sun Aug 14 17:39:48 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL branch

---- Files affected:
SPECS:
   gossip.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/gossip.spec
diff -u SPECS/gossip.spec:1.46 SPECS/gossip.spec:1.47
--- SPECS/gossip.spec:1.46	Mon Jul 11 18:42:21 2005
+++ SPECS/gossip.spec	Sun Aug 14 19:39:43 2005
@@ -2,31 +2,30 @@
 Summary:	Very easy to use GNOME Jabber client
 Summary(pl):	Bardzo prosty w użyciu klient Jabbera dla GNOME
 Name:		gossip
-Version:	0.8
-Release:	3
+Version:	0.9
+Release:	1
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gossip/0.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	8bbe3dac8d0da7e0b936971a01545f14
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gossip/0.9/%{name}-%{version}.tar.bz2
+# Source0-md5:	af017e1652a96009d30eeeead2dd4ef9
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-roster-not-found.patch
 URL:		http://gossip.imendio.org/
+BuildRequires:	aspell-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gnome-common >= 2.8.0
 BuildRequires:	gnutls-devel >= 1.2.5
-BuildRequires:	gtk+2-devel >= 1:2.0.4
+BuildRequires:	gtk+2-devel >= 1:2.6.0
 BuildRequires:	intltool >= 0.23
 BuildRequires:	libglade2-devel >= 2.0.0
 BuildRequires:	libgnomeui-devel >= 2.3.3.1-2
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel
-BuildRequires:	libxslt-devel
-BuildRequires:	loudmouth-devel >= 0.17
-BuildRequires:	dbus-glib-devel >= 0.22
-Requires(post):	GConf2 >= 2.3.0
-Requires(post):	scrollkeeper
-Requires:	dbus >= 0.22-3
+BuildRequires:	libxml2-devel >= 1:2.6.19
+BuildRequires:	loudmouth-devel >= 1.0
+BuildRequires:  rpmbuild(macros) >= 1.197
+Requires(post,preun):   GConf2
+Requires(post,postun):  scrollkeeper
+Requires:	loudmouth >= 1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,18 +39,16 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-glib-gettextize --copy --force
+%{__glib_gettextize}
 %{__libtoolize}
-intltoolize --copy --force
+%{__intltoolize}
 %{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-%configure \
-	--enable-dbus
+%configure
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,19 +65,25 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install
-/usr/bin/scrollkeeper-update
+%gconf_schema_install gossip.schemas
+%scrollkeeper_update_post
 
-%postun -p /usr/bin/scrollkeeper-update
+%preun
+%gconf_schema_uninstall gossip.schemas
+
+%postun
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
-%{_sysconfdir}/gconf/schemas/*
+%doc AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
+%{_datadir}/sounds/gossip
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/gossip.png
+%{_sysconfdir}/gconf/schemas/gossip.schemas
+%{_sysconfdir}/sound/events/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -88,8 +91,30 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.46  2005/07/11 16:42:21  arekm
-BR gnutls >= 1.2.5
+Revision 1.47  2005/08/14 17:39:43  freetz
+- merged from DEVEL branch
+
+Revision 1.45.2.7  2005/08/14 17:26:40  freetz
+- even more BRs
+
+Revision 1.45.2.6  2005/08/14 17:24:04  freetz
+- cleanup, updated BRs/Rs
+
+Revision 1.45.2.5  2005/08/14 17:20:05  freetz
+- 0.9, will be merged to HEAD shortly
+
+Revision 1.45.2.4  2005/07/24 09:18:52  freetz
+- md5
+
+Revision 1.45.2.3  2005/07/23 11:46:48  freetz
+- snap 20050723, dropped dbus support (experimental, broken, etc.),
+  %%files update
+
+Revision 1.45.2.2  2005/04/13 08:33:31  freetz
+- snap 20050413
+
+Revision 1.45.2.1  2005/04/08 09:28:22  freetz
+- 0.8.90, new style macros, updated BRs/Rs, more %%doc
 
 Revision 1.45  2005/01/08 03:30:12  wrobell
 - rel. 2 due to fixed bug when non-existing contact is entered
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gossip.spec?r1=1.46&r2=1.47&f=u