rpms/ekg/F-7 ekg-external-libgadu.patch, 1.1, 1.2 ekg.spec, 1.3, 1.4 sources, 1.2, 1.3

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/pkgs/rpms/ekg/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13122

Modified Files:
	ekg-external-libgadu.patch ekg.spec sources 
Log Message:
- 1.7 final
- enable voip support (gsm is in Fedora now)
- remove redundant BR: autoconf
- support giflib
- fixes CVE-2007-166{3,4,5} (bug #246034)


ekg-external-libgadu.patch:

Index: ekg-external-libgadu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/F-7/ekg-external-libgadu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekg-external-libgadu.patch	17 Sep 2006 20:15:55 -0000	1.1
+++ ekg-external-libgadu.patch	29 Jun 2007 23:32:39 -0000	1.2
@@ -1,5 +1,5 @@
---- ekg-1.7rc2/configure.in.libgadu	2006-04-18 21:05:10.000000000 +0200
-+++ ekg-1.7rc2/configure.in	2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/configure.in.libgadu	2007-03-11 13:27:04.000000000 +0100
++++ ekg-1.7/configure.in	2007-06-29 22:23:38.000000000 +0200
 @@ -313,6 +313,39 @@
  dnl  I zaczynamy wykrywaæ ¶mieci dla ekg...
  dnl
@@ -40,8 +40,8 @@
  dnl  dirname - get rid of libgen
  AC_CHECK_HEADERS(libgen.h)
  AC_CHECK_FUNC(dirname, , [OBJS="$OBJS ../compat/dirname.o"])
---- ekg-1.7rc2/src/Makefile.in.libgadu	2006-08-05 17:46:23.000000000 +0200
-+++ ekg-1.7rc2/src/Makefile.in	2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/src/Makefile.in.libgadu	2007-04-28 22:02:22.000000000 +0200
++++ ekg-1.7/src/Makefile.in	2007-06-29 22:24:20.000000000 +0200
 @@ -10,7 +10,7 @@
  sysconfdir = @sysconfdir@
  
@@ -51,17 +51,17 @@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  
-@@ -27,7 +27,7 @@
- all:	dep ekg @ioctld@
+@@ -28,7 +28,7 @@
  
- ekg:	$(OBJS) @libgadu_a@
--	$(CC) $(CFLAGS) -o ekg $(OBJS) -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o ekg $(OBJS) @LIBGADU_LIBPATH@ @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
+ ekg:	$(OBJS) comptime.c @libgadu_a@
+ 	$(CC) $(CFLAGS) -c -o comptime.o comptime.c
+-	$(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o @LIBGADU_LIBPATH@ @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
  
  ioctld:	ioctld.c
  	$(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
---- ekg-1.7rc2/src/stuff.c.libgadu	2006-09-17 18:34:13.000000000 +0200
-+++ ekg-1.7rc2/src/stuff.c	2006-09-17 18:33:56.000000000 +0200
+--- ekg-1.7/src/stuff.c.libgadu	2007-04-28 22:02:24.000000000 +0200
++++ ekg-1.7/src/stuff.c	2007-06-29 22:23:38.000000000 +0200
 @@ -53,7 +53,6 @@
  #include <unistd.h>
  
@@ -70,8 +70,8 @@
  #include "dynstuff.h"
  #include "libgadu.h"
  #ifdef HAVE_OPENSSL
---- ekg-1.7rc2/Makefile.in.libgadu	2006-09-17 18:33:03.000000000 +0200
-+++ ekg-1.7rc2/Makefile.in	2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/Makefile.in.libgadu	2007-06-29 22:23:38.000000000 +0200
++++ ekg-1.7/Makefile.in	2007-06-29 22:23:38.000000000 +0200
 @@ -15,7 +15,7 @@
  
  #


Index: ekg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/F-7/ekg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ekg.spec	14 Dec 2006 21:57:11 -0000	1.3
+++ ekg.spec	29 Jun 2007 23:32:39 -0000	1.4
@@ -1,8 +1,6 @@
-%define		_pre	rc2
-
 Name:		ekg
 Version:	1.7
-Release:	0.4.%{_pre}%{?dist}
+Release:	1%{?dist}
 Summary:	A client compatible with Gadu-Gadu
 Summary(de):	Ein Cliente kompatibel mit Gadu-Gadu
 Summary(es):	Un cliente compatible con Gadu-Gadu
@@ -10,15 +8,15 @@
 Summary(pl):	Klient kompatybilny z Gadu-Gadu
 License:	GPL
 Group:		Applications/Internet
-Source0:	http://ekg.chmurka.net/%{name}-%{version}%{_pre}.tar.gz
+Source0:	http://ekg.chmurka.net/%{name}-%{version}.tar.gz
 Source1:	%{name}.conf
 Patch0:		%{name}-rpm.patch
 Patch1:		%{name}-external-libgadu.patch
 URL:		http://ekg.chmurka.net/
 BuildRequires:	aspell-devel
-BuildRequires:	autoconf
 BuildRequires:	automake
-%{?_with_voip:BuildRequires:	gsm-devel}
+BuildRequires:  giflib-devel
+BuildRequires:	gsm-devel
 BuildRequires:	libgadu-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	ncurses-devel
@@ -74,7 +72,7 @@
 polsku (jednak komendy są w języku angielskim).
 
 %prep
-%setup -q -n %{name}-%{version}%{_pre}
+%setup -q
 %patch0 -p1 -b .r
 %patch1 -p1 -b .libgadu
 
@@ -89,7 +87,7 @@
 	--enable-ioctld \
 	--disable-static \
 	--without-bind \
-	%{?_with_voip:--with-libgsm} \
+	--with-libgsm \
 	--with-pthread \
 	--with-python \
 	--without-termcap \
@@ -142,6 +140,13 @@
 %lang(pl) %{_mandir}/pl/man1/*
 
 %changelog
+* Fri Jun 29 2007 Dominik Mierzejewski <rpm at greysector.net> 1.7-1
+- 1.7 final
+- enable voip support (gsm is in Fedora now)
+- remove redundant BR: autoconf
+- support giflib
+- fixes CVE-2007-166{3,4,5} (bug #246034)
+
 * Thu Dec 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.7-0.4.rc2
 - Rebuild for updated python.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 13:08:59 -0000	1.2
+++ sources	29 Jun 2007 23:32:39 -0000	1.3
@@ -1 +1 @@
-b4ea482130e163af1456699e2e6983d9  ekg-1.7rc2.tar.gz
+2aa92b56517fdf09d75519a105772b74  ekg-1.7.tar.gz