SPECS: mywebftp.spec - tabs
nail2k
nail2k at pld-linux.org
Fri Aug 5 01:21:11 CEST 2005
Author: nail2k Date: Thu Aug 4 23:21:11 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- tabs
---- Files affected:
SPECS:
mywebftp.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SPECS/mywebftp.spec
diff -u SPECS/mywebftp.spec:1.5 SPECS/mywebftp.spec:1.6
--- SPECS/mywebftp.spec:1.5 Mon Nov 8 19:22:44 2004
+++ SPECS/mywebftp.spec Fri Aug 5 01:21:06 2005
@@ -8,7 +8,7 @@
Group: Applications/WWW
Source0: http://dl.sourceforge.net/mywebftp/%{name}%{version}.zip
# Source0-md5: 82e9ece26f7e3d3f9a8121908b8de90c
-Source1: %{name}.conf
+Source1: %{name}.conf
URL: http://sourceforge.net/projects/mywebftp/
BuildRequires: unzip
Requires: php
@@ -17,8 +17,8 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _mywebftpdir %{_datadir}/%{name}
-%define _sysconfdir /etc/%{name}
+%define _mywebftpdir %{_datadir}/%{name}
+%define _sysconfdir /etc/%{name}
%description
MyWebFTP is a little PHP Tool that allows you to manage you files and
@@ -39,7 +39,7 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_mywebftpdir} \
- $RPM_BUILD_ROOT{%{_sysconfdir},/etc/httpd}
+ $RPM_BUILD_ROOT{%{_sysconfdir},/etc/httpd}
cp -af mywebftp/* $RPM_BUILD_ROOT%{_mywebftpdir}
rm -f $RPM_BUILD_ROOT%{_mywebftpdir}/config.php
@@ -54,27 +54,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
%files
@@ -95,6 +95,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2005/08/04 23:21:06 nail2k
+- tabs
+
Revision 1.5 2004/11/08 18:22:44 zergin
- added missing BR: unzip (by Zbyniu Krzystolik)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mywebftp.spec?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list