rpms/up-imapproxy/EL-4 imapproxy.init, 1.1, 1.2 sources, 1.3, 1.4 up-imapproxy.spec, 1.6, 1.7 up-imapproxy-CAN-2005-2661.patch, 1.1, NONE

[Tim Jackson (timj)]

Author: timj

Update of /cvs/extras/rpms/up-imapproxy/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26772

Modified Files:
	imapproxy.init sources up-imapproxy.spec 
Removed Files:
	up-imapproxy-CAN-2005-2661.patch 
Log Message:
Update to 1.2.6; initial release for EL-4



Index: imapproxy.init
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/EL-4/imapproxy.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imapproxy.init	9 Sep 2005 12:50:22 -0000	1.1
+++ imapproxy.init	30 Jan 2008 17:32:44 -0000	1.2
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# up-imapproxy: Starts the University of Pittsburgh IMAP Proxy
+# imapproxy: Starts the University of Pittsburgh IMAP Proxy
 #
 # chkconfig: - 75 25
 # description: imapproxy was written to compensate for webmail clients that \
@@ -24,7 +24,7 @@
 [ ${NETWORKING} = "no" ] && exit 0
 
 start() {
-	echo -n $"Starting imapproxyd: "
+	echo -n $"Starting up-imapproxy daemon: "
 	daemon /usr/sbin/in.imapproxyd
 	RETVAL=$?
 	echo
@@ -33,7 +33,7 @@
 }
 
 stop() {
-	echo -n $"Shutting down imapproxyd: "
+	echo -n $"Shutting down up-imapproxy daemon: "
 	killproc /usr/sbin/in.imapproxyd
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ] ; then
@@ -66,7 +66,7 @@
 	restart
 	;;
   condrestart)
-        [ -f /var/lock/subsys/in.imapproxyd ] && restart || :
+        [ -f $lockfile ] && restart || :
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2005 02:20:02 -0000	1.3
+++ sources	30 Jan 2008 17:32:44 -0000	1.4
@@ -1 +1 @@
-ad68dd2258255ac6ef87165f518390e9  up-imapproxy-1.2.4.tar.gz
+decc6693a1497e5a1bc5704e5ed28c9b  up-imapproxy-1.2.6.tar.gz


Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/EL-4/up-imapproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- up-imapproxy.spec	26 Dec 2005 14:13:48 -0000	1.6
+++ up-imapproxy.spec	30 Jan 2008 17:32:44 -0000	1.7
@@ -1,15 +1,12 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
-Version: 1.2.4
-Release: 5%{?dist}
-License: GPL
+Version: 1.2.6
+Release: 1%{?dist}
+License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
 Source0: http://www.imapproxy.org/downloads/up-imapproxy-%{version}.tar.gz
 Source1: imapproxy.init
-# Source1 can be downloaded from
-# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118632
-Patch0: %{name}-CAN-2005-2661.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -29,7 +26,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure
@@ -39,14 +35,17 @@
 rm -rf $RPM_BUILD_ROOT
 # The install-* Makefile targets don't support DESTDIR syntax, so work around.
 install -D -m 0644 -p scripts/imapproxy.conf \
-	$RPM_BUILD_ROOT%{_sysconfdir}/imapproxy.conf
+    $RPM_BUILD_ROOT%{_sysconfdir}/imapproxy.conf
 install -D -m 0755 -p %{SOURCE1} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/imapproxy
+    $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/imapproxy
 install -d -m 0755 $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 bin/* $RPM_BUILD_ROOT%{_sbindir}
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/pimpstats
 
+# Fix doc permissions
+chmod 644 README* COPYING copyright ChangeLog
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -66,7 +65,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog README README.debian README.known_issues README.ssl
+%doc COPYING ChangeLog README README.ssl
 %doc copyright
 %config(noreplace) %{_sysconfdir}/imapproxy.conf
 %ghost %{_localstatedir}/run/pimpstats
@@ -74,6 +73,26 @@
 %{_sbindir}/*
 
 %changelog
+* Mon Jan 28 2008 Tim Jackson <rpm at timj.co.uk> - 1.2.6-1
+- Update to 1.2.6
+- Remove openssl patch (no longer required)
+- Remove README.debian: we are not Debian
+- Remove README.known_issues: they are all compilation/building issues
+- Tidy init script
+
+* Sun Jan 06 2008 Tim Jackson <rpm at timj.co.uk> - 1.2.5-1
+- Update to 1.2.5
+- Update License tag to "GPLv2+"
+- Fix permissions on documentation
+- Fix init script lockfile location
+
+* Thu Sep 14 2006 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-7
+- Force rebuild for FC-6.
+
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-6
+- Patch to fix changes in OpenSSL.
+- Thanks to Paul W. Frields for providing the patch.
+
 * Mon Dec 26 2005 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-5
 - Rebuild against new OpenSSL in devel (fc5 only).
 


--- up-imapproxy-CAN-2005-2661.patch DELETED ---