From fb9d8d23b7ccad7837297367c053253f4229a1e8 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Jul 14 2008 16:55:53 +0000
Subject: Fixed Spec in F-8, F-9 and devel.

Modified Files: F-8/gajim.spec F-9/gajim.spec devel/gajim.spec

---

diff --git a/gajim.spec b/gajim.spec
index 31c63b4..7e24b9e 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,99 +1,90 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Name:           gajim
-Version:        0.11.4
-Release:        2%{?dist}
-Summary:        Jabber client written in PyGTK
-
-Group:          Applications/Internet
-License:        GPLv2
-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.8.0
-
-Requires:       bind-utils
-Requires:       dbus-python
-#Requires:       gnome-python2-gconf
-Requires:       pygtk2-libglade
-Requires:       python-docutils
+Summary:	Jabber client written in PyGTK
+Name:		gajim
+Version:	0.11.4
+Release:	2%{?dist}
+License:	GPLv2
+Group:		Applications/Internet
+URL:		http://gajim.org/
+Source0:	http://gajim.org/downloads/gajim-%{version}.tar.bz2
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:	bind-utils
+Requires:	dbus-python
+#Requires:	gnome-python2-gconf
+Requires:	pygtk2-libglade
+Requires:	python-docutils
+
+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.8.0
 
 %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
 
-
 %build
 %configure \
-        --disable-dependency-tracking \
-        --disable-static \
-        --enable-remote \
-        --enable-gtkspell \
-        --enable-idle \
-        --enable-trayicon \
-        --libdir="%{python_sitearch}"
-
-make \
-        %{?_smp_mflags}
+  --disable-dependency-tracking \
+  --disable-static \
+  --enable-remote \
+  --enable-gtkspell \
+  --enable-idle \
+  --enable-trayicon \
+  --libdir=%{python_sitearch}
 
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-rm -rf %{buildroot}%{python_sitearch}/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
+# silence rpmlint warnings
+chmod +x %{buildroot}%{_datadir}/%{name}/src/{gajim{,-remote},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
+%{_bindir}/%{name}
+%{_bindir}/%{name}-remote
 %dir %{python_sitearch}/gajim/
-%{python_sitearch}/gajim/gtkspell.so
-%{python_sitearch}/gajim/idle.so
-%{python_sitearch}/gajim/trayicon.so
+%{python_sitearch}/%{name}/gtkspell.so
+%{python_sitearch}/%{name}/idle.so
+%{python_sitearch}/%{name}/trayicon.so
 %{_datadir}/applications/*gajim.desktop
-%{_datadir}/gajim/
+%{_datadir}/%{name}/
 %{_datadir}/pixmaps/gajim*
-%{_docdir}/gajim/
+%{_docdir}/%{name}/
 %{_mandir}/man1/gajim.1*
 %{_mandir}/man1/gajim-remote.1*
 
-
 %changelog
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.11.4-2
-- Autorebuild for GCC 4.3
+- Autorebuild for gcc-4.3.
 
 * Wed Dec 26 2007 Matěj Cepl <mcepl@redhat.com> 0.11.4-1
 - New upstream release.