SPECS: imp.spec - merged from DEVEL

glen glen at pld-linux.org
Fri Sep 16 22:47:51 CEST 2005 

Author: glen                         Date: Fri Sep 16 20:47:51 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   imp.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: SPECS/imp.spec
diff -u SPECS/imp.spec:1.82 SPECS/imp.spec:1.83
--- SPECS/imp.spec:1.82	Tue Aug  2 22:31:02 2005
+++ SPECS/imp.spec	Fri Sep 16 22:47:46 2005
@@ -1,18 +1,21 @@
 # $Revision$, $Date$
-# TODO
-# - imap login broken, see http://bugs.horde.org/ticket/?id=1937
+
+#%define	_snap	2005-08-22
+%define		_rc	rc1
+
 %include	/usr/lib/rpm/macros.php
 Summary:	Web Based IMAP Mail Program
 Summary(es):	Programa de correo vía Internet basado en IMAP
 Summary(pl):	Program do obsługi poczty przez WWW korzystający z IMAP-a
 Summary(pt_BR):	Programa de Mail via Web
 Name:		imp
-Version:	4.0.3
-Release:	0.0.1
+Version:	4.0.4
+Release:	%{?_rc:1.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz
-# Source0-md5:	42e7232663f65c2edf5e5bb8c85e84f9
+#Source0:	http://ftp.horde.org/pub/snaps/%{_snap}/imp-FRAMEWORK_3-%{_snap}.tar.gz
+Source0:	ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}-%{_rc}.tar.gz
+# Source0-md5:	59b197d181545a343010612687efdd25
 Source1:	%{name}.conf
 Source2:	%{name}-pgsql_create.sql
 Source3:	%{name}-pgsql_cuser.sh
@@ -20,6 +23,7 @@
 Source5:	%{name}-ImpLibVersion.def
 Patch0:		%{name}-path.patch
 URL:		http://www.horde.org/imp/
+BuildRequires:	rpmbuild(macros) >= 1.226
 Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
@@ -35,8 +39,6 @@
 %define		hordedir	/usr/share/horde
 %define		_sysconfdir		/etc/horde.org
 %define		_appdir		%{hordedir}/%{name}
-%define		_apache1dir	/etc/apache
-%define		_apache2dir	/etc/httpd
 
 %description
 IMP is the Internet Messaging Program, one of the Horde components. It
@@ -61,7 +63,8 @@
 Programa de Mail via Web baseado no IMAP.
 
 %prep
-%setup -q -n %{name}-h3-%{version}
+#%setup -q -n %{?_snap:imp-FRAMEWORK_3}%{!?_snap:%{name}-h3-%{version}}
+%setup -q -n %{name}-h3-%{version}-%{_rc}
 %patch0 -p1
 
 # considered harmful (horde/docs/SECURITY)
@@ -69,7 +72,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/imp} \
+install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{name}} \
 	$RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes}
 
 cp -pR	*.php			$RPM_BUILD_ROOT%{_appdir}
@@ -101,38 +104,17 @@
 	install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak
 fi
 
-# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
-	ln -sf %{_sysconfdir}/apache-%{name}.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-%{name}.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
+%triggerin -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf
 
-%postun
-if [ "$1" = "0" ]; then
-	# apache1
-	if [ -d %{_apache1dir}/conf.d ]; 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
-fi
+%triggerun -- apache1 >= 1.3.33-2
+%apache_config_uninstall -v 1
+
+%triggerin -- apache >= 2.0.0
+%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf
+
+%triggerun -- apache >= 2.0.0
+%apache_config_uninstall -v 2
 
 %triggerpostun -- imp <= 3.2.6-0.1
 for i in conf.php filter.txt header.txt html.php menu.php mime_drivers.php motd.php prefs.php servers.php trailer.txt; do
@@ -143,9 +125,9 @@
 done
 
 %triggerpostun -- imp <= 4.0.2-1
-if [ -f %{_apache2dir}/imp.conf.rpmsave ]; then
+if [ -f /etc/httpd/imp.conf.rpmsave ]; then
 	cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew}
-	mv -f %{_apache2dir}/imp.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf
+	mv -f /etc/httpd/imp.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf
 fi
 
 if [ -f /var/lock/subsys/httpd ]; then
@@ -178,9 +160,30 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2005/09/16 20:47:46  glen
+- merged from DEVEL
+
 Revision 1.82  2005/08/02 20:31:02  qboosh
 - improved/unified pl for Horde project info
 
+Revision 1.81.2.6  2005/08/30 18:03:33  paszczus
+- updated to 4.0.4rc1
+
+Revision 1.81.2.5  2005/08/22 19:25:45  glen
+- fixed md5
+
+Revision 1.81.2.4  2005/08/22 19:24:39  glen
+- fix broken trigger
+
+Revision 1.81.2.3  2005/08/22 19:10:00  paszczus
+- updated to 2005-08-22 snap; removed TODO
+
+Revision 1.81.2.2  2005/07/20 22:07:56  glen
+- use apache config triggers
+
+Revision 1.81.2.1  2005/05/29 12:33:29  glen
+- 2005-05-21 snap (WORKSFORME)
+
 Revision 1.81  2005/05/10 16:44:48  glen
 - broken. do not STBR as requested earlier
 
@@ -456,5 +459,4 @@
 - adapterized,
 - changed Group to Applications/Mail,
 - added correct Source url (current avalaible version is 2.3.6).
-
-based on Conectiva spec file.
+- based on Conectiva spec file.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.82&r2=1.83&f=u

More information about the pld-cvs-commit mailing list