[smuxi] Sub-packages re-arranged according to upstream

Fri Jan 23 13:52:17 UTC 2015

commit fbcbf5798a230d804e8e08a04c035999722bac56
Author: sagitter <sagitterATfedoraprojectDOTorg>
Date:   Fri Jan 23 14:52:35 2015 +0100

    Sub-packages re-arranged according to upstream

 smuxi.spec |   83 +++++++++++++++++++++++++++++-------------------------------
 1 files changed, 40 insertions(+), 43 deletions(-)
---

diff --git a/smuxi.spec b/smuxi.spec
index 83a49b3..ffc9eeb 100644
--- a/smuxi.spec
+++ b/smuxi.spec
@@ -3,18 +3,14 @@ ExclusiveArch: %ix86 x86_64 %{power64} ia64 sparcv9 alpha s390x
 
 %define debug_package %{nil}
 
-#%%global  checkout   eda4d97c6a25897593a4bb2a4a41d2930244efb3
-#%%global  date       20141223
-
 Name:  smuxi
 Summary: Powerful, flexible, user-friendly chat client 
 Version: 0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 ##Release: 1.%%{date}git%%(echo %%{checkout} | cut -c-6)%%{?dist}
 License: GPLv2+ and LGPLv2+ and BSD and ASL 2.0
 URL:   https://smuxi.im
 Source0: https://smuxi.im/jaws/data/files/smuxi-%{version}.tar.gz
-##Source0: https://github.com/meebey/smuxi/archive/%%{checkout}.zip#/smuxi-%%{checkout}.zip
 
 Source1: %{name}-APACHE-LICENSE-2.0.txt
 Source2: %{name}-lgpl-2.1.txt
@@ -25,10 +21,9 @@ BuildRequires: dbus-sharp-glib-devel, gtk-sharp2-devel, gio-sharp-devel
 BuildRequires: libappindicator-sharp-devel, notify-sharp-devel
 BuildRequires: ndesk-dbus-devel, intltool, desktop-file-utils
 
-Requires:  %{name}-engine%{?_isa} = %{version}-%{release}
-
 ##Fix appindicator-sharp package request
 Patch0: %{name}-fix_appindicator_sharp_calls.patch
+Obsoletes:      %{name}-devel <= 0:0.11-2 
 
 %description
 Smuxi is an open-source, powerful, flexible, and user-friendly chat client
@@ -40,26 +35,29 @@ STFL text-based front-end) to be connected and in sync.
 This is similar to screen+irssi or IRC bouncers, but more elegant and powerful.
 
 %package engine
-Summary:        Smart MUltipleXed Irc - Engine Library
+Summary:   Smart MUltipleXed Irc - Engine Library
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 %description engine
 Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform
-IRC, Twitter, XMPP, Jabber client for advanced users, 
-targeting the GNOME desktop.
+IRC, Twitter, XMPP, Jabber client for advanced users. These are its 
+engine libraries.
 
 %package frontend-stfl
-Summary:        Smart MUltipleXed Irc - STFL Frontend
-Requires:       %{name}-engine%{?_isa} = %{version}-%{release}
+Summary:   Smart MUltipleXed Irc - STFL Frontend
+Requires:  %{name}%{?_isa} = %{version}-%{release}
+Requires:  %{name}-engine%{?_isa} = %{version}-%{release}
 %description frontend-stfl
 Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform
 client for advanced users. This is a frontend for terminal
 by STFL.
 
-%package devel
-Summary:        Smuxi .pc files
-%description devel
+%package frontend-gnome
+Summary:   Smart MUltipleXed Irc - GNOME Frontend
+Requires:  %{name}%{?_isa} = %{version}-%{release}
+Requires:  %{name}-engine%{?_isa} = %{version}-%{release}
+%description frontend-gnome
 Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform
