SPECS: phpMyBackupPro.spec - tabs, drop non-english comments

glen glen at pld-linux.org
Thu Feb 22 15:46:47 CET 2007


Author: glen                         Date: Thu Feb 22 14:46:47 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- tabs, drop non-english comments

---- Files affected:
SPECS:
   phpMyBackupPro.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/phpMyBackupPro.spec
diff -u SPECS/phpMyBackupPro.spec:1.17 SPECS/phpMyBackupPro.spec:1.18
--- SPECS/phpMyBackupPro.spec:1.17	Thu Feb 22 14:36:44 2007
+++ SPECS/phpMyBackupPro.spec	Thu Feb 22 15:46:42 2007
@@ -23,10 +23,9 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_mybackupdir	%{_datadir}/%{name}
-%define         _webapps        /etc/webapps
-%define         _webapp         %{name}
-%define         _sysconfdir     %{_webapps}/%{_webapp}
-
+%define		_webapps		/etc/webapps
+%define		_webapp			%{name}
+%define		_sysconfdir		%{_webapps}/%{_webapp}
 
 %description
 phpMyBackupPro is a web-based MySQL backup program, written in PHP.
@@ -60,7 +59,6 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/lighttpd.conf
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -77,38 +75,30 @@
 %webapp_unregister lighttpd %{_webapp}
 
 %triggerpostun -- %{name} < 6.5-2.1
-
 # nuke very-old config location (this mostly for Ra)
 if [ -f /etc/httpd/httpd.conf ]; then
-        sed -i -e "/^Include.*%{name}.conf/d" /etc/httpd/httpd.conf
+	sed -i -e "/^Include.*%{name}.conf/d" /etc/httpd/httpd.conf
 fi
 
 # migrate from httpd (apache2) config dir
 if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then
-        cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
-        mv -f /etc/httpd/%{name}.conf.rpmsave %{_sysconfdir}/httpd.conf
+	cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
+	mv -f /etc/httpd/%{name}.conf.rpmsave %{_sysconfdir}/httpd.conf
 fi
 
 # migrate from apache-config macros
 if [ -f /etc/%{name}/apache.conf.rpmsave ]; then
-        if [ -d /etc/httpd/webapps.d ]; then
-         cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
-                cp -f /etc/%{name}/apache.conf.rpmsave %{_sysconfdir}/httpd.conf
-        fi
-        rm -f /etc/%{name}/apache.conf.rpmsave
+	if [ -d /etc/httpd/webapps.d ]; then
+		cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
+		cp -f /etc/%{name}/apache.conf.rpmsave %{_sysconfdir}/httpd.conf
+	fi
+	rm -f /etc/%{name}/apache.conf.rpmsave
 fi
 
 rm -f /etc/httpd/httpd.conf/99_%{name}.conf
 /usr/sbin/webapp register httpd %{_webapp}
 %service -q httpd reload
 
-
-
-
-
-// przeniesc do /webapps
-// praca do export i global...
-
 %files
 %defattr(644,root,root,755)
 %doc documentation/{GNU\ GPL.txt,INSTALL.txt,HISTORY.txt,SEVERAL_SERVERS.txt,SHELL_MODE.txt,UPGRADE.txt}
@@ -130,6 +120,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2007/02/22 14:46:42  glen
+- tabs, drop non-english comments
+
 Revision 1.17  2007/02/22 13:36:44  speedo
 - updated to 2.0b
 - added webapps stuff
@@ -156,7 +149,7 @@
 
 Revision 1.11  2005/01/01 16:26:01  darekr
 - updated to 1.2, removed Source0-size
-- fixed %%files
+- fixed %files
 
 Revision 1.10  2004/10/31 22:22:38  paladine
 - spaces->tabs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/phpMyBackupPro.spec?r1=1.17&r2=1.18&f=u



More information about the pld-cvs-commit mailing list