rpms/gg2/F-8 gg2-desktop.patch,1.1,1.2 gg2.spec,1.4,1.5

Dominik Mierzejewski (rathann) fedora-extras-commits at redhat.com
Sun Dec 9 01:11:36 UTC 2007


Author: rathann

Update of /cvs/pkgs/rpms/gg2/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16043

Modified Files:
	gg2-desktop.patch gg2.spec 
Log Message:
- fixed BRs
- simplified configure call
- fixed desktop file


gg2-desktop.patch:

Index: gg2-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gg2/F-8/gg2-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gg2-desktop.patch	1 Nov 2006 14:33:13 -0000	1.1
+++ gg2-desktop.patch	9 Dec 2007 01:11:31 -0000	1.2
@@ -1,7 +1,12 @@
---- gg2-2.3.0/gg2.desktop.r	2004-08-04 22:53:57.000000000 +0200
-+++ gg2-2.3.0/gg2.desktop	2006-11-01 15:07:18.000000000 +0100
-@@ -9,5 +9,5 @@
- Icon=gg2.png
+diff -up gg2-2.3.0/gg2.desktop.d gg2-2.3.0/gg2.desktop
+--- gg2-2.3.0/gg2.desktop.d	2004-08-04 22:53:57.000000000 +0200
++++ gg2-2.3.0/gg2.desktop	2007-12-07 20:59:44.000000000 +0100
+@@ -6,8 +6,8 @@ Comment=Instant Messanger Client
+ Comment[pl]=(fry)wolne Gadanie
+ TryExec=gg2
+ Exec=gg2
+-Icon=gg2.png
++Icon=gg2
  Terminal=false
  Type=Application
 -Categories=Application;Network;InstantMessaging;GTK;


Index: gg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gg2/F-8/gg2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gg2.spec	29 Aug 2007 00:06:59 -0000	1.4
+++ gg2.spec	9 Dec 2007 01:11:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name: gg2
 Version: 2.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: GNU Gadu 2 - free talking
 Summary(es): GNU Gadu 2 - charlar libremente
 Summary(pl): GNU Gadu 2 - wolne gadanie
@@ -11,24 +11,17 @@
 Patch1: %{name}-desktop.patch
 URL: http://www.gnugadu.org/
 BuildRequires: arts-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: dbus-devel
-%if %{fedora} > 5
 BuildRequires: dbus-glib-devel
-%else
-BuildRequires: dbus-glib
-%endif
 BuildRequires: desktop-file-utils
+BuildRequires: esound-devel
 BuildRequires: gettext-devel
 BuildRequires: gtkspell-devel
 BuildRequires: libgadu-devel
 BuildRequires: libtlen-devel
 BuildRequires: libtool
-%if %{fedora} >= 5
 BuildRequires: libXScrnSaver-devel
-%endif
 BuildRequires: loudmouth-devel
+BuildRequires: perl(ExtUtils::Embed)
 BuildRequires: xosd-devel
 Requires: %{name}-core = %{version}-%{release}
 Requires: %{name}-gadu-gadu = %{version}-%{release}
@@ -236,28 +229,11 @@
 %{__autoconf}
 
 %configure \
-	--with-gui \
-	--with-gadu \
+	--with-all-plugins \
 	--with-external-libgadu \
-	--with-tlen \
-	--with-jabber \
-	--with-xosd \
-	--with-sms \
-	--with-docklet_system_tray \
-	--with-docklet_dockapp \
-	--with-esd \
-	--with-arts \
-	--with-oss \
-	--with-external \
-	--with-update \
-	--with-history-external-viewer \
-	--with-aaway \
-	--with-ignore \
-	--with-gghist \
-	--with-gtkspell \
-	--with-dbus \
 	--with-dbus-dir=%{_datadir}/dbus-1/services/ \
 	--with-perl \
+	--with-gnutls \
 	--with-remote
 
 %{__make} %{?_smp_mflags}
@@ -382,6 +358,11 @@
 %{_libdir}/pkgconfig/gg2_core.pc
 
 %changelog
+* Sun Dec 09 2007 Dominik Mierzejewski <rpm at greysector.net> 2.3.0-4
+- fixed BRs
+- simplified configure call
+- fixed desktop file
+
 * Wed Aug 29 2007 Dominik Mierzejewski <rpm at greysector.net> 2.3.0-3
 - reorganize package layout (#261141)
 - rebuild for BuildID




More information about the fedora-extras-commits mailing list