rpms/up-imapproxy/EL-5 .cvsignore, 1.3, 1.4 imapproxy.init, 1.1, 1.2 sources, 1.3, 1.4 up-imapproxy.spec, 1.8, 1.9 up-imapproxy-CAN-2005-2661.patch, 1.1, NONE

[Tim Jackson (timj)]

Author: timj

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

Modified Files:
	.cvsignore imapproxy.init sources up-imapproxy.spec 
Removed Files:
	up-imapproxy-CAN-2005-2661.patch 
Log Message:
Update to 1.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2005 02:20:07 -0000	1.3
+++ .cvsignore	6 Jan 2008 11:54:46 -0000	1.4
@@ -1 +1 @@
-up-imapproxy-1.2.4.tar.gz
+up-imapproxy-1.2.5.tar.gz


Index: imapproxy.init
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/EL-5/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	6 Jan 2008 11:54:46 -0000	1.2
@@ -66,7 +66,7 @@
 	restart
 	;;
   condrestart)
-        [ -f /var/lock/subsys/in.imapproxyd ] && restart || :
+        [ -f /var/lock/subsys/imapproxy ] && restart || :
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2005 02:20:07 -0000	1.3
+++ sources	6 Jan 2008 11:54:46 -0000	1.4
@@ -1 +1 @@
-ad68dd2258255ac6ef87165f518390e9  up-imapproxy-1.2.4.tar.gz
+c6dfb09fdbd8c0af862dd02049ae39e9  up-imapproxy-1.2.5.tar.gz


Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/EL-5/up-imapproxy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- up-imapproxy.spec	14 Sep 2006 23:39:06 -0000	1.8
+++ up-imapproxy.spec	6 Jan 2008 11:54:46 -0000	1.9
@@ -1,16 +1,13 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
-Version: 1.2.4
-Release: 7%{?dist}
-License: GPL
+Version: 1.2.5
+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
-Patch1: %{name}-openssl098a.patch
+Patch0: %{name}-openssl098a.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -30,8 +27,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+%patch0 -p1
 
 %build
 %configure
@@ -41,14 +37,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
 
@@ -76,6 +75,11 @@
 %{_sbindir}/*
 
 %changelog
+* 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
+
 * Thu Sep 14 2006 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-7
 - Force rebuild for FC-6.
 


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