rpms/gajim/devel .cvsignore, 1.17, 1.18 gajim.spec, 1.36, 1.37 sources, 1.17, 1.18

Fri Feb 5 14:25:54 UTC 2010

Author: michich

Update of /cvs/pkgs/rpms/gajim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31592

Modified Files:
	.cvsignore gajim.spec sources 
Log Message:
* Fri Feb 05 2010 Michal Schmidt <mschmidt at redhat.com> - 0.13.2-1
- Version bump to 0.13.2. (RHBZ#541470)
- 0.13.1 and 0.13.2 are bugfix releases.
- New in 0.13:
  * BOSH connection support
  * Roster versioning support
  * Interface to send XHTML messages
  * Changelog: http://hg.gajim.org/gajim/file/cb35a23ac836/ChangeLog
  * Bugs fixed: http://trac.gajim.org/query?status=closed&milestone=0.13
- 'idle' and 'gtkspell' modules are now implemented in Python using ctype.
- Internal 'trayicon' module is not necessary with gnome-python2-desktop.
- With no more binary modules included the package is now noarch.
- Require python-libasyncns for src/common/resolver.py.
- --enable-remote is no longer recognized by ./configure.
- Hardlink identical scripts.
- Remove fc8, fc9 support.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18

--- .cvsignore	19 Sep 2009 13:32:42 -0000	1.17
+++ .cvsignore	5 Feb 2010 14:25:54 -0000	1.18
@@ -1 +1 @@
-gajim-0.12.5.tar.bz2
+gajim-0.13.2.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gajim.spec	19 Sep 2009 13:32:42 -0000	1.36
+++ gajim.spec	5 Feb 2010 14:25:54 -0000	1.37
@@ -1,27 +1,23 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 Summary:	Jabber client written in PyGTK
 Name:		gajim
-Version:	0.12.5
+%global		majorver 0.13
+Version:	0.13.2
 Release:	1%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
-Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.bz2
-
+Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
+BuildArch:	noarch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	avahi-tools
 Requires:	bind-utils
 Requires:	dbus-python
 
-%if 0%{?fc8}%{?fc9}
-%else
 Requires:	gnome-python2-gnome
-%endif
-
 Requires:	gnome-python2-bonobo
 Requires:	gnome-python2-canvas
+Requires:	gnome-python2-desktop
 Requires:	gnupg
 Requires:	notify-python
 Requires:	pygtk2-libglade
@@ -31,29 +27,29 @@ Requires:	python-docutils
 Requires:	python-GnuPGInterface
 Requires:	python-kerberos
 Requires:	python-sexy
+Requires:	python-libasyncns
+# these are dlopen'd using ctypes find_library/LoadLibrary
+Requires:	gtkspell
+Requires:	libXScrnSaver
 
-BuildRequires:	dbus-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gtk2-devel
-BuildRequires:	gtkspell-devel
 BuildRequires:	intltool
-BuildRequires:	libXScrnSaver-devel
 BuildRequires:	pygtk2-devel
+BuildRequires:	hardlink
 
 %description
 Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is
 to provide a full featured and easy to use xmpp client for the GTK+ users.
-Gajim does not require GNOME to run, eventhough it exists with it nicely.
+Gajim does not require GNOME to run, even though it exists with it nicely.
 
 %prep
 %setup -q
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version} \
-  --libdir=%{python_sitearch} \
-  --disable-static --enable-remote --enable-gtkspell --enable-idle \
-  --enable-trayicon
+  --disable-static --disable-trayicon
 
 make %{?_smp_mflags}
 
@@ -61,8 +57,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
-
-rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la
+hardlink -c $RPM_BUILD_ROOT/%{_bindir}
 
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -96,12 +91,24 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/data
 %{_datadir}/%{name}/src
 
-%dir %{python_sitearch}/%{name}
-%{python_sitearch}/%{name}/gtkspell.so
-%{python_sitearch}/%{name}/idle.so
-%{python_sitearch}/%{name}/trayicon.so
-
 %changelog
+* Fri Feb 05 2010 Michal Schmidt <mschmidt at redhat.com> - 0.13.2-1
+- Version bump to 0.13.2. (RHBZ#541470)
+- 0.13.1 and 0.13.2 are bugfix releases.
+- New in 0.13:
+  * BOSH connection support
+  * Roster versioning support
+  * Interface to send XHTML messages
+  * Changelog: http://hg.gajim.org/gajim/file/cb35a23ac836/ChangeLog
+  * Bugs fixed: http://trac.gajim.org/query?status=closed&milestone=0.13
+- 'idle' and 'gtkspell' modules are now implemented in Python using ctype.
+- Internal 'trayicon' module is not necessary with gnome-python2-desktop.
+- With no more binary modules included the package is now noarch.
+- Require python-libasyncns for src/common/resolver.py.
+- --enable-remote is no longer recognized by ./configure.
+- Hardlink identical scripts.
+- Remove fc8, fc9 support.
+
 * Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.5-1
 - Version bump to 0.12.5. (Red Hat Bugzilla #516191)
   * Fixed history manager.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	19 Sep 2009 13:32:42 -0000	1.17
+++ sources	5 Feb 2010 14:25:54 -0000	1.18
@@ -1 +1 @@
-aef65fc0b0f993f322ee970f6deb7508  gajim-0.12.5.tar.bz2
+91606788f4d846b2d9c48abf8ec0781c  gajim-0.13.2.tar.bz2

