rpms/mantis/devel .cvsignore, 1.5, 1.6 mantis-httpd.conf, 1.1, 1.2 mantis.spec, 1.14, 1.15 sources, 1.10, 1.11 mantis-1.0.6-private_history.patch, 1.1, NONE

[Gianluca Sforna (giallu)]

Author: giallu

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

Modified Files:
	.cvsignore mantis-httpd.conf mantis.spec sources 
Removed Files:
	mantis-1.0.6-private_history.patch 
Log Message:
* Thu Apr  5 2007 Gianluca Sforna <giallu gmail com> - 1.0.7-1
- new upstream release
- drop upstreamed patch
- fix (most) rpmlint issues
- tweak Source0 URL
- remove config_inc.php symlink (config is now found via the MANTIS_CONFIG 
  environment variable)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Nov 2006 22:04:50 -0000	1.5
+++ .cvsignore	5 Apr 2007 11:02:42 -0000	1.6
@@ -1 +1 @@
-mantis-1.0.6.tar.gz
+mantis-1.0.7.tar.gz


Index: mantis-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mantis-httpd.conf	8 Nov 2004 04:50:58 -0000	1.1
+++ mantis-httpd.conf	5 Apr 2007 11:02:42 -0000	1.2
@@ -1,3 +1,5 @@
+SetEnv MANTIS_CONFIG /etc/mantis/config_inc.php
+
 Alias /mantis		/usr/share/mantis
 
 <Directory /usr/share/mantis>


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mantis.spec	9 Jan 2007 12:09:22 -0000	1.14
+++ mantis.spec	5 Apr 2007 11:02:42 -0000	1.15
@@ -6,24 +6,24 @@
 
 Summary:    Web-based bugtracking system
 Name:       mantis
-Version:    1.0.6
-Release:    2%{dist}
+Version:    1.0.7
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Internet
 URL:        http://www.mantisbt.org/
 BuildArch:  noarch
-Source0:    http://download.sourceforge.net/sourceforge/mantisbt/%{name}-%{version}.tar.gz
+Source0:    http://downloads.sourceforge.net/mantisbt/%{name}-%{version}.tar.gz
 Source1:    mantis-README.Fedora
 
 Patch0:     mantis-1.0.0a3-iis.patch
 Patch1:     mantis-0.19.2-noexamplecom.patch
 Patch2:     mantis-1.0.0rc2-noadmin.patch
-Patch3:     mantis-1.0.6-private_history.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    diffutils
+BuildRequires: diffutils
 Requires:   php
 Requires:   mantis-config
+Requires:   php-adodb
 
 %package config-httpd
 Summary:    Mantis configuration for Apache httpd
@@ -52,14 +52,13 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .iis
-%patch1 -p1 -b .noexamplecom
-%patch2 -p1 -b .noadmin
-%patch3 -p0 -b .privatenotes
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 cp %{SOURCE1} ./README.Fedora
 
-chmod -x *.php
+chmod -x *.php *.sample
 rm -rf packages
 
 
@@ -70,13 +69,12 @@
 rm -rf "${RPM_BUILD_ROOT}"
 
 %{__install} -d -m755 ${RPM_BUILD_ROOT}%{pkgdir}
-%{__install} -d -m750 ${RPM_BUILD_ROOT}%{cfgdir}
+%{__install} -d -m755 ${RPM_BUILD_ROOT}%{cfgdir}
 
 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 '*.orig' -o -name '*.#.*' -o \
     -name '.cvsignore' \
     \) -print0 | xargs -0 rm -f
 
@@ -99,23 +97,14 @@
     esac
 done
 
+chmod -x doc/* 
 chmod -x ${RPM_BUILD_ROOT}%{pkgdir}/{doc/*,core/phpmailer/{README,LICENSE}}
 
-ln -s %{cfgdir}/config_inc.php     ${RPM_BUILD_ROOT}%{pkgdir}/config_inc.php
+# 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
 
-
-## The httpd config-files
-function subst() {
-    f=${RPM_BUILD_ROOT}$1
-    sed -e 's!/usr/share/mantis!%{pkgdir}!g' "$f" >"$f".tmp
-    cmp -s "$f" "$f.tmp" || cat "$f.tmp" >"$f"
-    rm -f "$f.tmp"
-}
-
 %{__install} -d ${RPM_BUILD_ROOT}%{httpconfdir}
 %{__install} -p -m644 %{SOURCE10} ${RPM_BUILD_ROOT}%{httpconfdir}/mantis.conf
-subst %{httpconfdir}/mantis.conf
 
 
 %clean
@@ -132,8 +121,9 @@
 %files
 %defattr(-,root,root,-)
 %{pkgdir}
-%attr(-,root,apache) %dir %{cfgdir}
-%attr(0640,root,apache) %config(noreplace) %{cfgdir}/*
+%exclude %{pkgdir}/core/adodb/adodb-time.zip
+%dir %{cfgdir}
+%config(noreplace) %{cfgdir}/*
 %doc doc/{LICENSE,ChangeLog,CREDITS,CUSTOMIZATION} README.Fedora
 
 %files config-httpd
@@ -142,7 +132,15 @@
 
 
 %changelog
-* Tue Jan  8 2007 Gianluca Sforna <giallu gmail com> - 1.0.6-2
+* Thu Apr  5 2007 Gianluca Sforna <giallu gmail com> - 1.0.7-1
+- new upstream release
+- drop upstreamed patch
+- fix (most) rpmlint issues
+- tweak Source0 URL
+- remove config_inc.php symlink (config is now found via the MANTIS_CONFIG 
+  environment variable)
+
+* Tue Jan  9 2007 Gianluca Sforna <giallu gmail com> - 1.0.6-2
 - Add some docs
 - Add patch for BZ #219937
 - Fix rpmlint messages for SRPM


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Nov 2006 22:04:50 -0000	1.10
+++ sources	5 Apr 2007 11:02:42 -0000	1.11
@@ -1 +1 @@
-64af171288bad777d6a1bba493e4a88b  mantis-1.0.6.tar.gz
+242f127edfc487889c9089d6b0fbf737  mantis-1.0.7.tar.gz


--- mantis-1.0.6-private_history.patch DELETED ---