rpms/abiword/F-11 abiword-2.7.6-desktop.patch, NONE, 1.1 abiword.keys, NONE, 1.1 abiword.xml, NONE, 1.1 .cvsignore, 1.24, 1.25 abiword.mime, 1.1, 1.2 abiword.spec, 1.75, 1.76 sources, 1.24, 1.25 abiword-2.6.4-desktop.patch, 1.1, NONE abiword-extras-2.6.4-nohash.patch, 1.1, NONE abiword-plugins-2.6.8-rindex.patch, 1.1, NONE

Mon Oct 26 22:43:41 UTC 2009

Author: uwog

Update of /cvs/pkgs/rpms/abiword/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6563

Modified Files:
	.cvsignore abiword.mime abiword.spec sources 
Added Files:
	abiword-2.7.6-desktop.patch abiword.keys abiword.xml 
Removed Files:
	abiword-2.6.4-desktop.patch abiword-extras-2.6.4-nohash.patch 
	abiword-plugins-2.6.8-rindex.patch 
Log Message:
New upstream release 2.8.0



abiword-2.7.6-desktop.patch:
 abiword.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE abiword-2.7.6-desktop.patch ---
diff -u -r abiword-2.7.6.orig/abiword.desktop abiword-2.7.6/abiword.desktop
--- abiword-2.7.6.orig/abiword.desktop	2009-06-21 15:28:21.000000000 +0200
+++ abiword-2.7.6/abiword.desktop	2009-07-05 14:11:02.000000000 +0200
@@ -6,7 +6,7 @@
 Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
 StartupNotify=true
 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;application/vnd.wordperfect;application/x-abicollab;
+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/vnd.wordperfect;application/x-abicollab;application/x-applix-word;application/x-mswrite;application/x-kword;application/x-mif;
 Name=AbiWord
 GenericName=Word Processor
 Comment=Compose, edit, and view documents


--- NEW FILE abiword.keys ---
application/x-abiword
	open=abiword %f
	view=abiword %f

application/x-abicollab
	open=abiword %f
	view=abiword %f


--- NEW FILE abiword.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
  <mime-type type="application/x-abicollab">
    <comment>AbiWord Collaborative Document</comment>
    <glob pattern="*.abicollab"/>
  </mime-type>
</mime-info>



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	9 Mar 2009 15:02:35 -0000	1.24
+++ .cvsignore	26 Oct 2009 22:43:40 -0000	1.25
@@ -1,4 +1,2 @@
-abiword-2.6.8.tar.gz
-abiword-docs-2.6.8.tar.gz
-abiword-extras-2.6.8.tar.gz
-abiword-plugins-2.6.8.tar.gz
+abiword-2.8.0.tar.gz
+abiword-docs-2.8.0.tar.gz


Index: abiword.mime
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/abiword.mime,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- abiword.mime	14 Mar 2005 22:39:45 -0000	1.1
+++ abiword.mime	26 Oct 2009 22:43:41 -0000	1.2
@@ -1,3 +1,5 @@
 application/x-abiword
 	ext: abw
 
+application/x-abicollab
+	ext: abicollab


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/abiword.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- abiword.spec	9 Mar 2009 17:06:50 -0000	1.75
+++ abiword.spec	26 Oct 2009 22:43:41 -0000	1.76
@@ -1,23 +1,24 @@
 %define majorversion 2
-%define minorversion 6
-%define microversion 8
+%define minorversion 8
+%define microversion 0
 
 %define olpc_build 0
 
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
 Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
-Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-plugins-%{version}.tar.gz
-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
+Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
 Source11: abiword.mime
+Source12: abiword.keys
+Source13: abiword.xml
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.abisource.com/
+Requires: libabiword = %{epoch}:%{version}-%{release}
 
 %description
 AbiWord is a cross-platform Open Source word processor. It is full-featured,
@@ -27,10 +28,9 @@ while still remaining lean.
 Summary: Library for developing applications based on AbiWord's core
 Group: System Environment/Libraries
 Patch0: abiword-2.6.0-windowshelppaths.patch
