Author: glen Date: Fri Apr 14 17:42:22 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use sed for inline edits rather perl
---- Files affected:
SPECS:
smst.spec (1.6 -> 1.7) , wpjabber.spec (1.7 -> 1.8) , ile.spec (1.10 ->
1.11) , jjigw.spec (1.4 -> 1.5) , pyaim-t.spec (1.2 -> 1.3) , ejabberd.spec
(1.20 -> 1.21)
---- Diffs:
================================================================
Index: SPECS/smst.spec
diff -u SPECS/smst.spec:1.6 SPECS/smst.spec:1.7
--- SPECS/smst.spec:1.6 Tue Dec 13 16:14:18 2005
+++ SPECS/smst.spec Fri Apr 14 19:42:16 2006
@@ -14,12 +14,12 @@
Patch0: %{name}-external_config.patch
Patch1: %{name}-default_config.patch
URL: http://www.jabberstudio.org/projects/sms-transport
-Requires: rc-scripts
-Requires(post): perl-base
+Requires(post): sed >= 4.0
Requires(post): textutils
Requires(post,preun): /sbin/chkconfig
Requires: daemon
Requires: jabber-common
+Requires: rc-scripts
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,11 +61,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 smst.rc..."
- perl -pi -e "s/'secret'/'$SECRET'/" /etc/jabber/smst.rc
+ %{__sed} -i -e "s/'secret'/'$SECRET'/" /etc/jabber/smst.rc
fi
fi
@@ -99,6 +99,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2006/04/14 17:42:16 glen
+- use sed for inline edits rather perl
+
Revision 1.6 2005/12/13 15:14:18 glen
- adapterized (sorted %verify attrs)
================================================================
Index: SPECS/wpjabber.spec
diff -u SPECS/wpjabber.spec:1.7 SPECS/wpjabber.spec:1.8
--- SPECS/wpjabber.spec:1.7 Mon Dec 5 00:37:16 2005
+++ SPECS/wpjabber.spec Fri Apr 14 19:42:16 2006
@@ -16,8 +16,9 @@
BuildRequires: perl-base
BuildRequires: rpm-perlprov >= 3.0.3-16
BuildRequires: rpmbuild(macros) >= 1.202
-Requires(post): /usr/bin/perl
+BuildRequires: %post-edits-too-many-files?
Requires(post): textutils
+Requires(post): sed >= 4.0
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
@@ -78,7 +79,8 @@
SECRET=`cat /etc/jabber/secret`
if [ -n "$SECRET" ] ; then
echo "Updating component authentication secret in Jabberd
config files..."
- perl -pi -e "s/>secret</>$SECRET</" /etc/jabber/*.xml
+# XXX XXX FIXME Too greedy? should edit only files from this package
+ %{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/*.xml
fi
fi
@@ -126,6 +128,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2006/04/14 17:42:16 glen
+- use sed for inline edits rather perl
+
Revision 1.7 2005/12/04 23:37:16 glen
- adapterized (sorted %verify flags)
================================================================
Index: SPECS/ile.spec
diff -u SPECS/ile.spec:1.10 SPECS/ile.spec:1.11
--- SPECS/ile.spec:1.10 Mon Dec 12 17:24:19 2005
+++ SPECS/ile.spec Fri Apr 14 19:42:16 2006
@@ -20,7 +20,7 @@
Patch1: %{name}-config.patch
URL: http://jabberstudio.org/projects/ile
BuildRequires: rpm-perlprov
-Requires(post): /usr/bin/perl
+Requires(post): sed >= 4.0
Requires(post,preun): /sbin/chkconfig
Requires(pre): jabber-common
Requires: jabberd >= 2.0
@@ -51,11 +51,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 ile.xml..."
- perl -pi -e "s/>secret</>$SECRET</" /etc/jabber/ile.xml
+ %{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/ile.xml
fi
fi
/sbin/chkconfig --add jabber-ile-transport
@@ -88,6 +88,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2006/04/14 17:42:16 glen
+- use sed for inline edits rather perl
+
Revision 1.10 2005/12/12 16:24:19 glen
- adapterized (sorted %verify attrs)
================================================================
Index: SPECS/jjigw.spec
diff -u SPECS/jjigw.spec:1.4 SPECS/jjigw.spec:1.5
--- SPECS/jjigw.spec:1.4 Tue Dec 13 13:56:54 2005
+++ SPECS/jjigw.spec Fri Apr 14 19:42:16 2006
@@ -12,7 +12,7 @@
Source2: %{name}.init
Source3: %{name}.sysconfig
URL: http://www.jabberstudio.org/projects/jjigw/
-Requires(post): perl-base
+Requires(post): sed >= 4.0
Requires(post): textutils
Requires(post,preun): /sbin/chkconfig
Requires: python-libxml2
@@ -55,11 +55,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/jjigw.xml
+ echo "Updating component authentication secret in the config
file..."
+ %{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/jjigw.xml
fi
fi
@@ -93,6 +93,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2006/04/14 17:42:16 glen
+- use sed for inline edits rather perl
+
Revision 1.4 2005/12/13 12:56:54 glen
- adapterized (sorted %verify attrs)
================================================================
Index: SPECS/pyaim-t.spec
diff -u SPECS/pyaim-t.spec:1.2 SPECS/pyaim-t.spec:1.3
--- SPECS/pyaim-t.spec:1.2 Wed Oct 5 21:30:20 2005
+++ SPECS/pyaim-t.spec Fri Apr 14 19:42:16 2006
@@ -13,7 +13,7 @@
Source4: %{name}.xml
URL: http://pyaim-t.blathersource.org/
Requires(post): jabber-common
-Requires(post): perl-base
+Requires(post): sed >= 4.0
Requires(post): textutils
Requires(post,preun): /sbin/chkconfig
Requires: python-TwistedWeb
@@ -26,8 +26,8 @@
This module allows Jabber to communicate with AIM servers.
%description -l pl
-Moduł ten umożliwia użytkownikom Jabbera komunikowanie się z
-serwerami AIM.
+Moduł ten umożliwia użytkownikom Jabbera komunikowanie się z serwerami
+AIM.
%prep
%setup -q
@@ -46,11 +46,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/pyaim-t.xml
+ echo "Updating component authentication secret in the config
file..."
+ %{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/pyaim-t.xml
fi
fi
@@ -84,6 +84,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2006/04/14 17:42:16 glen
+- use sed for inline edits rather perl
+
Revision 1.2 2005/10/05 19:30:20 qboosh
- pl summary, cleanups
================================================================
Index: SPECS/ejabberd.spec
diff -u SPECS/ejabberd.spec:1.20 SPECS/ejabberd.spec:1.21
--- SPECS/ejabberd.spec:1.20 Fri Apr 7 19:59:05 2006
+++ SPECS/ejabberd.spec Fri Apr 14 19:42:16 2006
@@ -24,6 +24,7 @@
BuildRequires: rpmbuild(macros) >= 1.268
Requires(post): /usr/bin/perl
Requires(post): jabber-common
+Requires(post): sed >= 4.0
Requires(post): textutils
Requires(post,preun): /sbin/chkconfig
Requires: erlang
@@ -70,19 +71,19 @@
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 ejabberd
config file..."
- perl -pi -e "s/>secret</$SECRET/" /etc/jabber/ejabberd.cfg
+ %{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/ejabberd.cfg
fi
fi
-if [ ! -f /etc/jabber/cookie ] ; then
- echo "Generating erl authentication cookie..."
- umask 066
- perl -e 'open R,"/dev/urandom"; read R,$r,16;
- printf "%02x",ord(chop $r) while($r);' > /etc/jabber/cookie
+if [ ! -f %{_sysconfdir}/jabber/cookie ] ; then
+ echo "Generating erl authentication cookie..."
+ umask 066
+ perl -e 'open R,"/dev/urandom"; read R,$r,16;
+ printf "%02x",ord(chop $r) while($r);' >
%{_sysconfdir}/jabber/cookie
fi
/sbin/chkconfig --add ejabberd
@@ -111,6 +112,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21 2006/04/14 17:42:16 glen
+- use sed for inline edits rather perl
+
Revision 1.20 2006/04/07 17:59:05 jajcus
- enable ODBC
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/smst.spec?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SPECS/wpjabber.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SPECS/ile.spec?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/SPECS/jjigw.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SPECS/pyaim-t.spec?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SPECS/ejabberd.spec?r1=1.20&r2=1.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
