SPECS: phpost.spec, prelude-manager.spec, qsa.spec - formatting
ankry
ankry at pld-linux.org
Sat Aug 12 20:04:50 CEST 2006
Author: ankry Date: Sat Aug 12 18:04:50 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- formatting
---- Files affected:
SPECS:
phpost.spec (1.15 -> 1.16) , prelude-manager.spec (1.7 -> 1.8) , qsa.spec (1.21 -> 1.22)
---- Diffs:
================================================================
Index: SPECS/phpost.spec
diff -u SPECS/phpost.spec:1.15 SPECS/phpost.spec:1.16
--- SPECS/phpost.spec:1.15 Tue Dec 13 15:37:24 2005
+++ SPECS/phpost.spec Sat Aug 12 20:04:44 2006
@@ -16,8 +16,8 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _phpostdir %{_datadir}/%{name}
-%define _sysconfdir /etc/%{name}
+%define _phpostdir %{_datadir}/%{name}
+%define _sysconfdir /etc/%{name}
%description
@@ -38,7 +38,7 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_phpostdir}/%{name}_{cache,prefs,temp} \
- $RPM_BUILD_ROOT{%{_sysconfdir},/etc/httpd}
+ $RPM_BUILD_ROOT{%{_sysconfdir},/etc/httpd}
install *.{gif,php,css,inc} $RPM_BUILD_ROOT%{_phpostdir}
install %{name}_cache/.htaccess $RPM_BUILD_ROOT%{_phpostdir}/%{name}_cache/
@@ -57,27 +57,27 @@
%post
if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd/httpd.conf; then
- echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf
+ echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf
elif [ -d /etc/httpd/httpd.conf ]; then
- ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf
+ ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf
fi
if [ -f /var/lock/subsys/httpd ]; then
- /usr/sbin/apachectl restart 1>&2
+ /usr/sbin/apachectl restart 1>&2
fi
%preun
if [ "$1" = "0" ]; then
- umask 027
- if [ -d /etc/httpd/httpd.conf ]; then
- rm -f /etc/httpd/httpd.conf/99_%{name}.conf
- else
- grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \
- /etc/httpd/httpd.conf.tmp
- mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /usr/sbin/apachectl restart 1>&2
- fi
- fi
+ umask 027
+ if [ -d /etc/httpd/httpd.conf ]; then
+ rm -f /etc/httpd/httpd.conf/99_%{name}.conf
+ else
+ grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \
+ /etc/httpd/httpd.conf.tmp
+ mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
+ if [ -f /var/lock/subsys/httpd ]; then
+ /usr/sbin/apachectl restart 1>&2
+ fi
+ fi
fi
@@ -102,6 +102,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2006/08/12 18:04:44 ankry
+- formatting
+
Revision 1.15 2005/12/13 14:37:24 glen
- adapterized (sorted %verify flags)
================================================================
Index: SPECS/prelude-manager.spec
diff -u SPECS/prelude-manager.spec:1.7 SPECS/prelude-manager.spec:1.8
--- SPECS/prelude-manager.spec:1.7 Wed Apr 12 20:44:18 2006
+++ SPECS/prelude-manager.spec Sat Aug 12 20:04:44 2006
@@ -88,7 +88,7 @@
# ^D
# $ PGPASSWORD=prelude psql -U prelude -d prelude < /usr/share/libpreludedb/classic/pgsql.sql
#
-# Updating database schema:
+# Updating database schema:
#
# $ PGPASSWORD=prelude psql -U prelude -d prelude < /usr/share/libpreludedb/classic/pgsql-update-14-1.sql
#
@@ -99,10 +99,10 @@
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/prelude-manager ]; then
- %service prelude-manager stop 1>&2
- fi
- /sbin/chkconfig --del prelude-manager
+ if [ -f /var/lock/subsys/prelude-manager ]; then
+ %service prelude-manager stop 1>&2
+ fi
+ /sbin/chkconfig --del prelude-manager
fi
%files
@@ -133,6 +133,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2006/08/12 18:04:44 ankry
+- formatting
+
Revision 1.7 2006/04/12 18:44:18 glen
- correct %service usage
================================================================
Index: SPECS/qsa.spec
diff -u SPECS/qsa.spec:1.21 SPECS/qsa.spec:1.22
--- SPECS/qsa.spec:1.21 Fri Mar 3 10:08:44 2006
+++ SPECS/qsa.spec Sat Aug 12 20:04:44 2006
@@ -170,7 +170,7 @@
%post doc
echo "######################################################"
-echo "# Please run the 'qsa-doc -add' command for every #"
+echo "# Please run the 'qsa-doc -add' command for every #"
echo "# user who wants to have access to QSA documentation #"
echo "# from the Qt Assistant. #"
echo "######################################################"
@@ -179,9 +179,9 @@
if [ "$1" = "0" ]; then
echo "###########################################################"
echo "# Please run the 'qsa-doc -remove' command for every user #"
-echo "# for whom you ran 'qsa-doc -add' earlier in order to #"
+echo "# for whom you ran 'qsa-doc -add' earlier in order to #"
echo "# remove qsa documentation from the Qt Assistant. #"
-echo "##########################################################"
+echo "###########################################################"
fi
%files
@@ -215,6 +215,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.22 2006/08/12 18:04:44 ankry
+- formatting
+
Revision 1.21 2006/03/03 09:08:44 pluto
- updated to 1.1.3 (1.2.x version needs Qt4).
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/phpost.spec?r1=1.15&r2=1.16&f=u
http://cvs.pld-linux.org/SPECS/prelude-manager.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SPECS/qsa.spec?r1=1.21&r2=1.22&f=u
More information about the pld-cvs-commit
mailing list