SPECS (AC-branch): jggtrans.spec - merged from HEAD

[aflinta]

Author: aflinta                      Date: Thu Aug 10 20:05:38 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   jggtrans.spec (1.60 -> 1.60.2.1) 

---- Diffs:

================================================================
Index: SPECS/jggtrans.spec
diff -u SPECS/jggtrans.spec:1.60 SPECS/jggtrans.spec:1.60.2.1
--- SPECS/jggtrans.spec:1.60	Wed Oct 12 09:00:00 2005
+++ SPECS/jggtrans.spec	Thu Aug 10 22:05:33 2006
@@ -1,34 +1,37 @@
 # $Revision$, $Date$
-# TODO:
-# - use shared/external libxode
 #
+# Conditional build:
+%bcond_with internal_libgadu	# Build with transport's internal libgadu
+
 Summary:	GaduGadu transport module for Jabber
 Summary(pl):	Moduł transportowy GaduGadu dla systemu Jabber
-Name:		jabber-gg-transport
-Version:	2.2.1
-Release:	2
+Name:		jggtrans
+Version:	2.2.2
+Release:	1
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://files.jabberstudio.org/jabber-gg-transport/%{name}-%{version}.tar.gz
-# Source0-md5:	a202536d6af2f1a280d0aab3cf19cc2c
+Source0:	http://jggtrans.jajcus.net/downloads/jggtrans-%{version}.tar.gz
+# Source0-md5:	70bbec4e9c438cda6b7379ccfc63492f
 Source1:	jggtrans.init
 Source2:	jggtrans.sysconfig
 Patch0:		%{name}-pidfile.patch
 Patch1:		%{name}-spooldir.patch
 Patch2:		%{name}-external.patch
-Patch3:		%{name}-acl.patch
-URL:		http://www.jabberstudio.org/projects/jabber-gg-transport/project/view.php
+URL:		http://jggtrans.jajcus.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	expat-devel >= 1.95.1
+BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel
-BuildRequires:	libgadu-devel
+%{!?with_internal_libgadu:BuildRequires:	libgadu-devel}
 BuildRequires:	libidn-devel >= 0.3.0
+BuildRequires:	libtool
 BuildRequires:	pkgconfig
+Requires(post):	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
-Requires(post):	/usr/bin/perl
 Requires(pre):	jabber-common
 Requires:	jabber-common
+Obsoletes:	jabber-gg-transport
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,8 +45,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%{!?with_internal_libgadu:%patch2 -p1}
 
 %build
 %{__aclocal}
@@ -51,7 +53,7 @@
 %{__automake}
 %configure \
 	%{?debug:--with-efence} \
-	--sysconfdir=/etc/jabber
+	--sysconfdir=%{_sysconfdir}/jabber
 %{__make}
 
 %install
@@ -59,7 +61,7 @@
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/jabber,/etc/rc.d/init.d,/etc/sysconfig,/var/lib/jggtrans}
 
 %{__make} install \
-	DESTDIR="$RPM_BUILD_ROOT" 
+	DESTDIR="$RPM_BUILD_ROOT"
 
 install jggtrans.xml $RPM_BUILD_ROOT%{_sysconfdir}/jabber
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/jggtrans
@@ -71,11 +73,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /etc/jabber/secret ] ; then
-	SECRET=`cat /etc/jabber/secret`
+if [ -f %{_sysconfdir}/jabber/secret ] ; then
+	SECRET=`cat %{_sysconfdir}/jabber/secret`
 	if [ -n "$SECRET" ] ; then
-        	echo "Updating component authentication secret in jggtrans.xml..."
-		perl -pi -e "s/>secret</>$SECRET</" /etc/jabber/jggtrans.xml
+		echo "Updating component authentication secret in jggtrans.xml..."
+		%{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/jggtrans.xml
 	fi
 fi
 /sbin/chkconfig --add jggtrans
@@ -95,7 +97,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO README.Pl jggtrans.xml.Pl
+%doc AUTHORS ChangeLog NEWS README README.Pl jggtrans.xml.Pl
 %attr(755,root,root) %{_sbindir}/*
 %attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/jggtrans.xml
 %attr(754,root,root) /etc/rc.d/init.d/jggtrans
@@ -108,6 +110,24 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60.2.1  2006/08/10 20:05:33  aflinta
+- merged from HEAD
+
+Revision 1.64  2006/06/04 10:56:27  wolf
+- cosmetics
+
+Revision 1.63  2006/06/03 20:56:33  jajcus
+- Version: 2.2.2
+- "jabber-gg-transport" renamed to "jggtrans"
+
+Revision 1.62  2006/04/14 17:31:43  glen
+- use sed for inline edits rather perl
+
+Revision 1.61  2006/02/02 13:51:38  mmazur
+- removed todo (nobody's *ever* gonna remove internal libxode dep)
+- added with internal_libgadu bcond
+- br: libtool, gettext-devel
+
 Revision 1.60  2005/10/12 07:00:00  arekm
 - rel 2; fix acl when using tags without attibutes like <deny/>
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jggtrans.spec?r1=1.60&r2=1.60.2.1&f=u