Changes - j0ke.net Open Build Service

Changes of Revision 88

[-] [+]	Changed	vhcs2.spec
@@ -1,6 +1,6 @@ #!BuildIgnore: post-build-checks %define unstable unstable -%define svnrelease 20081221 +%define svnrelease 20090325 Name: vhcs2 Version: 2.4.8 %{?stable:Release: 1.%{?dist}} @@ -213,16 +213,28 @@ Requires: patch sed gawk tcl BuildRequires: perl gcc glibc-devel patch tar bzip2 sed -%package pma +%package pma2 Summary: PHPMyAdmin from VHCS distribution Group: System Requires: %{name} +Obsoletes: pma +Provides: pma -%description pma +%description pma2 phpMyAdmin is a tool written in PHP intended to handle the administration of MySQL over the Web. Currently it can create and drop databases, create/drop/alter tables, delete/edit/add fields, execute any SQL statement, manage keys on fields, manage privileges,export data into various formats and is available in 54 languages. +%package pma3 +Summary: PHPMyAdmin from VHCS distribution +Group: System +Requires: %{name} + +%description pma3 +phpMyAdmin is a tool written in PHP intended to handle the administration of MySQL over the Web. +Currently it can create and drop databases, create/drop/alter tables, delete/edit/add fields, +execute any SQL statement, manage keys on fields, manage privileges,export data into various formats and is available in 54 languages. + %package amavis Summary: Amavis addon for VHCS Group: System @@ -290,10 +302,10 @@ mv $RPM_BUILD_ROOT/etc/proftpd.conf $RPM_BUILD_ROOT/etc/proftpd.conf.vhcs2 -# create filelist of engine,gui,daemon (exclude: db-keys, configuration files, pma +# create filelist of engine,gui,daemon (exclude: db-keys, configuration files, pma2, pma3) cd $RPM_BUILD_ROOT find %{_vhcsroot} -type d \| sed '1,2d;s,^,\%attr(-\,root\,root) \%dir /,' > $RPM_BUILD_DIR/file.list.%{name} -find %{_vhcsroot} -type f \| grep -v vhcs2-db-keys \| grep -v "tools/pma" \| sed 's,^,\%attr(-\,root\,root) /,' >> $RPM_BUILD_DIR/file.list.%{name} +find %{_vhcsroot} -type f \| grep -v vhcs2-db-keys \| grep -v "tools/pma2" \| grep -v "tools/pma3" \| sed 's,^,\%attr(-\,root\,root) /,' >> $RPM_BUILD_DIR/file.list.%{name} find %{_vhcsroot} -type l \| sed 's,^,\%attr(-\,root\,root) /,' >> $RPM_BUILD_DIR/file.list.%{name} # awstats @@ -452,9 +464,9 @@ %config(noreplace) /etc/vhcs2/apache/parts/sub_php_entry.tpl %config(noreplace) /etc/vhcs2/apache/parts/dg_entry.tpl %config(noreplace) /etc/vhcs2/postfix/parts/empty-file -/etc/vhcs2//backup/ -/etc/vhcs2//working/ -/etc/vhcs2//vhcs2/ +%config(noreplace) /etc/vhcs2//backup/ +%config(noreplace) /etc/vhcs2//working/ +%config(noreplace) /etc/vhcs2//vhcs2/ %attr(0755,root,root) /etc/init.d/vhcs2_daemon %attr(0755,root,root) /etc/init.d/vhcs2_network /etc/logrotate.d/vhcs2 @@ -479,9 +491,13 @@ %doc keys/gen-keys %doc CHANGELOG -%files pma +%files pma2 +%defattr(-,root,root) +%{vhcsroot}/vhcs2/gui/tools/pma2 + +%files pma3 %defattr(-,root,root) -%{vhcsroot}/vhcs2/gui/tools/pma +%{vhcsroot}/vhcs2/gui/tools/pma3 %files amavis %defattr(-,root,root) @@ -736,6 +752,13 @@ # CHANGELOG ################################################################################# %changelog +* Wed Mar 25 2009 Carsten Schoene <vhcs@j0ke.net> +- build svn trunk r824 + - phpmyadmin update includes: + - new pma autoselect (detect if php4 or php5 & pma2 or pma3 is installed) + - v3 branch 3.1.3.1 + - v2 branch 2.11.9.5 + * Sun Dec 21 2008 Carsten Schoene <vhcs@j0ke.net> - build svn trunk r819 - phpmyadmin update to 2.11.9.4
	Added	vhcs2-2.4.8-20090325.tar.bz2 ^