-Patch1: abiword-2.6.4-desktop.patch
+Patch1: abiword-2.7.6-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-plugins-2.6.0-boolean.patch
-Patch4: abiword-plugins-2.6.8-rindex.patch
 %if %{olpc_build}
 Patch100: abiword-2.6.4-defaultfont.patch
 Patch101: abiword-2.6.4-draghandles.patch
@@ -41,30 +41,26 @@ BuildRequires: autoconf, libtool
 BuildRequires: desktop-file-utils
 BuildRequires: fribidi-devel, enchant-devel, wv-devel
 BuildRequires: zlib-devel, popt-devel, libpng-devel
-BuildRequires: gtk2-devel, libgsf-devel, libglade2-devel
+BuildRequires: gtk2-devel, libgsf-devel
 BuildRequires: boost-devel, t1lib-devel
-%if %{olpc_build}
 BuildRequires: dbus-glib-devel >= 0.70
-%else
+%if !%{olpc_build}
 Requires: mathml-fonts
 Requires: link-grammar >= 4.2.2
-BuildRequires: libgnomeui-devel
-BuildRequires: libgnomeprintui22-devel
 BuildRequires: readline-devel
 BuildRequires: bzip2-devel
 BuildRequires: poppler-devel >= 0.4.0
 BuildRequires: ots-devel >= 0.4.2
 BuildRequires: libwpd-devel >= 0.8.0
+BuildRequires: libwpg-devel
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel
 BuildRequires: link-grammar-devel >= 4.2.2
 BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison
-BuildRequires: goffice04-devel
 BuildRequires: loudmouth-devel
-%if 0%{?fedora} >= 9
-BuildRequires: asio-devel >= 0.3.8
-%endif
+BuildRequires: asio-devel
+BuildRequires: libsoup-devel
 %endif
 
 %description -n libabiword
@@ -81,6 +77,8 @@ Includes and definitions for developing 
 %prep
 # setup abiword
 %setup -q
+
+# patch abiword
 %patch1 -p1 -b .desktop
 %if 0%{?fedora} >= 9
 %patch2 -p1 -b .boolean
@@ -91,73 +89,33 @@ Includes and definitions for developing 
 %patch102 -p1 -b .nohtmloptions
 %endif
 
-# setup abiword-plugins
-%setup -q -T -b 1 -n abiword-plugins-%{version}
-%patch3 -p1 -b .boolean
-%patch4 -p1 -b .rindex
-
-# setup abiword extras
-%setup -q -T -b 2 -n abiword-extras-%{version}
+# patch abiword plugins
+#%patch3 -p1 -b .boolean
 
 # setup abiword documentation
-%setup -q -T -b 3 -n abiword-docs-%{version}
+%setup -q -T -b 1 -n abiword-docs-%{version}
 %patch0 -p1 -b .windowshelppaths
 
 %build
 # build libabiword and abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
 %if %{olpc_build}
-%configure --enable-libabiword --disable-bonobo --disable-gnomevfs --disable-gnomeui --disable-gucharmap --disable-printing
+%configure --disable-static --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar
 %else
-%configure --enable-libabiword
-%endif
-make %{?_smp_mflags}
-
-# build abiword-plugins
-cd $RPM_BUILD_DIR/abiword-plugins-%{version}
-export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}"
-%if %{olpc_build}
-CXXFLAGS="-L$RPM_BUILD_DIR/%{name}-%{version}/src/wp/main/unix/" %configure --enable-libabiword --disable-all --enable-abicollab --with-abicollab-sugar-backend --enable-loadbindings --enable-OpenDocument --with-abiword=$RPM_BUILD_DIR/%{name}-%{version}
-%else 
-CXXFLAGS="-L$RPM_BUILD_DIR/%{name}-%{version}/src/wp/main/unix/" %configure --disable-gda --enable-libabiword --with-abiword=$RPM_BUILD_DIR/%{name}-%{version}
+%configure --disable-static --enable-plugins --enable-clipart --enable-templates
 %endif
