[x-tile/f15] - Update to 1.9 - Only provide the "no applet" version of x-tile since the applet is no loger supp

[Mohamed ElMorabity]

commit 2055a2b15b34abadbdf66afa3081c9bc282a02e8
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Sun Jun 26 14:53:23 2011 +0200

    - Update to 1.9
    - Only provide the "no applet" version of x-tile since the applet is no loger
      supported by GNOME 3
    - merge all former subpackages into a single one

 .gitignore  |    1 +
 sources     |    2 +-
 x-tile.spec |   90 +++++++++++++++++++----------------------------------------
 3 files changed, 31 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69aeffa..c8afe5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ x-tile-1.5.2.tar.gz
 /x-tile-1.8.4.tar.gz
 /x-tile-1.8.5.tar.gz
 /x-tile-1.8.6.tar.gz
+/x-tile-1.9.tar.gz
diff --git a/sources b/sources
index 82038a8..339e193 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5176ceda20028e42b6aa6e40de7415cc  x-tile-1.8.6.tar.gz
+e7439fefdba9b57d0b75586ab3e8d9cb  x-tile-1.9.tar.gz
diff --git a/x-tile.spec b/x-tile.spec
index b45663a..bbb13ac 100644
--- a/x-tile.spec
+++ b/x-tile.spec
@@ -1,7 +1,7 @@
 Name:           x-tile
-Version:        1.8.6
+Version:        1.9
 Release:        1%{?dist}
-Summary:        A GNOME panel applet to tile windows in different ways
+Summary:        A GTK application to tile windows in different ways
 
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -11,53 +11,23 @@ Source0:        http://www.giuspen.com/software/%{name}-%{version}.tar.gz
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  python-setuptools
-Requires:       gnome-python2-applet
-# Owns /usr/lib/bonobo/servers
-Requires:       libbonobo
-Requires:       %{name}-common = %{version}-%{release}
-BuildArch:      noarch
-
-%description
-X-tile is a GNOME applet for your panel (or optionally a standalone application)
-that allows you to select a number of windows and tile them in different
-ways. This is especially useful for comparing products in separate web pages, or
-for programmers referring to documentation as they are programming.
-
-
-%package common
-Summary:        X-tile common files
-Group:          User Interface/Desktops
 Requires:       gnome-python2-gconf
 Requires:       pygtk2
+Provides:       %{name}-common = %{version}-%{release}
+Provides:       %{name}-ng = %{version}-%{release}
+Obsoletes:      %{name}-common < %{version}-%{release}
+Obsoletes:      %{name}-ng < %{version}-%{release}
 BuildArch:      noarch
 
-%description common
-X-tile is a GNOME applet for your panel (or optionally a standalone application)
-that allows you to select a number of windows and tile them in different
-ways. This is especially useful for comparing products in separate web pages, or
-for programmers referring to documentation as they are programming.
-
-This package contains all the common files needed by x-tile or x-tile-ng.
-
-
-%package ng
-Summary:        A GTK application to tile windows in different ways
-Group:          User Interface/Desktops
-Requires:       %{name}-common = %{version}-%{release}
-BuildArch:      noarch
-
-%description ng
-X-tile is a GNOME applet for your panel (or optionally a standalone application)
-that allows you to select a number of windows and tile them in different
-ways. This is especially useful for comparing products in separate web pages, or
-for programmers referring to documentation as they are programming.
-
-This package contains a desktop-independent version of X-tile, which doesn't
-require the GNOME panel and works only without the applet
+%description
+X-tile is a GTK application that allows you to select a number of windows and
+tile them in different ways. This is especially useful for comparing products in
+separate web pages, or for programmers referring to documentation as they are
+programming.
 
 
 %prep
-%setup -q -n %{name}_%{version}
+%setup -q
 
 # Remove import of cons module in setup.py, only needed to get the current
 # version of x-tile and supported languages. The cons module calls the gtk one,
@@ -72,42 +42,40 @@ sed -i "s|cons.AVAILABLE_LANGS|$LANGUAGES|" setup.py
 
 
 %install
-%{__python} setup.py install \
-  --no-compile \
-  --root $RPM_BUILD_ROOT
-
+# Only the "ng" version is provided since the GNOME 2 applets are no longer
 %{__python} setup.py --no-panel-applet install \
   --no-compile \
   --root $RPM_BUILD_ROOT
 
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-ng.desktop
+# Link to former x-tile executable to x-tile-ng
+ln -s %{name}-ng $RPM_BUILD_ROOT%{_bindir}/%{name}
 
-%find_lang %{name}
+# Remove useless header
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/glade/*.h
 
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-ng.desktop
 
-%files
-%defattr(-,root,root,-)
-%{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_prefix}/lib/bonobo/servers/*.server
+%find_lang %{name}
 
 
-%files -f %{name}.lang common
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc license
+%{_bindir}/%{name}
+%{_bindir}/%{name}-ng
 %{_datadir}/%{name}
+%{_datadir}/applications/%{name}-ng.desktop
 %{_datadir}/pixmaps/*.svg
 %{python_sitelib}/*.egg-info
 
 
-%files ng
-%defattr(-,root,root,-)
-%{_bindir}/%{name}-ng
-%{_datadir}/applications/%{name}-ng.desktop
-
-
 %changelog
+* Sun Jun 26 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.9-1
+- Update to 1.9
+- Only provide the "no applet" version of x-tile since the applet is no loger
+  supported by GNOME 3
+- merge all former subpackages into a single one
+
 * Thu Mar 17 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.8.6-1
 - Update to 1.8.6