rpms/mantis/devel mantis-1.1.6-install-nowriteconfig.patch, NONE, 1.1 mantis.spec, 1.22, 1.23

[Sven Lankes]

Author: slankes

Update of /cvs/pkgs/rpms/mantis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32254

Modified Files:
	mantis.spec 
Added Files:
	mantis-1.1.6-install-nowriteconfig.patch 
Log Message:
rpmlint-fixes, new patch to resolve bz #437142


mantis-1.1.6-install-nowriteconfig.patch:

--- NEW FILE mantis-1.1.6-install-nowriteconfig.patch ---
--- mantis-1.1.6.orig/admin/install.php	2008-12-09 20:20:28.000000000 +0100
+++ mantis-1.1.6//admin/install.php	2008-12-28 19:39:50.493771722 +0100
@@ -397,10 +397,18 @@
 
 <tr>
 	<td>
+		<div style="background-color: #FCC; padding: 5px; border: 1px solid red;">
+		To change any of the disabled options below, edit /etc/mantis/config_inc.php and reload this page!
+		</div>
+	</td>
+</tr>
+
+<tr>
+	<td>
 		Type of Database
 	</td>
 	<td>
-		<select name="db_type">
+		<select disabled="true" name="db_type">
 		<?php
 			if ( $f_db_type == 'mysql' ) {
 				echo '<option value="mysql" selected="selected">MySql (default)</option>';
@@ -447,7 +455,7 @@
 		Hostname (for Database Server)
 	</td>
 	<td>
-		<input name="hostname" type="textbox" value="<?php echo $f_hostname ?>"></input>
+		<input name="hostname" type="textbox" disabled="disabled" value="<?php echo $f_hostname ?>"></input>
 	</td>
 </tr>
 
@@ -456,7 +464,7 @@
 		Username (for Database)
 	</td>
 	<td>
-		<input name="db_username" type="textbox" value="<?php echo $f_db_username ?>"></input>
+		<input name="db_username" type="textbox" disabled="disabled" value="<?php echo $f_db_username ?>"></input>
 	</td>
 </tr>
 
@@ -465,7 +473,7 @@
 		Password (for Database)
 	</td>
 	<td>
-		<input name="db_password" type="password" value="<?php echo ( !is_blank( $f_db_password ) ? CONFIGURED_PASSWORD : "" ) ?>"></input>
+		<input name="db_password" type="password" disabled="disabled" value="<?php echo ( !is_blank( $f_db_password ) ? CONFIGURED_PASSWORD : "" ) ?>"></input>
 	</td>
 </tr>
 
@@ -474,7 +482,7 @@
 		Database name (for Database)
 	</td>
 	<td>
-		<input name="database_name" type="textbox" value="<?php echo $f_database_name ?>"></input>
+		<input name="database_name" type="textbox" disabled="disabled" value="<?php echo $f_database_name ?>"></input>
 	</td>
 </tr>
 <tr>
@@ -762,6 +770,9 @@
 		$t_config_filename = $g_absolute_path . 'config_inc.php';
 		$t_config_exists = file_exists ( $t_config_filename );
 ?>
+<?php
+if (0 == 1) {
+?>
 <table width="100%" border="0" cellpadding="10" cellspacing="1">
 <tr>
 	<td bgcolor="#e8e8e8" colspan="2">
@@ -832,7 +843,9 @@
 ?>
 
 </table>
-
+<?php
+}
+?>
 <?php
 	if ( false == $g_failed ) {
 		$t_install_state++;


Index: mantis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mantis.spec	11 Dec 2008 22:05:10 -0000	1.22
+++ mantis.spec	28 Dec 2008 20:17:34 -0000	1.23
@@ -6,7 +6,7 @@
 Summary:    Web-based bugtracking system
 Name:       mantis
 Version:    1.1.6
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://www.mantisbt.org/
@@ -14,6 +14,7 @@
 Source0:    http://downloads.sourceforge.net/mantisbt/mantisbt-%{version}.tar.gz
 Source1:    mantis-README.Fedora
 
+Patch0:     mantis-1.1.6-install-nowriteconfig.patch
 Patch1:     mantis-1.1.0-noexamplecom.patch
 Patch2:     mantis-1.0.0rc2-noadmin.patch
 
@@ -57,10 +58,12 @@
 
 %prep
 %setup -q -n mantisbt-%{version}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
 cp %{SOURCE1} ./doc/README.Fedora
+rm .gitignore
 rm -rf packages
 
 
@@ -90,6 +93,10 @@
 mv ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php.sample ${RPM_BUILD_ROOT}%{cfgdir}/
 mv ${RPM_BUILD_ROOT}%{pkgdir}/config_inc.php.sample     ${RPM_BUILD_ROOT}%{cfgdir}/config_inc.php
 
+#convert changelog to UTF8
+iconv -f ISO_8859-1 -t UTF-8 -o doc/ChangeLog{.utf8,}
+mv doc/ChangeLog{.utf8,}
+
 chmod a+x core ${RPM_BUILD_ROOT}%{pkgdir}/core/checkin.php
 
 for i in $(find ${RPM_BUILD_ROOT} -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
@@ -110,7 +117,7 @@
 chmod -x ${RPM_BUILD_ROOT}%{pkgdir}/core/phpmailer/{README,LICENSE}
 
 # Dangling symlink: when /etc/mantis/mantis_offline.php is present mantis is put offline
-ln -s %{cfgdir}/mantis_offline.php ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php
+ln -s ../../..%{cfgdir}/mantis_offline.php ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php
 
 %{__install} -d ${RPM_BUILD_ROOT}%{httpconfdir}
 %{__install} -p -m644 %{SOURCE10} ${RPM_BUILD_ROOT}%{httpconfdir}/mantis.conf
@@ -143,6 +150,13 @@
 
 
 %changelog
+* Sun Dec 28 2008 Sven Lankes <sven at lank.es> - 1.1.6-2
+- add patch to suppress bogus warning during setup 
+    (closes bz #437142)
+- convert ChangeLog to UTF8
+- remove .gitignore
+- change mantis_offline.php-symlink to be relative
+
 * Wed Dec 10 2008 Gianluca Sforna <giallu gmail com> - 1.1.6-1
 - new upstream release