-# 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
-# compiler handle this.
-sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo
-sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool.foobar
-sed 's/-shared -nostdlib/-shared/' < libtool.foobar > libtool
-make %{?_smp_mflags}
-
-# build the extras
-cd $RPM_BUILD_DIR/abiword-extras-%{version}
-# abiword-extras looks at the abiword-%{version}.pc pkg-config file to get its location info 
-# however, that file is not installed yet, so just point to it in the abiword source tree 
-export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}"
-%configure
-make
+%{__make} %{?_smp_mflags}
 
 # build the documentation
 cd $RPM_BUILD_DIR/abiword-docs-%{version}
-ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/wp/main/unix/abiword ./make-html.sh
+ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 # install abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
-make install DESTDIR=$RPM_BUILD_ROOT
-# overwrite the static binary with the dynamic one
-mv -f $RPM_BUILD_DIR/abiword-%{version}/src/wp/main/unix/abiword-dynamic $RPM_BUILD_ROOT%{_bindir}/abiword
-
-# install abiword-plugins
-cd $RPM_BUILD_DIR/abiword-plugins-%{version}
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# install the extras
-cd $RPM_BUILD_DIR/abiword-extras-%{version}
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # install the documentation
 cd $RPM_BUILD_DIR/abiword-docs-%{version}
@@ -168,7 +126,7 @@ find $RPM_BUILD_ROOT/%{_datadir}/%{name}
 
 # finish up
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-cp $RPM_BUILD_DIR/abiword-extras-%{version}/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png
+cp $RPM_BUILD_DIR/abiword-%{version}/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png
 
 cd $RPM_BUILD_DIR/abiword-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -178,35 +136,39 @@ desktop-file-install --vendor fedora --a
   --add-category Applications --add-category Office \
   ./abiword.desktop
 # remove the original one (which has X-Red-Hat-Base)  (#107023)
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop
+%{__rm} -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info
-install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info
+%{__install} -p -m 0644 -D %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.mime
+%{__install} -p -m 0644 -D %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.keys
+%{__install} -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiword.xml
 
 # nuke .la files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la
-# nuke custom dictionary files
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml
+%{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/libabiword-%{majorversion}.%{minorversion}.la
+%{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-update-desktop-database %{_datadir}/applications
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
 %{_bindir}/abiword
 %{_datadir}/applications/*
-%{_datadir}/mime-info/*
-%{_datadir}/pixmaps/*png
-%{_datadir}/icons/*png
+%{_datadir}/mime-info/abiword.mime
+%{_datadir}/mime-info/abiword.keys
+%{_datadir}/mime/packages/abiword.xml
+%{_datadir}/pixmaps/*.png
+%{_datadir}/icons/*.png
 
 %files -n libabiword
-%doc $RPM_BUILD_DIR/%{name}-%{version}/docs $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT $RPM_BUILD_DIR/%{name}-%{version}/README.TXT
+%doc $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT
 %{_libdir}/libabiword-%{majorversion}.%{minorversion}.so
 %{_libdir}/%{name}-%{majorversion}.%{minorversion}
 %{_datadir}/%{name}-%{majorversion}.%{minorversion}
@@ -216,6 +178,9 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Mon Oct 26 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.0-1
+- New upstream release
+
 * Mon Mar 09 2009 Marc Maurer <uwog at abisource.com> - 1:2.6.8-2
 - Make g++ 4.4 and rindex friends again
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	9 Mar 2009 15:02:35 -0000	1.24
+++ sources	26 Oct 2009 22:43:41 -0000	1.25
@@ -1,4 +1,2 @@
-fab04d8ef999c303f720197adf261310  abiword-2.6.8.tar.gz
-5698c79cfa179f4b15c82a699d11a309  abiword-docs-2.6.8.tar.gz
-e3cfff6ad4cda3e4200a75fd2665857a  abiword-extras-2.6.8.tar.gz
-421c49723e209c971ddb0798c1b313a9  abiword-plugins-2.6.8.tar.gz
+f61c623cdb3c3b2aed05bbc868050ddd  abiword-2.8.0.tar.gz
+226c97dec63c2423dca9a431beb58e3a  abiword-docs-2.8.0.tar.gz


--- abiword-2.6.4-desktop.patch DELETED ---


--- abiword-extras-2.6.4-nohash.patch DELETED ---


--- abiword-plugins-2.6.8-rindex.patch DELETED ---


