rpms/mantis/devel mantis-0.19.2-noexamplecom.patch, NONE, 1.1 mantis-0.19.2-noadmin.patch, NONE, 1.1 mantis-0.19.2-iis.patch, NONE, 1.1 sources, 1.2, 1.3 mantis.spec, 1.4, 1.5 mantis-0.18.3-noadmin.patch, 1.1, NONE mantis-0.18.3-iis.patch, 1.1, NONE mantis-0.18.3-email.patch, 1.1, NONE

Enrico Scholz (ensc) fedora-extras-commits at redhat.com
Tue Mar 8 18:24:18 UTC 2005


Author: ensc

Update of /cvs/extras/rpms/mantis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30454/devel

Modified Files:
	sources mantis.spec 
Added Files:
	mantis-0.19.2-noexamplecom.patch mantis-0.19.2-noadmin.patch 
	mantis-0.19.2-iis.patch 
Removed Files:
	mantis-0.18.3-noadmin.patch mantis-0.18.3-iis.patch 
	mantis-0.18.3-email.patch 
Log Message:
- updated to 0.19.2
- rediffed patches
- removed dependency on php-mysql as it supports PostgreSQL also
- added inline-hack to generate a PostgreSQL database creation script


mantis-0.19.2-noexamplecom.patch:

--- NEW FILE mantis-0.19.2-noexamplecom.patch ---
--- mantis-0.19.2/config_inc.php.sample.email	2004-09-12 14:23:36.000000000 +0200
+++ mantis-0.19.2/config_inc.php.sample	2005-03-07 17:52:02.000000000 +0100
@@ -34,14 +34,14 @@
 	$g_database_name = "bugtracker";
 
 	# --- email variables -------------
-	$g_administrator_email  = 'administrator at example.com';
-	$g_webmaster_email      = 'webmaster at example.com';
+	$g_administrator_email  = 'administrator at localhost';
+	$g_webmaster_email      = 'webmaster at localhost';
 
 	# the "From: " field in emails
-	$g_from_email           = 'noreply at example.com';
+	$g_from_email           = 'noreply at localhost';
 
 	# the return address for bounced mail
-	$g_return_path_email    = 'admin at example.com';
+	$g_return_path_email    = 'admin at localhost';
 
 	# --- file upload settings --------
 	# This is the master setting to disable *all* file uploading functionality
@@ -49,4 +49,4 @@
 	# The default value is ON but you must make sure file uploading is enabled
 	#  in PHP as well.  You may need to add "file_uploads = TRUE" to your php.ini.
 	$g_allow_file_upload	= ON;
-?>
\ No newline at end of file
+?>
--- mantis-0.19.2/config_defaults_inc.php.email	2005-03-07 17:49:31.000000000 +0100
+++ mantis-0.19.2/config_defaults_inc.php	2005-03-07 17:51:24.000000000 +0100
@@ -75,7 +75,7 @@
 		} else if ( isset( $_SERVER['SERVER_ADDR'] ) ) {
 			$t_host = $_SERVER['SERVER_ADDR'] . $t_port;
 		} else {
-			$t_host = 'www.example.com';
+			$t_host = 'localhost';
 		}
 
 		$t_path = dirname( $_SERVER['PHP_SELF'] );
@@ -85,7 +85,7 @@
 
 		$g_path	= $t_protocol . '://' . $t_host . $t_path.'/';
 	} else {
-		$g_path	= 'http://www.example.com/mantis/';
+		$g_path	= 'http://localhost/mantis/';
 	}
 
 	# path to your images directory (for icons)
@@ -170,14 +170,14 @@
 	#############################
 
 	# --- email variables -------------
-	$g_administrator_email	= 'administrator at example.com';
-	$g_webmaster_email		= 'webmaster at example.com';
+	$g_administrator_email	= 'administrator at localhost';
+	$g_webmaster_email		= 'webmaster at localhost';
 
 	# the 'From: ' field in emails
-	$g_from_email			= 'noreply at example.com';
+	$g_from_email			= 'noreply at localhost';
 
 	# the return address for bounced mail
-	$g_return_path_email	= 'admin at example.com';
+	$g_return_path_email	= 'admin at localhost';
 
 	# allow email notification
 	#  note that if this is disabled, sign-up and password reset messages will
@@ -711,7 +711,7 @@
 	# look in README.LDAP for details
 
 	# --- using openldap -------------
-	$g_ldap_server			= 'ldaps://ldap.example.com.au/';
+	$g_ldap_server			= 'ldaps://localhost/';
 	$g_ldap_port			= '636';
 	$g_ldap_root_dn			= 'dc=example,dc=com,dc=au';
 	$g_ldap_organization		= '';    # e.g. '(organizationname=*Traffic)'

mantis-0.19.2-noadmin.patch:

--- NEW FILE mantis-0.19.2-noadmin.patch ---
--- mantis-0.19.2/login_page.php.noadmin	2004-08-14 17:26:20.000000000 +0200
+++ mantis-0.19.2/login_page.php	2005-03-07 17:54:15.000000000 +0100
@@ -141,7 +141,7 @@
 
 	# Check if the admin directory is available and is readable.
 	$t_admin_dir = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR;
