rpms/mlmmj/devel .cvsignore, 1.2, 1.3 mlmmj.spec, 1.3, 1.4 sources, 1.2, 1.3 mlmmj-1.2.5.moderation-race.diff, 1.1, NONE

[Michael G. Fleming (mfleming)]

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17840

Modified Files:
	.cvsignore mlmmj.spec sources 
Removed Files:
	mlmmj-1.2.5.moderation-race.diff 
Log Message:
New upstream version, patches merged


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 May 2005 10:44:48 -0000	1.2
+++ .cvsignore	9 May 2005 09:59:41 -0000	1.3
@@ -1 +1 @@
-mlmmj-1.2.5.tar.gz
+mlmmj-1.2.6.1.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mlmmj.spec	6 May 2005 05:42:37 -0000	1.3
+++ mlmmj.spec	9 May 2005 09:59:41 -0000	1.4
@@ -2,12 +2,11 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.5
-Release: 3
+Version: 1.2.6.1
+Release: 1
 License: MIT
 Group: Applications/Internet
-Source: http://mlmmj.mmj.dk/dist/mlmmj-1.2.5.tar.gz
-Patch0: mlmmj-1.2.5.moderation-race.diff
+Source: http://mlmmj.mmj.dk/files/mlmmj-1.2.6.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: smtpdaemon
 URL: http://mlmmj.mmj.dk/
@@ -22,8 +21,6 @@
 
 %setup
 
-%patch -p1 -b .modrace
-
 %build
 %configure
 make %{?_smp_mflags}
@@ -46,6 +43,13 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Mon May 9 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.6.1-1
+- 1.2.6.1
+
+* Mon May 9 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.6-1
+- 1.2.6
+- Dropped moderation race patch (merged upstream)
+
 * Fri May 6 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.5-3
 - Upstream patch included fixing a potential race condition on
   moderation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 May 2005 10:44:48 -0000	1.2
+++ sources	9 May 2005 09:59:41 -0000	1.3
@@ -1 +1 @@
-11104c72c9168bb37eab848b51ebee32  mlmmj-1.2.5.tar.gz
+f55bc897c76472b0446f38a5e8f7496d  mlmmj-1.2.6.1.tar.bz2


--- mlmmj-1.2.5.moderation-race.diff DELETED ---