rpms/abiword/devel abiword-extras-2.6.0-nohash.patch, NONE, 1.1 abiword.spec, 1.56, 1.57 abiword-2.6.0-libabiword.patch, 1.1, NONE abiword-extras-2.6.0-hash.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-serv31030

Modified Files:
	abiword.spec 
Added Files:
	abiword-extras-2.6.0-nohash.patch 
Removed Files:
	abiword-2.6.0-libabiword.patch abiword-extras-2.6.0-hash.patch 
Log Message:
- Include nextgen.sh as abiword-plugins it's a proper autoconf project
- Fix 439396: abiword includes its own dictionary?
- Don't build libabiword, it's broken; re-enable it when we release
  abiword 2.8, which generates a proper library
- Drop aspell-devel BR



abiword-extras-2.6.0-nohash.patch:

--- NEW FILE abiword-extras-2.6.0-nohash.patch ---
diff -u -r abiword-extras-2.6.0.orig/dictionary/Makefile.am abiword-extras-2.6.0/dictionary/Makefile.am
--- abiword-extras-2.6.0.orig/dictionary/Makefile.am	2008-03-18 23:18:47.000000000 +0100
+++ abiword-extras-2.6.0/dictionary/Makefile.am	2008-03-29 16:46:37.000000000 +0100
@@ -1,17 +1,9 @@
 
 dictionarydir = $(DESTDIR)/$(ABIWORD_EXTRAS_PKGDATADIR)/dictionary
 
-if BIGENDIAN
-hash = BigEndian32.american.hash
-else
-hash = LittleEndian32.american.hash
-endif
-
 dictionary_DATA = \
-	$(hash) \
 	ca-ES-barbarism.xml \
 	en-AU-barbarism.xml \
-	es-MX-barbarism.xml\
-	ispell_dictionary_list.xml
+	es-MX-barbarism.xml
 
 EXTRA_DIST = $(dictionary_DATA)


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- abiword.spec	29 Mar 2008 02:39:13 -0000	1.56
+++ abiword.spec	29 Mar 2008 16:24:07 -0000	1.57
@@ -5,7 +5,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -14,11 +14,12 @@
 Source2: http://abisource.com/downloads/abiword/%{version}/source/abiword-extras-%{version}.tar.gz
 Source3: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
 Source11: abiword.mime
+Source12: nextgen.sh
 Requires: mathml-fonts
 Requires: link-grammar >= 4.2.2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: aspell-devel libpng-devel
+BuildRequires: libpng-devel
 BuildRequires: desktop-file-utils
 BuildRequires: fribidi-devel, enchant-devel, wv-devel
 BuildRequires: libgnomeprintui22-devel
@@ -50,27 +51,17 @@
 Patch1: abiword-2.6.0-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-plugins-2.6.0-boolean.patch
-Patch4: abiword-2.6.0-libabiword.patch
 Patch5: abiword-plugins-2.6.0-xmpp.patch
 Patch6: abiword-plugins-2.6.0-regression.patch
 Patch7: abiword-extras-2.6.0-destdir.patch
 Patch8: abiword-2.6.0-textbox.patch
-Patch9: abiword-extras-2.6.0-hash.patch
+Patch9: abiword-extras-2.6.0-nohash.patch
 Patch10: abiword-plugins-2.6.0-no-libboost-thread.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. It is full-featured,
 while still remaining lean.
 
-%package devel
-Summary: Support files necessary to compile applications based on libabiword
-Group: Development/Libraries
-Requires: abiword = %{epoch}:%{version}-%{release}
-
-%description devel
-Libraries, headers, and support files necessary to compile applications
-using libabiword.
-
 %prep
 # setup abiword
 %setup -q
@@ -78,7 +69,6 @@
 %if 0%{?fedora} >= 9
 %patch2 -p1 -b .boolean
 %endif
-%patch4 -p1 -b .libabiword
 %patch8 -p1 -b .textbox
 
 # setup abiword-plugins
@@ -91,7 +81,7 @@
 # setup abiword extras
 %setup -q -T -b 2 -n abiword-extras-%{version}
 %patch7 -p1 -b .destdir
-%patch9 -p1 -b .hash
+%patch9 -p1 -b .nohash
 
 # setup abiword documentation
 %setup -q -T -b 3 -n abiword-docs-%{version}
@@ -101,13 +91,15 @@
 %build
 # build abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
-%configure --enable-libabiword
+%configure
 make %{?_smp_mflags}
 
 # build abiword-plugins
 cd $RPM_BUILD_DIR/abiword-plugins-%{version}
 # we need to re-autogen, as we have changed the abicollab automake configuration
-./autogen.sh --disable-gda --disable-gremlin --disable-abicapi --disable-presentation --with-abiword=../abiword-%{version}
+cp %{SOURCE12} $RPM_BUILD_DIR/abiword-plugins-%{version}
+./nextgen.sh
+%configure --disable-gda --disable-gremlin --disable-abicapi --disable-presentation --with-abiword=../abiword-%{version}
 # Remove libtool predep_objects and postdep_objects wonkiness so that
 # building without -nostdlib doesn't include them twice.  Because we
 # already link with g++, weird stuff happens if you don't let the
@@ -193,15 +185,17 @@
 %{_datadir}/mime-info/*
 %{_datadir}/pixmaps/*png
 %{_datadir}/icons/*png
-
-%files devel
-%defattr(-,root,root)
-%doc $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT $RPM_BUILD_DIR/%{name}-%{version}/README.TXT
-%{_includedir}/%{name}-%{majorversion}.%{minorversion}
-%{_libdir}/libabiword-%{majorversion}.%{minorversion}.so*
-%{_libdir}/pkgconfig/abiword-%{majorversion}.%{minorversion}.pc
+%ghost %{_includedir}/%{name}-%{majorversion}.%{minorversion}
+%ghost %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Sat Mar 29 2008 Marc Maurer <uwog at abisource.com> - 1:2.6.0-5
+- Include nextgen.sh as abiword-plugins it's a proper autoconf project
+- Fix 439396: abiword includes its own dictionary?
+- Don't build libabiword, it's broken; re-enable it when we release
+  abiword 2.8, which generates a proper library
+- Drop aspell-devel BR
+
 * Sat Mar 29 2008 Marc Maurer <uwog at abisource.com> - 1:2.6.0-4
 - Don't forget to reautogen after changing the plugin build system
 


--- abiword-2.6.0-libabiword.patch DELETED ---


--- abiword-extras-2.6.0-hash.patch DELETED ---