SPECS (DEVEL): gajim.spec - updated to 0.11.4.4 snap 20070829 - merged chan...

[paszczus]

Author: paszczus                     Date: Tue Jul 22 07:33:27 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- updated to 0.11.4.4 snap 20070829
- merged changes from HEAD

---- Files affected:
SPECS:
   gajim.spec (1.21.2.56 -> 1.21.2.57) 

---- Diffs:

================================================================
Index: SPECS/gajim.spec
diff -u SPECS/gajim.spec:1.21.2.56 SPECS/gajim.spec:1.21.2.57
--- SPECS/gajim.spec:1.21.2.56	Thu Aug 30 23:09:57 2007
+++ SPECS/gajim.spec	Tue Jul 22 09:33:22 2008
@@ -1,16 +1,16 @@
 # $Revision$, $Date$
-%define		snap	20070829
-%define		snap_date	2007-08-29
+%define		snap	20080722
+%define		snap_date	2008-07-22
 Summary:	A Jabber client written in PyGTK
-Summary(pl.UTF-8):   Klient Jabbera napisany w PyGTK
+Summary(pl.UTF-8):	Klient Jabbera napisany w PyGTK
 Name:		gajim
-Version:	0.11.1.5
+Version:	0.11.4.4
 Release:	0.%{snap}.1
 Epoch:		1
 License:	GPL v2
 Group:		Applications/Communications
 Source0:	http://www.gajim.org/downloads/snap/%{name}-%{snap_date}.tar.gz
-# Source0-md5:	a8f1fc330d392569239ac5aa577bdf02
+# Source0-md5:	36e5cc8945a28817af9d6b73e22bad15
 URL:		http://www.gajim.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -19,21 +19,25 @@
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	python-pygtk-devel >= 2.8.0
-BuildRequires:	rpmbuild(macros) >= 1.177
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.177
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libXScrnSaver-devel
 %pyrequires_eq	python-modules
 %pyrequires_eq	python
-Requires:	python-docutils >= 0.4-2
 Requires:	python-dns
+Requires:	python-docutils >= 0.4-2
 Requires:	python-pygtk-glade >= 2.8.0
+Requires:	python-sqlite
+Suggests:	gpgme >= 1.0.0
 Suggests:	python-avahi
 Suggests:	python-dbus >= 0.82.1
 Suggests:	python-gnome-desktop-keyring
 Suggests:	python-gnome-gconf
 Suggests:	python-pyOpenSSL
 Suggests:	python-sqlite
+# sr at Latn vs. sr at latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,7 +53,7 @@
 działa z nim ładnie.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-svn
 
 %build
 %{__intltoolize}
@@ -58,7 +62,7 @@
 %{__autoheader}
 %{__autoconf}
 %{__automake}
-%{configure}
+%configure
 %{__make} \
 	CC="%{__cc}" \
 	PREFIX=%{_prefix} \
@@ -73,9 +77,10 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{setup_win32.pyo}
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/gl_ES
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name}
 
 %clean
@@ -98,6 +103,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21.2.57  2008/07/22 07:33:22  paszczus
+- updated to 0.11.4.4 snap 20070829
+- merged changes from HEAD
+
 Revision 1.21.2.56  2007/08/30 21:09:57  patrys
 - current snap
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gajim.spec?r1=1.21.2.56&r2=1.21.2.57&f=u