rpms/ekg/devel ekg-external-libgadu.patch, NONE, 1.1 ekg.spec, 1.1, 1.2
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Sun Sep 17 20:15:55 UTC 2006
Author: rathann
Update of /cvs/extras/rpms/ekg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18256
Modified Files:
ekg.spec
Added Files:
ekg-external-libgadu.patch
Log Message:
- build with external libgadu
ekg-external-libgadu.patch:
--- NEW FILE ekg-external-libgadu.patch ---
--- 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
@@ -313,6 +313,39 @@
dnl I zaczynamy wykrywaæ ¶mieci dla ekg...
dnl
+AC_ARG_WITH(libgadu,
+ [ --without-libgadu Do not compile libgadu, use external])
+
+if test "x$with_libgadu" = "xno"; then
+ enable_dynamic=yes
+ LIBGADU_INCLUDE=""
+ LIBGADU_LIBPATH=""
+ libgadu=""
+ dep_libgadu=""
+ clean_libgadu=""
+ distclean_libgadu=""
+ install_libgadu=""
+ uninstall_libgadu=""
+else
+ LIBGADU_INCLUDE="-I../lib"
+ LIBGADU_LIBPATH="-L../lib"
+ libgadu="libgadu"
+ dep_libgadu="dep-libgadu"
+ clean_libgadu="clean-libgadu"
+ distclean_libgadu="distclean-libgadu"
+ install_libgadu="install-libgadu"
+ uninstall_libgadu="uninstall-libgadu"
+fi
+
+AC_SUBST(LIBGADU_INCLUDE)
+AC_SUBST(LIBGADU_LIBPATH)
+AC_SUBST(libgadu)
+AC_SUBST(dep_libgadu)
+AC_SUBST(clean_libgadu)
+AC_SUBST(distclean_libgadu)
+AC_SUBST(install_libgadu)
+AC_SUBST(uninstall_libgadu)
+
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
@@ -10,7 +10,7 @@
sysconfdir = @sysconfdir@
CC = @CC@
-CFLAGS = -I.. -I../lib @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" -DSYSCONFDIR=\"${sysconfdir}\"
+CFLAGS = -I.. @LIBGADU_INCLUDE@ @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" -DSYSCONFDIR=\"${sysconfdir}\"
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@@ -27,7 +27,7 @@
all: dep ekg @ioctld@
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)
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
@@ -53,7 +53,6 @@
#include <unistd.h>
#include "commands.h"
-#include "compat.h"
#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
@@ -15,7 +15,7 @@
#
-all: configure libgadu @ekg@ @make_ekgwap@
+all: configure @libgadu@ @ekg@ @make_ekgwap@
libgadu:
cd lib && $(MAKE) all
@@ -31,7 +31,7 @@
#
-dep: dep-libgadu @dep_ekg@
+dep: @dep_libgadu@ @dep_ekg@
dep-libgadu:
cd lib && $(MAKE) dep
@@ -46,7 +46,7 @@
#
-install: all install-libgadu @install_ekg@ @install_ekgwap@
+install: all @install_libgadu@ @install_ekg@ @install_ekgwap@
install-libgadu:
cd lib && $(MAKE) install
@@ -80,7 +80,9 @@
#
-uninstall: @uninstall_ekg@
+uninstall: @uninstall_libgadu@ @uninstall_ekg@
+
+uninstall-libgadu:
rm -f $(DESTDIR)$(libdir)/libgadu.{a,so*}
rm -f $(DESTDIR)$(includedir)/libgadu{,-config,-stdint}.h
rm -f $(DESTDIR)$(libdir)/pkgconfig/libgadu.pc
@@ -93,7 +95,7 @@
#
-clean: clean-libgadu @clean_ekg@ clean-examples clean-compat
+clean: @clean_libgadu@ @clean_ekg@ clean-examples clean-compat
clean-libgadu:
cd lib && $(MAKE) clean
@@ -109,7 +111,7 @@
#
-distclean: distclean-libgadu @distclean_ekg@ distclean-examples distclean-compat
+distclean: @distclean_libgadu@ @distclean_ekg@ distclean-examples distclean-compat
rm -f *~ config.log config.cache config.status config.h Makefile
rm -f config.h.in configure aclocal.m4
Index: ekg.spec
===================================================================
RCS file: /cvs/extras/rpms/ekg/devel/ekg.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekg.spec 7 Sep 2006 13:08:59 -0000 1.1
+++ ekg.spec 17 Sep 2006 20:15:55 -0000 1.2
@@ -2,7 +2,7 @@
Name: ekg
Version: 1.7
-Release: 0.2.%{_pre}%{?dist}
+Release: 0.3.%{_pre}%{?dist}
Summary: A client compatible with Gadu-Gadu
Summary(de): Ein Cliente kompatibel mit Gadu-Gadu
Summary(es): Un cliente compatible con Gadu-Gadu
@@ -13,11 +13,13 @@
Source0: http://ekg.chmurka.net/%{name}-%{version}%{_pre}.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: libgadu-devel
BuildRequires: libjpeg-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
@@ -71,60 +73,10 @@
Program nie jest umiÄdzynarodowiony i wszystkie komunikaty sÄ
po
polsku (jednak komendy sÄ
w jÄzyku angielskim).
-%package -n libgadu
-Summary: libgadu library
-Summary(es): Biblioteca libgadu
-Summary(pl): Biblioteka libgadu
-License: LGPL
-Group: System Environment/Libraries
-
-%description -n libgadu
-libgadu is intended to make it easy to add Gadu-Gadu communication
-support to your software.
-
-%description -n libgadu -l de
-Mit libgadu ist es Ihnen möglich auf einfache Weise Gadu-Gadu
-Kommunikations-Unterstützung in Ihre Software einzubinden.
-
-%description -n libgadu -l es
-libgadu está pensada para facilitar aÅadirle comunicación vÃa
-Gadu-Gadu a su software.
-
-%description -n libgadu -l pl
-libgadu umożliwia Åatwe dodanie do różnych aplikacji komunikacji
-bazujÄ
cej na protokole Gadu-Gadu.
-
-%package -n libgadu-devel
-Summary: libgadu development library
-Summary(es): Biblioteca de desarrollo de libgadu
-Summary(pl): CzÄÅÄ biblioteki libgadu dla programistów
-License: LGPL
-Group: Development/Libraries
-Requires: libgadu = %{version}-%{release}
-Requires: openssl-devel
-Requires: pkgconfig
-
-%description -n libgadu-devel
-The libgadu-devel package contains the header files and some
-documentation needed to develop application with libgadu.
-
-%description -n libgadu-devel -l de
-Das libgadu-devel Paket enthält Header-Files (Kopfzeilenordner) und
-die Dokumentation die Sie benötigen um mit libgadu Anwendungen zu
-entwickeln.
-
-%description -n libgadu-devel -l es
-El paquete libgadu-devel contiene los ficheros de cabecera, juntos con
-una documentación, necesarios para desarrollar aplicaciones que usar
-libgadu.
-
-%description -n libgadu-devel -l pl
-Pakiet libgadu-devel zawiera pliki nagÅówkowe i dokumentacjÄ,
-potrzebne do kompilowania aplikacji korzystajÄ
cych z libgadu.
-
%prep
%setup -q -n %{name}-%{version}%{_pre}
%patch0 -p1 -b .r
+%patch1 -p1 -b .libgadu
%build
rm -f missing
@@ -141,6 +93,7 @@
--with-pthread \
--with-python \
--without-termcap \
+ --without-libgadu
%{__make} %{?_smp_mflags} CFLAGS_LIBGADU="$RPM_OPT_FLAGS"
@@ -172,15 +125,9 @@
rm -f examples/Makefile examples/Makefile.in examples/.cvsignore
rm -rf examples/CVS
-cd $RPM_BUILD_ROOT%{_libdir}
-ln -sf libgadu.so.*.* libgadu.so
-
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n libgadu -p /sbin/ldconfig
-%postun -n libgadu -p /sbin/ldconfig
-
%files
%defattr(644,root,root,755)
%doc src/COPYING
@@ -194,21 +141,10 @@
%{_mandir}/man1/*
%lang(pl) %{_mandir}/pl/man1/*
-%files -n libgadu
-%doc lib/COPYING
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgadu.so.*
-
-%files -n libgadu-devel
-%defattr(644,root,root,755)
-%doc docs/protocol.html
-%doc examples
-%attr(755,root,root) %{_libdir}/libgadu.so
-%{_includedir}/libgadu.h
-%{_includedir}/libgadu-config.h
-%{_libdir}/pkgconfig/*
-
%changelog
+* Sun Sep 17 2006 Dominik Mierzejewski <rpm at greysector.net> 1.7-0.3.rc2
+- build with external libgadu
+
* Mon Sep 04 2006 Dominik Mierzejewski <rpm at greysector.net> 1.7-0.2.rc2
- add dist tag
- add license files to libgadu and ekg
More information about the scm-commits
mailing list