From dc01707237edc78a56e121b636d95acb95de12a4 Mon Sep 17 00:00:00 2001
From: Gianluca Sforna <giallu@fedoraproject.org>
Date: Jul 03 2007 15:07:00 +0000
Subject: - new upstream release

- add Require: php-adodb (and remove embedded one)
- remove duplicate docs

---

diff --git a/.cvsignore b/.cvsignore
index c6a11d7..e685287 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mantis-1.0.7.tar.gz
+mantis-1.0.8.tar.gz
diff --git a/mantis.spec b/mantis.spec
index c82a9cd..33a0d4e 100644
--- a/mantis.spec
+++ b/mantis.spec
@@ -6,7 +6,7 @@
 
 Summary:    Web-based bugtracking system
 Name:       mantis
-Version:    1.0.7
+Version:    1.0.8
 Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Internet
@@ -56,7 +56,7 @@ This package contains configuration-files for Apache httpd 2.
 %patch1 -p1
 %patch2 -p1
 
-cp %{SOURCE1} ./README.Fedora
+cp %{SOURCE1} ./doc/README.Fedora
 
 chmod -x *.php *.sample
 rm -rf packages
@@ -73,6 +73,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 tar cf - . | tar xf - -C ${RPM_BUILD_ROOT}%{pkgdir}
 
+# Remove adodb
+rm -rf ${RPM_BUILD_ROOT}%{pkgdir}/core/adodb
+
 find ${RPM_BUILD_ROOT} \( \
     -name '*.orig' -o -name '*.#.*' -o \
     -name '.cvsignore' \
@@ -98,7 +101,7 @@ for i in $(find ${RPM_BUILD_ROOT} -type f -regex '.*\.\(php\|txt\|gif\|png\|css\
 done
 
 chmod -x doc/* 
-chmod -x ${RPM_BUILD_ROOT}%{pkgdir}/{doc/*,core/phpmailer/{README,LICENSE}}
+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
@@ -106,6 +109,9 @@ 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
 
+# Remove doc dir
+rm -rf ${RPM_BUILD_ROOT}%{pkgdir}/doc
+
 
 %clean
 rm -rf "${RPM_BUILD_ROOT}"
@@ -121,10 +127,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 %files
 %defattr(-,root,root,-)
 %{pkgdir}
-%exclude %{pkgdir}/core/adodb/adodb-time.zip
 %dir %{cfgdir}
 %config(noreplace) %{cfgdir}/*
-%doc doc/{LICENSE,ChangeLog,CREDITS,CUSTOMIZATION} README.Fedora
+%doc doc/{LICENSE,ChangeLog,CREDITS,CUSTOMIZATION,README.Fedora}
 
 %files config-httpd
 %defattr(-,root,root,-)
@@ -132,6 +137,11 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 
 %changelog
+* Tue Jul  3 2007 Gianluca Sforna <giallu gmail com> - 1.0.8-1
+- new upstream release
+- add Require: php-adodb (and remove embedded one)
+- remove duplicate docs
+
 * Thu Apr  5 2007 Gianluca Sforna <giallu gmail com> - 1.0.7-1
 - new upstream release
 - drop upstreamed patch
diff --git a/sources b/sources
index 65e16c9..a96f147 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-242f127edfc487889c9089d6b0fbf737  mantis-1.0.7.tar.gz
+fab90748346fe9a8276a71f59c1a245a  mantis-1.0.8.tar.gz