SPECS: jabber-gg-transport.spec, jabber-jud.spec, jabber-tlen-tran...
glen
glen at pld-linux.org
Fri Apr 14 19:31:49 CEST 2006
Author: glen Date: Fri Apr 14 17:31:49 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use sed for inline edits rather perl
---- Files affected:
SPECS:
jabber-gg-transport.spec (1.61 -> 1.62) , jabber-jud.spec (1.21 -> 1.22) , jabber-tlen-transport.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SPECS/jabber-gg-transport.spec
diff -u SPECS/jabber-gg-transport.spec:1.61 SPECS/jabber-gg-transport.spec:1.62
--- SPECS/jabber-gg-transport.spec:1.61 Thu Feb 2 14:51:38 2006
+++ SPECS/jabber-gg-transport.spec Fri Apr 14 19:31:43 2006
@@ -28,8 +28,8 @@
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
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,7 +54,7 @@
%{__automake}
%configure \
%{?debug:--with-efence} \
- --sysconfdir=/etc/jabber
+ --sysconfdir=%{_sysconfdir}/jabber
%{__make}
%install
@@ -62,7 +62,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
@@ -74,11 +74,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
@@ -111,6 +111,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+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
================================================================
Index: SPECS/jabber-jud.spec
diff -u SPECS/jabber-jud.spec:1.21 SPECS/jabber-jud.spec:1.22
--- SPECS/jabber-jud.spec:1.21 Sun Jun 26 04:20:46 2005
+++ SPECS/jabber-jud.spec Fri Apr 14 19:31:43 2006
@@ -15,6 +15,7 @@
URL: http://www.jabber.org/
BuildRequires: jabberd14-devel
%requires_eq jabberd14
+Requires(post): sed >= 4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -47,11 +48,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 the config file..."
- perl -pi -e "s/>secret</>$SECRET</" /etc/jabber/jud.xml
+ echo "Updating component authentication secret in the config file..."
+ %{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/jud.xml
fi
fi
@@ -83,6 +84,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.22 2006/04/14 17:31:43 glen
+- use sed for inline edits rather perl
+
Revision 1.21 2005/06/26 02:20:46 zbyniu
- removed BRs provided by jabberd14-devel
================================================================
Index: SPECS/jabber-tlen-transport.spec
diff -u SPECS/jabber-tlen-transport.spec:1.7 SPECS/jabber-tlen-transport.spec:1.8
--- SPECS/jabber-tlen-transport.spec:1.7 Tue Dec 13 13:56:54 2005
+++ SPECS/jabber-tlen-transport.spec Fri Apr 14 19:31:43 2006
@@ -16,6 +16,7 @@
BuildRequires: libxode-devel
BuildRequires: openssl-devel
Requires(post): /usr/bin/perl
+Requires(post): sed >= 4.0
Requires(post,preun): /sbin/chkconfig
Requires(pre): jabber-common
Requires: jabber-common
@@ -52,11 +53,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 jabber-tlen-transport.xml..."
- perl -pi -e "s/>secret</>$SECRET</" /etc/jabber/jabber-tlen-transport.xml
+ %{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/jabber-tlen-transport.xml
fi
fi
/sbin/chkconfig --add jabber-tlen-transport
@@ -89,6 +90,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2006/04/14 17:31:43 glen
+- use sed for inline edits rather perl
+
Revision 1.7 2005/12/13 12:56:54 glen
- adapterized (sorted %verify attrs)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/jabber-gg-transport.spec?r1=1.61&r2=1.62&f=u
http://cvs.pld-linux.org/SPECS/jabber-jud.spec?r1=1.21&r2=1.22&f=u
http://cvs.pld-linux.org/SPECS/jabber-tlen-transport.spec?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list