- up to 2.0.5

- jabber_login.patch not needed anymore

Changed files:
    gg2.spec -> 1.114

diff --git a/gg2.spec b/gg2.spec
index dd8ee93968692a2d2ced060b2fd9746f19506957..3b854f9e0763b66d414a9d0840b3ece305ed04b9 100644 (file)
--- a/gg2.spec
+++ b/gg2.spec
@@ -9,14 +9,13 @@ Summary:      GNU Gadu 2 - free talking
 Summary(es):   GNU Gadu 2 - charlar libremente
 Summary(pl):   GNU Gadu 2 - wolne gadanie
 Name:          gg2
-Version:       2.0.4
+Version:       2.0.5
 Release:       1
 Epoch:         3
 License:       GPL v2+
 Group:         Applications/Communications
-Source0:       http://osdn.dl.sourceforge.net/sourceforge/ggadu/%{name}-%{version}.tar.bz2
-# Source0-md5: 4b523493d4f66f05a9f6c3c47df8353f
-Patch0:                %{name}-jabber_login.patch
+Source0:       http://osdn.dl.sourceforge.net/sourceforge/ggadu/%{name}-%{version}.tar.gz
+# Source0-md5: b9538ac14b501e920134a1fe264e6099
 URL:           http://www.gnugadu.org/
 %{?with_arts:BuildRequires:    arts-devel}
 BuildRequires: autoconf
@@ -24,7 +23,7 @@ BuildRequires:        automake >= 1.7
 %{?with_esd:BuildRequires:     esound-devel >= 0.2.7}
 BuildRequires: gettext-devel >= 0.11.0
 BuildRequires: glib2-devel  >= 2.2.0
-BuildRequires: gtk+2-devel  >= 2.2.0
+BuildRequires: gtk+2-devel  >= 2.4.0
 BuildRequires: libtlen-devel
 BuildRequires: libtool
 BuildRequires: loudmouth-devel >= 0.16-4
@@ -351,7 +350,6 @@ Motywy graficzne dla GUI GNU Gadu 2.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 rm -f missing
@@ -373,12 +371,12 @@ rm -f missing
        --with-docklet_system_tray \
        --with-docklet_dockapp \
        --with%{!?with_esd:out}-esd \
+       --with%{!?with_arts:out}-arts \
        --with-oss \
        --with-external \
        --with-update \
        --with-history-external-viewer \
        --with-gghist \
-       --with%{!?with_arts:out}-arts \
        --with%{!?with_gtkspell:out}-gtkspell \
        --%{?with_perl:with}%{!?with_perl:without}-perl \
        --with-remote
@@ -503,6 +501,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/gg2/pixmaps/icons/classic
 %dir %{_datadir}/gg2/pixmaps/icons/modern
 %dir %{_datadir}/gg2/pixmaps/icons/rozgwiazda
+%dir %{_datadir}/gg2/pixmaps/icons/ghosts
+%dir %{_datadir}/gg2/pixmaps/icons/tlen-classic
 %{_datadir}/gg2/pixmaps/icons/bubble/*.png
 %{_datadir}/gg2/pixmaps/icons/bubble/README
 %{_datadir}/gg2/pixmaps/icons/classic/*.png
@@ -513,5 +513,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gg2/pixmaps/icons/rozgwiazda/license.txt
 %{_datadir}/gg2/pixmaps/icons/ghosts/*.png
 %{_datadir}/gg2/pixmaps/icons/ghosts/README
-%{_datadir}/gg2/pixmaps/icons/tlen-3d/README
-%{_datadir}/gg2/pixmaps/icons/tlen-3d/*.png
+%{_datadir}/gg2/pixmaps/icons/tlen-classic/*.png