rpms/mantis/FC-4 mantis.spec,1.6,1.7 sources,1.3,1.4

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/mantis/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28209

Modified Files:
	mantis.spec sources 
Log Message:
- updated to 0.19.3 (SECURITY)
- minor spec file cleanups



Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-4/mantis.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mantis.spec	19 May 2005 17:33:15 -0000	1.6
+++ mantis.spec	27 Oct 2005 17:26:44 -0000	1.7
@@ -1,35 +1,36 @@
 # $Id$
 
-%global pkgdir		%{_datadir}/%{name}
-%global cfgdir		%{_sysconfdir}/%{name}
-%global 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%{?dist}}
 
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	0.19.2
-Release:	%release_func 2
+Version:	0.19.3
+Release:	%release_func 1
 License:	GPL
 Group:		Applications/Internet
 URL:		http://mantisbt.sourceforge.net/
 BuildArch:	noarch
-Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}-%{version}%{?alpha}.tar.gz
+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
+BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	diffutils
 Requires:	php
 Requires:	mantis-config
 
+
 %package config-httpd
 Summary:	Mantis configuration for Apache httpd
 Group:		Applications/Internet
 Source10:	mantis-httpd.conf
 Provides:	mantis-config = httpd
-Requires:	mantis = %{version}-%{release}
-Requires:	%{httpconfdir}
+Requires:	mantis = %version-%release
+Requires:	%httpconfdir
 Requires:	mod_ssl
 Requires(post):		httpd
 Requires(postun):	httpd
@@ -78,10 +79,10 @@
 %install
 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%pkgdir
+%__install -d -m750 $RPM_BUILD_ROOT%cfgdir
 
-tar cf - . | tar xf - -C $RPM_BUILD_ROOT%{pkgdir}
+tar cf - . | tar xf - -C $RPM_BUILD_ROOT%pkgdir
 
 
 find $RPM_BUILD_ROOT \( \
@@ -91,11 +92,11 @@
 
 ## 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
+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}/mantis_offline.php $RPM_BUILD_ROOT%{pkgdir}/mantis_offline.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
 
 
 ## The httpd config-files
@@ -106,7 +107,7 @@
 	rm -f "$f.tmp"
 }
 
-%{__install} -d $RPM_BUILD_ROOT%{httpconfdir}
+%__install -d $RPM_BUILD_ROOT%httpconfdir
 %__install -p -m644 %SOURCE10 $RPM_BUILD_ROOT%httpconfdir/mantis.conf
 subst %httpconfdir/mantis.conf
 
@@ -125,18 +126,22 @@
 %files
 %defattr(-,root,root,-)
 %doc sql
-%{pkgdir}
-%exclude %{pkgdir}/sql
-%attr(-,root,apache) %dir %{cfgdir}
-%attr(0640,root,apache) %config(noreplace) %{cfgdir}/*
+%pkgdir
+%exclude %pkgdir/sql
+%attr(-,root,apache) %dir %cfgdir
+%attr(0640,root,apache) %config(noreplace) %cfgdir/*
 
 
 %files config-httpd
 %defattr(-,root,root,-)
-%config(noreplace) %{httpconfdir}/*
+%config(noreplace) %httpconfdir/*
 
 
 %changelog
+* Thu Oct 27 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.19.3-1
+- updated to 0.19.3 (SECURITY)
+- minor spec file cleanups
+
 * Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.19.2-2
 - use %%dist instead of %%disttag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Mar 2005 18:24:16 -0000	1.3
+++ sources	27 Oct 2005 17:26:44 -0000	1.4
@@ -1 +1 @@
-042c42c6de3bc536181391c1e9b25db3  mantis-0.19.2.tar.gz
+b3c1d9f6f66bc5e7e236cc9449aa3ced  mantis-0.19.3.tar.gz