rpms/abiword/devel abiword-2.6.4-desktop.patch, NONE, 1.1 abiword-extras-2.6.4-nohash.patch, NONE, 1.1 abiword.spec, 1.62, 1.63 abiword-2.6.0-desktop.patch, 1.1, NONE abiword-extras-2.6.0-nohash.patch, 1.1, NONE

[Marc Maurer (uwog)]

Author: uwog

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20781

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.6.4-desktop.patch abiword-extras-2.6.4-nohash.patch 
Removed Files:
	abiword-2.6.0-desktop.patch abiword-extras-2.6.0-nohash.patch 
Log Message:
Update patches to apply without fuzz



abiword-2.6.4-desktop.patch:

--- NEW FILE abiword-2.6.4-desktop.patch ---
diff -u -r abiword-2.6.4.orig/abiword.desktop abiword-2.6.4/abiword.desktop
--- abiword-2.6.4.orig/abiword.desktop	2008-07-13 15:11:02.000000000 +0200
+++ abiword-2.6.4/abiword.desktop	2008-07-13 21:17:13.000000000 +0200
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;
+MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/x-mif;application/x-kword;application/x-mswrite;application/x-applix-word;application/vnd.wordperfect;
 Name=AbiWord
 GenericName=Word Processor
 Comment=Compose, edit, and view documents
Only in abiword-2.6.4: abiword.desktop.orig

abiword-extras-2.6.4-nohash.patch:

--- NEW FILE abiword-extras-2.6.4-nohash.patch ---
diff -u -r abiword-extras-2.6.4.orig/dictionary/Makefile.am abiword-extras-2.6.4/dictionary/Makefile.am
--- abiword-extras-2.6.4.orig/dictionary/Makefile.am	2008-07-13 14:04:48.000000000 +0200
+++ abiword-extras-2.6.4/dictionary/Makefile.am	2008-07-13 21:23:26.000000000 +0200
@@ -4,9 +4,6 @@
 dictionary_DATA = \
 	ca-ES-barbarism.xml \
 	en-AU-barbarism.xml \
-	es-MX-barbarism.xml\
-	ispell_dictionary_list.xml
+	es-MX-barbarism.xml
 
-EXTRA_DIST = $(dictionary_DATA) \
-	BigEndian32.american.hash \
-	LittleEndian32.american.hash	
+EXTRA_DIST = $(dictionary_DATA)


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- abiword.spec	13 Jul 2008 18:57:21 -0000	1.62
+++ abiword.spec	13 Jul 2008 19:26:38 -0000	1.63
@@ -5,7 +5,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -47,9 +47,10 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.6.0-windowshelppaths.patch
-Patch1: abiword-2.6.0-desktop.patch
+Patch1: abiword-2.6.4-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-plugins-2.6.0-boolean.patch
+Patch4: abiword-extras-2.6.4-nohash.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. It is full-featured,
@@ -69,6 +70,7 @@
 
 # setup abiword extras
 %setup -q -T -b 2 -n abiword-extras-%{version}
+%patch4 -p1 -b .nohash
 
 # setup abiword documentation
 %setup -q -T -b 3 -n abiword-docs-%{version}
@@ -174,6 +176,9 @@
 %ghost %{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml
 
 %changelog
+* Sun Jul 13 2008 Marc Maurer <uwog at abisource.com> - 1:2.6.4-2
+- Update patches to apply without fuzz
+
 * Sun Jul 13 2008 Marc Maurer <uwog at abisource.com> - 1:2.6.4-1
 - New upstream release
 


--- abiword-2.6.0-desktop.patch DELETED ---


--- abiword-extras-2.6.0-nohash.patch DELETED ---