rpms/gajim/devel gajim.spec,1.18,1.19

Dawid Gajownik (gajownik) fedora-extras-commits at redhat.com
Sun Nov 25 21:15:36 UTC 2007


Author: gajownik

Update of /cvs/pkgs/rpms/gajim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15827

Modified Files:
	gajim.spec 
Log Message:
- Fix problem with python(abi)
- Add Requires: python-docutils



Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gajim.spec	18 Nov 2007 00:46:15 -0000	1.18
+++ gajim.spec	25 Nov 2007 21:15:04 -0000	1.19
@@ -1,6 +1,8 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Name:           gajim
 Version:        0.11.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
@@ -23,7 +25,7 @@
 Requires:       dbus-python
 #Requires:       gnome-python2-gconf
 Requires:       pygtk2-libglade
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-docutils
 
 %description
 Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is
@@ -42,7 +44,8 @@
         --enable-remote \
         --enable-gtkspell \
         --enable-idle \
-        --enable-trayicon
+        --enable-trayicon \
+        --libdir="%{python_sitearch}"
 
 make \
         %{?_smp_mflags}
@@ -52,7 +55,7 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-rm -rf %{buildroot}%{_libdir}/gajim/*.la
+rm -rf %{buildroot}%{python_sitearch}/gajim/*.la
 
 # silence rpmlint warnings
 chmod +x %{buildroot}%{_datadir}/gajim/src/{gajim{,-remote},history_manager}.py
@@ -76,10 +79,10 @@
 %defattr(-,root,root,-)
 %{_bindir}/gajim
 %{_bindir}/gajim-remote
-%dir %{_libdir}/gajim/
-%{_libdir}/gajim/gtkspell.so
-%{_libdir}/gajim/idle.so
-%{_libdir}/gajim/trayicon.so
+%dir %{python_sitearch}/gajim/
+%{python_sitearch}/gajim/gtkspell.so
+%{python_sitearch}/gajim/idle.so
+%{python_sitearch}/gajim/trayicon.so
 %{_datadir}/applications/*gajim.desktop
 %{_datadir}/gajim/
 %{_datadir}/pixmaps/gajim*
@@ -87,7 +90,12 @@
 %{_mandir}/man1/gajim.1*
 %{_mandir}/man1/gajim-remote.1*
 
+
 %changelog
+* 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




More information about the fedora-extras-commits mailing list