rpms/ekg/devel .cvsignore, 1.3, 1.4 ekg-rpm.patch, 1.2, 1.3 ekg.spec, 1.9, 1.10 sources, 1.3, 1.4 ekg-external-libgadu.patch, 1.2, NONE

Sat Jun 14 14:17:13 UTC 2008

Author: rathann

Update of /cvs/pkgs/rpms/ekg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23603

Modified Files:
	.cvsignore ekg-rpm.patch ekg.spec sources 
Removed Files:
	ekg-external-libgadu.patch 
Log Message:
- updated to 1.8rc1
- moved ioctld to %%{_libexecdir}/ekg/ioctld for consistency with ekg2
- dropped obsolete external libgadu patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	29 Jun 2007 23:20:53 -0000	1.3
+++ .cvsignore	14 Jun 2008 14:16:27 -0000	1.4
@@ -1 +1 @@
-ekg-1.7.tar.gz
+ekg-1.8rc1.tar.gz

ekg-rpm.patch:

Index: ekg-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/devel/ekg-rpm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ekg-rpm.patch	6 Jan 2008 16:13:04 -0000	1.2
+++ ekg-rpm.patch	14 Jun 2008 14:16:27 -0000	1.3
@@ -1,33 +1,38 @@
---- ekg-1.7rc2/Makefile.in.r	2006-08-05 17:46:21.000000000 +0200
-+++ ekg-1.7rc2/Makefile.in	2006-09-06 19:41:54.000000000 +0200
-@@ -20,7 +20,7 @@
- libgadu:
- 	cd lib && $(MAKE) all
- 
--ekg:	
-+ekg: libgadu
- 	cd src && $(MAKE) all
- 
- make-ekgwap:
---- ekg-1.7rc2/lib/Makefile.in.r	2006-04-18 21:05:11.000000000 +0200
-+++ ekg-1.7rc2/lib/Makefile.in	2006-09-06 19:39:26.000000000 +0200
-@@ -11,7 +11,7 @@
- VERSION_MINOR=5
- 
- CC = @CC@ 
--CFLAGS = @CFLAGS_LIBGADU@ -I. -I..
-+CFLAGS = @CFLAGS@ @CFLAGS_LIBGADU@ -I. -I..
- LIBS = @LIBS_LIBGADU@
- 
- MAKE = @MAKE@
---- ekg-1.7/src/Makefile.in.r	2008-01-06 16:55:16.000000000 +0100
-+++ ekg-1.7/src/Makefile.in	2008-01-06 16:58:52.000000000 +0100
-@@ -30,7 +30,7 @@ ekg:	$(OBJS) comptime.c @libgadu_a@
- 	$(CC) $(CFLAGS) -c -o comptime.o comptime.c
- 	$(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o @LIBGADU_LIBPATH@ @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
- 
--ioctld:	ioctld.c
-+ioctld:	$(IOCTLD_OBJS) ioctld.c
- 	$(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
- 
- dep:	.depend
+diff -up ekg-1.8rc1/src/Makefile.in.r ekg-1.8rc1/src/Makefile.in
+--- ekg-1.8rc1/src/Makefile.in.r	2007-07-05 06:12:14.000000000 +0200
++++ ekg-1.8rc1/src/Makefile.in	2008-06-14 15:18:33.000000000 +0200
+@@ -47,8 +47,8 @@ install-ekg:	@strip_ekg@
+ 	$(INSTALL) -m 755 ekg $(DESTDIR)$(bindir)
+ 
+ install-ioctld:	@strip_ioctld@
+-	$(INSTALL) -d $(DESTDIR)$(libexecdir)
+-	$(INSTALL) -m 755 ioctld $(DESTDIR)$(libexecdir)
++	$(INSTALL) -d $(DESTDIR)$(libexecdir)/ekg
++	$(INSTALL) -m 755 ioctld $(DESTDIR)$(libexecdir)/ekg
+ 
+ strip-ekg:
+ 	$(STRIP) ekg
+diff -up ekg-1.8rc1/Makefile.in.r ekg-1.8rc1/Makefile.in
+--- ekg-1.8rc1/Makefile.in.r	2007-07-05 05:10:09.000000000 +0200
++++ ekg-1.8rc1/Makefile.in	2008-06-14 15:20:05.000000000 +0200
+@@ -40,7 +40,7 @@ configure:	configure.in m4/*
+ 
+ install:	all @install_ekg@ @install_ekgwap@
+ 
+-install-ekg:	install-ekg-data install-ekg-man
++install-ekg:	install-ekg-data install-ekg-man install-ekl2
+ 	cd src && $(MAKE) install
+ 
+ install-ekg-data:
+diff -up ekg-1.8rc1/configure.in.r ekg-1.8rc1/configure.in
+--- ekg-1.8rc1/configure.in.r	2008-04-21 20:03:13.000000000 +0200
++++ ekg-1.8rc1/configure.in	2008-06-14 15:16:13.000000000 +0200
+@@ -421,7 +421,7 @@ if test "x$enable_ioctld" = "xyes"; then
+ 	])
+ 
+ 	if test "x$have_ioctld_includes" = "xyes"; then
+-		CFLAGS="$CFLAGS -DWITH_IOCTLD -DIOCTLD_PATH=\\\"${libexecdir}/ioctld\\\""
++		CFLAGS="$CFLAGS -DWITH_IOCTLD -DIOCTLD_PATH=\\\"${libexecdir}/ekg/ioctld\\\""
+ 		ioctld="ioctld"
+ 		install_ioctld="install-ioctld"
+ 	fi


Index: ekg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/devel/ekg.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ekg.spec	19 Feb 2008 20:38:24 -0000	1.9
+++ ekg.spec	14 Jun 2008 14:16:27 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		ekg
-Version:	1.7
-Release:	6%{?dist}
+Version:	1.8
+Release:	0.1.rc1%{?dist}
 Summary:	A client compatible with Gadu-Gadu
 Summary(de):	Ein Cliente kompatibel mit Gadu-Gadu
 Summary(es):	Un cliente compatible con Gadu-Gadu
@@ -8,16 +8,17 @@
 Summary(pl):	Klient kompatybilny z Gadu-Gadu
 License:	GPLv2
 Group:		Applications/Internet
-Source0:	http://ekg.chmurka.net/%{name}-%{version}.tar.gz
+Source0:	http://ekg.chmurka.net/%{name}-%{version}rc1.tar.gz
 Source1:	%{name}.conf
 Source2:	ekg-unicode
 Patch0:		%{name}-rpm.patch
-Patch1:		%{name}-external-libgadu.patch
 URL:		http://ekg.chmurka.net/
 BuildRequires:	aspell-devel
 BuildRequires:	automake
 BuildRequires:  giflib-devel
 BuildRequires:	gsm-devel
+#TODO: separate binary?
+#BuildRequires:	gtk2-devel
 BuildRequires:	libgadu-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	ncurses-devel
@@ -74,9 +75,8 @@
 polsku (jednak komendy sÄ… w jÄ™zyku angielskim).
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}rc1
 %patch0 -p1 -b .r
-%patch1 -p1 -b .libgadu
 # fix line endings and encoding
 tr -d '\r' < contrib/ekl2.pl > contrib/ekl2.pl.unix ; mv contrib/ekl2.pl.unix contrib/ekl2.pl
 for file in \
@@ -91,30 +91,27 @@
 done
 
 %build
-rm -f missing
-%{__aclocal} -I m4
-%{__autoheader}
-%{__autoconf}
+autoreconf -f -i -I m4
 %configure \
 	--enable-aspell \
 	--enable-shared \
 	--enable-ioctld \
+	--enable-openssl \
+	--disable-ui-gtk \
 	--disable-static \
 	--without-bind \
 	--with-libgsm \
 	--with-pthread \
 	--with-python \
 	--without-termcap \
-	--without-libgadu
 
-%{__make} %{?_smp_mflags} CFLAGS_LIBGADU="$RPM_OPT_FLAGS"
+%{__make} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
-%{__make} install install-ekl2 \
-	DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
@@ -132,17 +129,22 @@
 %files
 %defattr(644,root,root,755)
 %doc src/COPYING
-%doc docs/{7thguard,dcc,files,gdb,python,sim,themes,ui-ncurses,vars,voip}.txt
+%doc docs/{dcc,files,gdb,python,sim,themes,ui-ncurses,vars,voip}.txt
 %doc docs/slownik.txt
 %doc ChangeLog docs/{FAQ,README,TODO,ULOTKA} docs/emoticons.{ansi,sample}
 %attr(755,root,root) %{_bindir}/e*
-%attr(755,root,root) %{_libexecdir}/ioctld
+%attr(755,root,root) %{_libexecdir}/ekg
 %attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/*.conf
 %{_datadir}/ekg
 %{_mandir}/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
 
 %changelog
+* Sat Jun 14 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.8-0.1.rc1
+- updated to 1.8rc1
+- moved ioctld to %%{_libexecdir}/ekg/ioctld for consistency with ekg2
+- dropped obsolete external libgadu patch
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.7-6
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jun 2007 23:20:53 -0000	1.3
+++ sources	14 Jun 2008 14:16:27 -0000	1.4
@@ -1 +1 @@
-2aa92b56517fdf09d75519a105772b74  ekg-1.7.tar.gz
+ae98f336a71f7aad446a3f620b672441  ekg-1.8rc1.tar.gz


--- ekg-external-libgadu.patch DELETED ---


