rpms/gajim/EL-5 .cvsignore, 1.10, 1.11 gajim.spec, 1.16, 1.17 sources, 1.10, 1.11

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/gajim/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23954

Modified Files:
	.cvsignore gajim.spec sources 
Log Message:
* Wed Mar 11 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.1-1.el5.1
- Took the current version of Gajim and modified the spec for EL-5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Feb 2007 12:37:25 -0000	1.10
+++ .cvsignore	11 Mar 2009 16:21:51 -0000	1.11
@@ -1 +1 @@
-gajim-0.11.1.tar.bz2
+gajim-0.12.1.tar.gz


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/EL-5/gajim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gajim.spec	24 Feb 2007 12:37:25 -0000	1.16
+++ gajim.spec	11 Mar 2009 16:21:51 -0000	1.17
@@ -1,96 +1,166 @@
-Name:           gajim
-Version:        0.11.1
-Release:        1%{?dist}
-Summary:        Jabber client written in PyGTK
-
-Group:          Applications/Internet
-License:        GPL
-URL:            http://gajim.org/
-Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  dbus-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
-BuildRequires:  gtk2-devel
-BuildRequires:  gtkspell-devel
-BuildRequires:  intltool
-BuildRequires:  libXScrnSaver-devel
-BuildRequires:  pkgconfig
-BuildRequires:  pygtk2-devel >= 2.6.0
-
-Requires:       bind-utils
-Requires:       dbus-python
-#Requires:       gnome-python2-gconf
-Requires:       pygtk2-libglade
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:       python-sqlite2
+%{!?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.1
+Release:	1%{?dist}.1
+License:	GPLv2
+Group:		Applications/Internet
+URL:		http://gajim.org/
+Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.gz
+
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires:	avahi-tools
+Requires:	bind-utils
+Requires:	dbus-python
+
+%if 0%{?fc8}%{?fc9}%{?rhel}
+%else
+Requires:	gnome-python2-gnome
+%endif
+
+Requires:	gnome-python2-canvas
+Requires:	notify-python
+Requires:	pygtk2-libglade
+Requires:	pyOpenSSL
+Requires:	python-docutils
+Requires:	python-kerberos
+%if 0%{?fedora}
+Requires:	python-sexy
+%endif
+%if 0%{?rhel}
+Requires:	python-sqlite2
+%endif
+
+BuildRequires:	dbus-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	gtk2-devel
+BuildRequires:	gtkspell-devel
+BuildRequires:	intltool
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	pygtk2-devel
 
 %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.
 
-
 %prep
 %setup -q
 
+# Suppress error.
+sed --in-place --expression '1d' ./src/gajim.py
+sed --in-place --expression '1d' ./src/gajim-remote.py
 
 %build
-%configure \
-        --disable-dependency-tracking \
-        --disable-static \
-        --enable-remote \
-        --enable-gtkspell \
-        --enable-idle \
-        --enable-trayicon
-
-make \
-        %{?_smp_mflags}
+%configure --docdir=%{_docdir}/%{name}-%{version} \
+  --libdir=%{python_sitearch} \
+  --disable-static --enable-remote --enable-gtkspell --enable-idle \
+  --enable-trayicon
 
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-rm -rf %{buildroot}%{_libdir}/gajim/*.la
+make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 
-# silence rpmlint warnings
-chmod +x %{buildroot}%{_datadir}/gajim/src/{gajim{,-remote},history_manager}.py
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la
 
-desktop-file-install \
-        --dir %{buildroot}%{_datadir}/applications \
-        --remove-category=Application \
-        --vendor=fedora \
-        --delete-original \
-        %{buildroot}%{_datadir}/applications/gajim.desktop
+# Suppress rpmlint error.
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/src/history_manager.py
 
+desktop-file-install --vendor fedora --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --remove-category=Application \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
 
-
 %clean
 rm -rf %{buildroot}
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_bindir}/gajim
-%{_bindir}/gajim-remote
-%dir %{_libdir}/gajim/
-%{_libdir}/gajim/gtkspell.so
-%{_libdir}/gajim/idle.so
-%{_libdir}/gajim/trayicon.so
-%{_datadir}/applications/*gajim.desktop
-%{_datadir}/gajim/
-%{_datadir}/pixmaps/gajim*
-%{_docdir}/gajim/
-%{_mandir}/man1/gajim.1*
-%{_mandir}/man1/gajim-remote.1*
+%doc AUTHORS
+%doc ChangeLog
+%doc COPYING
+%doc README.html
+%doc THANKS
+%doc %{_mandir}/man1/%{name}.1*
+%doc %{_mandir}/man1/%{name}-remote.1*
+%{_bindir}/%{name}
+%{_bindir}/%{name}-remote
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}_about.png
+
+%dir %{_datadir}/%{name}
+%{_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
+* Wed Mar 11 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.1-1.el5.1
+- Took the current version of Gajim and modified the spec for EL-5.
+
+* Tue Dec 23 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.12.1-1
+- Version bump to 0.12.1.
+- /usr/share/gajim/src/gajim-{remote}.py need not contain shebangs nor have the
+  executable bits.
+
+* Thu Dec 18 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.12-1
+- Version bump to 0.12.
+- Added 'Requires: notify-python python-kerberos'.
+
+* Sun Nov 30 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.12-0.1.beta1
+- Version bump to 0.12 beta1. Closes Red Hat Bugzilla bug #471295.
+- Added 'Requires: pyOpenSSL'. Addresses Red Hat Bugzilla bug #467523.
+- Added 'Requires: python-sexy'.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.11.4-7
+- Rebuilding with python-2.6 in Rawhide.
+
+* Sun Nov 09 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.11.4-6
+- Added 'Requires: gnome-python2-gnome' on all distributions starting from
+  Fedora 10. Closes Red Hat Bugzilla bug #470181.
+
+* Tue Oct 28 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.11.4-5
+- Added 'Requires: avahi-tools'.
+
+* Mon Jul 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.11.4-4
+- Rebuilding to overcome Koji outage.
+
+* Mon Jul 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.11.4-3
+- Updated BuildRoot according to Fedora packaging guidelines.
+- Added 'Requires: gnome-python2-canvas'. Closes Red Hat Bugzilla bug #454622.
+- Removed 'BuildRequires: pkgconfig' and dropped version from
+  'BuildRequires: pygtk2-devel'.
+- Fixed docdir and removed empty README.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.11.4-2
+- Autorebuild for gcc-4.3.
+
+* Wed Dec 26 2007 Matěj Cepl <mcepl at redhat.com> 0.11.4-1
+- New upstream release.
+
+* Sun Nov 25 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 0.11.3-2
+- Fix problem with python(abi)
+- Add Requires: python-docutils
+
+* Sun Nov 18 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 0.11.3-1
+- Update to 0.11.3 (#315931)
+- Fix Licence tag
+
 * Fri Feb 23 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 0.11.1-1
 - Update to 0.11.1
+- Remove python-sqlite2 dependency (it's now provided by python-2.5)
 
 * Tue Jan 23 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 0.11.1-0.1.pre1
 - Update to 0.11.1-pre1
@@ -98,6 +168,9 @@
 * Sun Jan 14 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 0.11-1
 - Update to 0.11
 
+* Thu Dec 21 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.10.1-4
+- Rebuild for new Python.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.10.1-3
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	24 Feb 2007 12:37:25 -0000	1.10
+++ sources	11 Mar 2009 16:21:51 -0000	1.11
@@ -1 +1 @@
-cc587e7617f53ae8d5e0b30d7324e89c  gajim-0.11.1.tar.bz2
+195a7973d3fbfb538e2ee74156aa6e9e  gajim-0.12.1.tar.gz