-	if ( is_dir( $t_admin_dir ) && is_readable( $t_admin_dir ) ) {
+	if ( 0 && is_dir( $t_admin_dir ) && is_readable( $t_admin_dir ) ) {
 			echo '<div class="warning" align="center">', "\n";
 			echo '<p><font color="red"><strong>WARNING:</strong> Admin directory should be removed.</font></p>', "\n";
 			echo '</div>', "\n";

mantis-0.19.2-iis.patch:

--- NEW FILE mantis-0.19.2-iis.patch ---
--- mantis-0.19.2/config_defaults_inc.php.iss	2004-12-11 08:21:52.000000000 +0100
+++ mantis-0.19.2/config_defaults_inc.php	2005-03-07 17:47:41.000000000 +0100
@@ -245,7 +245,7 @@
 
 	# set to OFF to disable email check
 	$g_validate_email		= ON;
-	$g_check_mx_record		= OFF;	# Not supported under Windows.
+	$g_check_mx_record		= ON;	# Not supported under Windows.
 
 	# if ON, allow the user to omit an email field
 	# note if you allow users to create their own accounts, they
@@ -1474,4 +1474,4 @@
 	# NOTE: These are meaningless under Windows! Just ignore them!
 	$g_dot_tool							= '/usr/bin/dot';
 	$g_neato_tool						= '/usr/bin/neato';
-?>
\ No newline at end of file
+?>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:50:58 -0000	1.2
+++ sources	8 Mar 2005 18:24:16 -0000	1.3
@@ -1 +1 @@
-a0695e6d562778f8728d8f7ac963d8dd  mantisbt-0.18.3.tar.gz
+042c42c6de3bc536181391c1e9b25db3  mantis-0.19.2.tar.gz


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mantis.spec	3 Mar 2005 23:01:24 -0000	1.4
+++ mantis.spec	8 Mar 2005 18:24:16 -0000	1.5
@@ -1,24 +1,26 @@
 # $Id$
 
-%define pkgdir		%{_datadir}/%{name}
-%define cfgdir		%{_sysconfdir}/%{name}
-%define httpconfdir	%{_sysconfdir}/httpd/conf.d
+%global pkgdir		%{_datadir}/%{name}
+%global cfgdir		%{_sysconfdir}/%{name}
+%global httpconfdir	%{_sysconfdir}/httpd/conf.d
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	0.18.3
-Release:	2
+Version:	0.19.2
+Release:	%release_func 0
 License:	GPL
 Group:		Applications/Internet
 URL:		http://mantisbt.sourceforge.net/
 BuildArch:	noarch
-Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}bt-%{version}%{?alpha}.tar.gz
-Patch0:		mantis-0.18.3-iis.patch
-Patch1:		mantis-0.18.3-email.patch
-Patch2:		mantis-0.18.3-noadmin.patch
+Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}-%{version}%{?alpha}.tar.gz
+Patch0:		mantis-0.19.2-iis.patch
+Patch1:		mantis-0.19.2-noexamplecom.patch
+Patch2:		mantis-0.19.2-noadmin.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	diffutils
-Requires:	php php-mysql
+Requires:	php
 Requires:	mantis-config
 
 %package config-httpd
@@ -51,15 +53,27 @@
 
 
 %prep
-%setup -q -n %{name}bt-%{version}%{?alpha}
+%setup -q
 %patch0 -p1 -b .iis
-%patch1 -p1 -b .email
+%patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
 
 chmod -x *.php
-find -name '.cvsignore' -exec rm -f {} \;
 rm -rf packages
 
+sed -e '$s!CONCAT.*!md5(random()*random())||md5(now()));!;
+	s! COMMENT=.*;!;!;
+	s! UNIQUE KEY [^ ]* ! UNIQUE !g;
+	s!^\( *\)KEY .*[^,]\(,\?\)$!\1CHECK (TRUE)\2!;
+	s! tinyint! int!;
+	s! unsigned ! !g;
+	s! longblob ! text !g;
+	s! datetime ! timestamp with time zone !g;
+	s!TYPE=MyISAM!WITHOUT OIDS!g;
+	s!^#!-- !;
+	s! int.*auto_increment! SERIAL!;
+	s! int([0-9]*) ! int !' sql/db_generate.sql >sql/db_generate-psql.sql
+
 
 %install
 rm -rf "$RPM_BUILD_ROOT"
@@ -69,12 +83,18 @@
 
 tar cf - . | tar xf - -C $RPM_BUILD_ROOT%{pkgdir}
 
+
+find $RPM_BUILD_ROOT \( \
+	-name '*.noexamplecom' -o -name '*.iis' -o -name '*.noadmin' -o -name '*.#.*' -o \
+	-name '.cvsignore' \
+	\) -print0 | xargs -0 rm -f
+
 ## Do not rename; the *existence* of this file will be checked to
 ## determine if mantis is offline
 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
 
-ln -s %{cfgdir}/config_inc.php     $RPM_BUILD_ROOT%{pkgdir}/config_inc.php
+ln -s %{cfgdir}/config_inc.php	   $RPM_BUILD_ROOT%{pkgdir}/config_inc.php
 ln -s %{cfgdir}/mantis_offline.php $RPM_BUILD_ROOT%{pkgdir}/mantis_offline.php
 
 
@@ -117,6 +137,12 @@
 
 
 %changelog
+* Mon Mar  7 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.19.2-1
+- updated to 0.19.2
+- rediffed patches
+- removed dependency on php-mysql as it supports PostgreSQL also
+- added inline-hack to generate a PostgreSQL database creation script
+
 * Thu May 27 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.18.3-0.fdr.2
 - ship doc/ in the program-directory instead of copying it into %%docdir
 - modified shipped httpd configuration to disable admin/ directory


--- mantis-0.18.3-noadmin.patch DELETED ---


--- mantis-0.18.3-iis.patch DELETED ---


--- mantis-0.18.3-email.patch DELETED ---




More information about the fedora-extras-commits mailing list