-IRC client for advanced users, targeting the GNOME desktop.
-This package provides all .pc files.
+client for advanced users. This is frontend for GNOME.
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -111,28 +109,17 @@ fi
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%files -f %{name}-frontend-gnome.lang -f %{name}-frontend.lang -f %{name}-frontend-gnome-irc.lang -f %{name}-frontend-gnome-twitter.lang -f %{name}-frontend-gnome-xmpp.lang -f %{name}-server.lang
-%{_bindir}/%{name}-frontend-gnome
-%{_bindir}/%{name}-server
-%dir %{_prefix}/lib/%{name}
-%{_prefix}/lib/%{name}/%{name}-frontend-gnome.exe*
-%{_prefix}/lib/%{name}/%{name}-frontend.dll*
-%{_prefix}/lib/%{name}/%{name}-frontend-gnome-irc.dll*
-%{_prefix}/lib/%{name}/%{name}-frontend-gnome-twitter.dll*
-%{_prefix}/lib/%{name}/%{name}-frontend-gnome-xmpp.dll*
-%{_prefix}/lib/%{name}/%{name}-server.exe*
-%{_mandir}/man1/%{name}-server.1*
-%{_mandir}/man1/%{name}-frontend-gnome.1*
-%{_datadir}/icons/hicolor/*/apps/smuxi-group-chat.png
-%{_datadir}/icons/hicolor/*/apps/smuxi-person-chat.png
-%{_datadir}/applications/%{name}-frontend-gnome.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}-frontend-gnome.*
-
-%files engine -f %{name}-engine.lang -f %{name}-engine-campfire.lang -f %{name}-engine-irc.lang -f %{name}-engine-jabbr.lang -f %{name}-engine-twitter.lang -f %{name}-engine-xmpp.lang
+%files 
 %doc BUGS TODO FEATURES CREDITS
 %license LICENSE
 %license lib/Twitterizer/*license.txt
 %license APACHE-LICENSE-2.0.txt lgpl-2.1.txt
+%dir %{_prefix}/lib/%{name}
+%{_prefix}/lib/pkgconfig/smuxi-common.pc
+
+%files engine -f %{name}-engine.lang -f %{name}-engine-campfire.lang -f %{name}-engine-irc.lang -f %{name}-engine-jabbr.lang -f %{name}-engine-twitter.lang -f %{name}-engine-xmpp.lang -f %{name}-server.lang -f %{name}-frontend.lang
+%{_bindir}/%{name}-server
+%{_prefix}/lib/%{name}/%{name}-server.exe*
 %{_prefix}/lib/%{name}/Db4objects.Db4o.dll*
 %{_prefix}/lib/%{name}/%{name}-engine.dll*
 %{_prefix}/lib/%{name}/%{name}-common.dll*
@@ -149,6 +136,10 @@ fi
 %{_prefix}/lib/%{name}/%{name}-engine-xmpp.dll*
 %{_prefix}/lib/%{name}/agsxmpp.dll*
 %{_prefix}/lib/%{name}/StarkSoftProxy.dll*
+%{_prefix}/lib/%{name}/%{name}-frontend.dll*
+%{_prefix}/lib/pkgconfig/smuxi-engine-irc.pc
+%{_prefix}/lib/pkgconfig/smuxi-engine.pc
+%{_mandir}/man1/%{name}-server.1*
 
 %files frontend-stfl
 %{_bindir}/smuxi-frontend-stfl
@@ -156,17 +147,23 @@ fi
 %{_prefix}/lib/smuxi/smuxi-frontend-stfl.exe.config
 %{_mandir}/man1/smuxi-frontend-stfl.1.*
 
-%files devel
-%doc BUGS TODO FEATURES CREDITS
-%license LICENSE
-%license lib/Twitterizer/*license.txt
-%license APACHE-LICENSE-2.0.txt lgpl-2.1.txt
-%{_prefix}/lib/pkgconfig/smuxi-common.pc
-%{_prefix}/lib/pkgconfig/smuxi-engine-irc.pc
-%{_prefix}/lib/pkgconfig/smuxi-engine.pc
+%files frontend-gnome -f %{name}-frontend-gnome.lang -f %{name}-frontend-gnome-irc.lang -f %{name}-frontend-gnome-twitter.lang -f %{name}-frontend-gnome-xmpp.lang
+%{_bindir}/%{name}-frontend-gnome
+%{_prefix}/lib/%{name}/%{name}-frontend-gnome.exe*
+%{_prefix}/lib/%{name}/%{name}-frontend-gnome-irc.dll*
+%{_prefix}/lib/%{name}/%{name}-frontend-gnome-twitter.dll*
+%{_prefix}/lib/%{name}/%{name}-frontend-gnome-xmpp.dll*
+%{_mandir}/man1/%{name}-frontend-gnome.1*
+%{_datadir}/icons/hicolor/*/apps/smuxi-group-chat.png
+%{_datadir}/icons/hicolor/*/apps/smuxi-person-chat.png
+%{_datadir}/applications/%{name}-frontend-gnome.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}-frontend-gnome.*
 %{_prefix}/lib/pkgconfig/smuxi-frontend.pc
 
 %changelog
+* Fri Jan 23 2015 Antonio Trande <sagitterATfedoraproject.org> 0.11-3
+- Sub-packages re-arranged according to upstream
+
 * Fri Jan 02 2015 Antonio Trande <sagitterATfedoraproject.org> 0.11-2
 - Fixed multi-License
 
