SPECS: eventum.spec - merged from DEVEL; version 1.5.5; STBR

glen glen at pld-linux.org
Wed Jul 27 09:44:47 CEST 2005


Author: glen                         Date: Wed Jul 27 07:44:47 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL; version 1.5.5; STBR

---- Files affected:
SPECS:
   eventum.spec (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: SPECS/eventum.spec
diff -u SPECS/eventum.spec:1.107 SPECS/eventum.spec:1.108
--- SPECS/eventum.spec:1.107	Tue Jun 14 19:19:26 2005
+++ SPECS/eventum.spec	Wed Jul 27 09:44:42 2005
@@ -13,9 +13,6 @@
 %bcond_with	pear	# build with system PEAR packages (or use bundled ones)
 %bcond_with	qmail	# build the router-qmail subpackage
 
-%define	uid	146
-%define	gid	146
-
 # snapshot: DATE
 #define	_snap 20050227
 
@@ -25,17 +22,17 @@
 %define	_source http://mysql.dataphone.se/Downloads/%{name}/%{name}-%{version}.tar.gz
 %endif
 
-%define	_rel	3
+%define	_rel	1
 
 Summary:	Eventum Issue / Bug tracking system
 Summary(pl):	Eventum - system śledzenia spraw/błędów
 Name:		eventum
-Version:	1.5.4
+Version:	1.5.5
 Release:	%{?_snap:0.%{_snap}.}%{_rel}
 License:	GPL
 Group:		Applications/WWW
 Source0:	%{_source}
-# Source0-md5:	0de0b1cfe4b92179cb7a52a819871856
+# Source0-md5:	cadc9530b5fa905fb6d9d61ce837ca3a
 %{?_snap:NoSource:	0}
 Source1:	%{name}-apache.conf
 Source2:	%{name}-mail-queue.cron
@@ -60,12 +57,9 @@
 Patch5:		%{name}-lf.patch
 Patch6:		http://glen.alkohol.ee/pld/%{name}-maq-subject.patch
 Patch7:		%{name}-bot-reconnect.patch
-Patch8:		%{name}-bug-10464.patch
-Patch9:		%{name}-bug-10263.patch
-Patch10:	%{name}-ft-enable.patch
-Patch11:	%{name}-upgrade-exit.patch
+Patch22:	eventum-cli-wr-separated.patch
 URL:		http://dev.mysql.com/downloads/other/eventum/
-BuildRequires:	rpmbuild(macros) >= 1.200
+BuildRequires:	rpmbuild(macros) >= 1.223
 BuildRequires:	sed >= 4.0
 Requires:	php >= 4.2.0
 Requires:	php-gd
@@ -100,13 +94,10 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/%{name}
-%define		_libdir		%{_prefix}/%{_lib}/%{name}
+%define		_libdir		%{_prefix}/lib/%{name}
 %define		_appdir	%{_datadir}/%{name}
 %define		_smartyplugindir	%{php_pear_dir}/Smarty/plugins
 
-%define		_apache1dir	/etc/apache
-%define		_apache2dir	/etc/httpd
-
 %description
 Eventum is a user-friendly and flexible issue tracking system that can
 be used by a support department to track incoming technical support
@@ -358,7 +349,7 @@
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	php >= 4.1.0
 Requires:	php-sockets
-Requires:	rc-scripts >= 0.4.0.18
+PreReq:		rc-scripts >= 0.4.0.18
 
 %description irc
 The IRC notification bot is a nice feature for remote teams that want
@@ -437,6 +428,8 @@
 # undos the source
 find . -type f -print0 | xargs -0 sed -i -e 's,
$,,'
 
+rm -f setup.conf.php
+
 # packaging
 %patch0 -p1 -b .paths
 %patch1 -p1
@@ -448,10 +441,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+%patch22 -p1
 
 # replace in remaining scripts config.inc.php to system one
 grep -rl 'include_once(".*config.inc.php")' . | xargs sed -i -e '
@@ -472,6 +462,7 @@
 	$RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_libdir}} \
 	$RPM_BUILD_ROOT/etc/{rc.d/init.d,cron.d,sysconfig} \
 	$RPM_BUILD_ROOT/var/{run,log,cache,lib}/%{name} \
