rpms/mew/FC-4 .cvsignore, 1.3, 1.4 mew-init.el, 1.1, 1.2 mew.spec, 1.2, 1.3 sources, 1.3, 1.4 mew-2.2-makefile.patch, 1.1, NONE

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/extras/rpms/mew/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6478

Modified Files:
	.cvsignore mew-init.el mew.spec sources 
Removed Files:
	mew-2.2-makefile.patch 
Log Message:
* Wed Jul 19 2006 Akira TAGOH <tagoh at redhat.com> - 5.1-1
- New upstream release.
- mew-2.2-makefile.patch: removed.
- clean up the spec file a bit.
- mew-init.el: updated for the OpenDocument's MIME types.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mew/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 May 2005 03:38:49 -0000	1.3
+++ .cvsignore	19 Jul 2006 04:50:30 -0000	1.4
@@ -3,3 +3,4 @@
 *bz2
 mew-4.1.tar.gz
 mew-4.2.tar.gz
+mew-5.1.tar.gz


Index: mew-init.el
===================================================================
RCS file: /cvs/extras/rpms/mew/FC-4/mew-init.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mew-init.el	30 May 2005 02:59:56 -0000	1.1
+++ mew-init.el	19 Jul 2006 04:50:30 -0000	1.2
@@ -31,23 +31,36 @@
 (setq mew-prog-msword '("ooffice" nil t))
 (setq mew-prog-msexcel '("ooffice" nil t))
 (setq mew-prog-mspowerpoint '("ooffice" nil t))
-(setq mew-prog-ooffice '("ooffice" nil t))
 (setq mew-prog-ssl "/usr/sbin/stunnel")
 
 ;; Set content-type
 (eval-after-load "mew"
   '(progn
      (setq mew-mime-content-type
-	   (append '(("application/x-msexcel" "\\.xls$" mew-b64
-		      mew-prog-msexcel mew-icon-text)
-		     ("application/vnd.sun.xml.writer" "\\.sxw$" mew-b64
-		      mew-prog-msword mew-icon-text)
-		     ("application/vnd.sun.xml.calc" "\\.sxc$" mew-b64
-		      mew-prog-msexcel mew-icon-text)
-		     ("application/vnd.sun.xml.impress" "\\.sxi$" mew-b64
-		      mew-prog-mspowerpoint mew-icon-text)
-		     ("application/vnd.sun.xml.draw" "\\.sxd$" mew-b64
+	   (append '(("application/vnd.oasis.opendocument.chart" "\\.odc$" mew-b64
 		      mew-prog-ooffice mew-icon-text)
-		     ("application/vnd.sun.xml.math" "\\.sxm$" mew-b64
+		     ("application/vnd.oasis.opendocument.database" "\\.odb$" mew-b64
+		      mew-prog-ooffice mew-icon-text)
+		     ("application/vnd.oasis.opendocument.formula" "\\.odf$" mew-b64
+		      mew-prog-ooffice mew-icon-text)
+		     ("application/vnd.oasis.opendocument.graphics" "\\.odg$" mew-b64
+		      mew-prog-ooffice mew-icon-text)
+		     ("application/vnd.oasis.opendocument.graphics-template" "\\.otg$" mew-b64
+		      mew-prog-ooffice mew-icon-text)
+		     ("application/vnd.oasis.opendocument.image" "\\.odi$" mew-b64
+		      mew-prog-ooffice mew-icon-text)
+		     ("application/vnd.oasis.opendocument.presentation" "\\.odp$" mew-b64
+		      mew-prog-ooffice mew-icon-text)
+		     ("application/vnd.oasis.opendocument.presentation-template" "\\.otp$" mew-b64
+		      mew-prog-ooffice mew-icon-text)
+		     ("application/vnd.oasis.opendocument.spreadsheet" "\\.ods$" mew-b64
+		      mew-prog-ooffice mew-icon-text)
+		     ("application/vnd.oasis.opendocument.spreadsheet-template" "\\.ots$" mew-b64
+		      mew-prog-ooffice mew-icon-text)
+		     ("application/vnd.oasis.opendocument.text" "\\.odt$" mew-b64
+		      mew-prog-ooffice mew-icon-text)
+		     ("application/vnd.oasis.opendocument.text-master" "\\.odm$" mew-b64
+		      mew-prog-ooffice mew-icon-text)
+		     ("application/vnd.oasis.opendocument.text-template" "\\.ott$" mew-b64
 		      mew-prog-ooffice mew-icon-text))
 		   mew-mime-content-type))))


Index: mew.spec
===================================================================
RCS file: /cvs/extras/rpms/mew/FC-4/mew.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mew.spec	30 May 2005 03:38:49 -0000	1.2
+++ mew.spec	19 Jul 2006 04:50:30 -0000	1.3
@@ -4,11 +4,11 @@
 %define	xemacsver	21.4.11
 
 Name:			mew
-Version:		4.2
-Release: 1
+Version:		5.1
+Release:		1%{?dist}
 License:		BSD-like
 URL:			http://www.mew.org/
-BuildRoot:		%{_tmppath}/%{name}-%{version}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildPrereq:		emacs >= %{emacsver}
 BuildPrereq:		xemacs >= %{xemacsver}
 BuildRequires:		emacs >= %{emacsver}
@@ -17,8 +17,6 @@
 Source0:		ftp://ftp.mew.org/pub/Mew/mew-%{version}.tar.gz
 Source1:		mew-init.el
 
-Patch0:			mew-2.2-makefile.patch
-
 
 Summary:		Mew - Messaging in the Emacs World.
 Group:			Applications/Internet
@@ -62,13 +60,12 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .makefile
 
 %build
 %configure
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_infodir}
@@ -77,9 +74,6 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/xemacs/xemacs-packages/lisp/mew
 
-#(cd $RPM_BUILD_DIR/%{name}-%{version}/bin && \
-#%%configure
-#)
 
 #
 # for Emacs
@@ -92,13 +86,11 @@
 make EMACS=/usr/bin/emacs infodir=%{_infodir} info
 make EMACS=/usr/bin/emacs infodir=%{_infodir} jinfo
 
-%makeinstall \
-	elispdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/%{name} \
-	etcdir=$RPM_BUILD_ROOT%{_datadir}/pixmaps/Mew \
-	INSTALLINFO="/sbin/install-info"
+make install DESTDIR=$RPM_BUILD_ROOT \
+	elispdir=%{_datadir}/emacs/site-lisp/%{name} \
+	etcdir=%{_datadir}/pixmaps/Mew
 
-make install-jinfo \
-	INSTALLINFO="/sbin/install-info" \
+make install-jinfo	\
 	infodir=$RPM_BUILD_ROOT%{_infodir}
 
 install -m 644 %{SOURCE1} \
@@ -114,10 +106,9 @@
 	EMACS=/usr/bin/xemacs \
 	elispdir=%{_datadir}/xemacs/xemacs-packages/lisp/%{name} \
 	etcdir=%{_datadir}/pixmaps/Mew
-%makeinstall \
-	elispdir=$RPM_BUILD_ROOT%{_datadir}/xemacs/xemacs-packages/lisp/%{name} \
-	etcdir=$RPM_BUILD_ROOT%{_datadir}/pixmaps/Mew \
-	INSTALLINFO="/sbin/install-info"
+make install DESTDIR=$RPM_BUILD_ROOT \
+	elispdir=%{_datadir}/xemacs/xemacs-packages/lisp/%{name} \
+	etcdir=%{_datadir}/pixmaps/Mew
 
 install -m 644 %{SOURCE1} \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d
@@ -137,7 +128,7 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 
 %post common
@@ -185,6 +176,15 @@
 
 
 %changelog
+* Wed Jul 19 2006 Akira TAGOH <tagoh at redhat.com> - 5.1-1
+- New upstream release.
+- mew-2.2-makefile.patch: removed.
+- clean up the spec file a bit.
+- mew-init.el: updated for the OpenDocument's MIME types.
+
+* Thu Mar  2 2006 Akira TAGOH <tagoh at redhat.com> - 4.2-2
+- rebuilt.
+
 * Mon May 30 2005 Akira TAGOH <tagoh at redhat.com> - 4.2-1
 - Updates to 4.2.
 - import into Extras.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mew/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 May 2005 03:38:49 -0000	1.3
+++ sources	19 Jul 2006 04:50:30 -0000	1.4
@@ -1 +1 @@
-713e45d6358330309414adbaad3944f5  mew-4.2.tar.gz
+0c913a789142f98623180eb111e28b07  mew-5.1.tar.gz


--- mew-2.2-makefile.patch DELETED ---