+	$RPM_BUILD_ROOT/var/lib/%{name}/routed_emails \
 	$RPM_BUILD_ROOT%{_appdir}/{include,htdocs/misc,upgrade} \
 
 cp -a *.php css customer images js manage reports rpc setup $RPM_BUILD_ROOT%{_appdir}/htdocs
@@ -557,21 +548,6 @@
 %addusertogroup http %{name}
 
 %post
-# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
-	ln -sf %{_sysconfdir}/apache.conf %{_apache1dir}/conf.d/99_%{name}.conf
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
-fi
-# apache2
-if [ -d %{_apache2dir}/httpd.conf ]; then
-	ln -sf %{_sysconfdir}/apache.conf %{_apache2dir}/httpd.conf/99_%{name}.conf
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
-fi
-
 # check if the package is configured.
 if grep -q 'header("Location: setup/")' %{_sysconfdir}/config.php; then
 if [ -f %{_appdir}/htdocs/setup/index.php ]; then
@@ -632,28 +608,13 @@
 
 %preun
 if [ "$1" = "0" ]; then
-	# apache1
-	if [ -f %{_apache1dir}/apache.conf ]; then
-		rm -f %{_apache1dir}/conf.d/99_%{name}.conf
-		if [ -f /var/lock/subsys/apache ]; then
-			/etc/rc.d/init.d/apache restart 1>&2
-		fi
-	fi
-	# apache2
-	if [ -d %{_apache2dir}/httpd.conf ]; then
-		rm -f %{_apache2dir}/httpd.conf/99_%{name}.conf
-		if [ -f /var/lock/subsys/httpd ]; then
-			/etc/rc.d/init.d/httpd restart 1>&2
-		fi
-	fi
-
 	# nuke cache
 	rm -f /var/cache/eventum/*.php 2>/dev/null || :
 fi
 
 %pre base
-%groupadd -P %{name}-base -g %{gid} %{name}
-%useradd -P %{name}-base -u %{uid} -d /var/lib/%{name} -g %{name} -c "Eventum User" %{name}
+%groupadd -P %{name}-base -g 146 %{name}
+%useradd -P %{name}-base -u 146 -d /var/lib/%{name} -g %{name} -c "Eventum User" %{name}
 
 %postun base
 if [ "$1" = "0" ]; then
@@ -697,6 +658,18 @@
 	chown root:eventum %{_sysconfdir}/{config,private_key}.php
 fi
 
+%triggerin -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/apache.conf
+
+%triggerun -- apache1 >= 1.3.33-2
+%apache_config_uninstall -v 1
+
+%triggerin -- apache >= 2.0.0
+%apache_config_install -v 2 -c %{_sysconfdir}/apache.conf
+
+%triggerun -- apache >= 2.0.0
+%apache_config_uninstall -v 2
+
 # FIXME
 # only one upgrade trigger is called if you're upgrading over two
 # versions, say 1.5 to 1.5.3, only 1.5.3 trigger is called.
@@ -779,6 +752,8 @@
 %dir %{_appdir}
 # qmail will ignore user, if it's home directory is not owned
 %attr(750,eventum,eventum) %dir /var/lib/%{name}
+# for saved routed emails
+%attr(770,root,eventum) %dir /var/lib/%{name}/routed_emails
 
 %files setup
 %defattr(644,root,root,755)
@@ -849,6 +824,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2005/07/27 07:44:42  glen
+- merged from DEVEL; version 1.5.5; STBR
+
 Revision 1.107  2005/06/14 17:19:26  glen
 - remove also .orig files produced by patching on builders
 - rel 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.107&r2=1.108&f=u




More information about the pld-cvs-commit mailing list