From 22d98f752ae5298dc961e0aeb85200dae31231bf Mon Sep 17 00:00:00 2001 From: Marc Maurer Date: Apr 06 2008 21:04:42 +0000 Subject: New upstream release --- diff --git a/.cvsignore b/.cvsignore index e7374a4..e8aa02b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -abiword-2.6.0.tar.gz -abiword-plugins-2.6.0.tar.gz -abiword-extras-2.6.0.tar.gz -abiword-docs-2.6.0.tar.gz +abiword-2.6.1.tar.gz +abiword-docs-2.6.1.tar.gz +abiword-extras-2.6.1.tar.gz +abiword-plugins-2.6.1.tar.gz diff --git a/abiword-2.6.0-textbox.patch b/abiword-2.6.0-textbox.patch deleted file mode 100644 index dd1cf90..0000000 --- a/abiword-2.6.0-textbox.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r abiword-2.6.0.orig/src/text/fmt/xp/fp_FrameContainer.cpp abiword-2.6.0/src/text/fmt/xp/fp_FrameContainer.cpp ---- abiword-2.6.0.orig/src/text/fmt/xp/fp_FrameContainer.cpp 2008-03-18 23:16:22.000000000 +0100 -+++ abiword-2.6.0/src/text/fmt/xp/fp_FrameContainer.cpp 2008-03-27 15:05:51.000000000 +0100 -@@ -448,7 +448,7 @@ - void fp_FrameContainer::_drawLine (const PP_PropertyMap::Line & style, - UT_sint32 left, UT_sint32 top, UT_sint32 right, UT_sint32 bot,GR_Graphics * pGr) - { -- GR_Painter painter(getGraphics()); -+ GR_Painter painter(pGr); - - if (style.m_t_linestyle == PP_PropertyMap::linestyle_none) - return; // do not draw diff --git a/abiword-extras-2.6.0-destdir.patch b/abiword-extras-2.6.0-destdir.patch deleted file mode 100644 index e822b17..0000000 --- a/abiword-extras-2.6.0-destdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -u -r abiword-extras-2.6.0.orig/clipart/Makefile.am abiword-extras-2.6.0/clipart/Makefile.am ---- abiword-extras-2.6.0.orig/clipart/Makefile.am 2008-03-18 23:18:48.000000000 +0100 -+++ abiword-extras-2.6.0/clipart/Makefile.am 2008-03-26 13:43:30.000000000 +0100 -@@ -1,5 +1,5 @@ - --clipartdir = $(DESTDIR)/$(ABIWORD_EXTRAS_PKGDATADIR)/clipart -+clipartdir = $(ABIWORD_EXTRAS_PKGDATADIR)/clipart - clipart_DATA = \ - book.png \ - chip.png \ -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-26 13:43:43.000000000 +0100 -@@ -1,5 +1,5 @@ - --dictionarydir = $(DESTDIR)/$(ABIWORD_EXTRAS_PKGDATADIR)/dictionary -+dictionarydir = $(ABIWORD_EXTRAS_PKGDATADIR)/dictionary - - if BIGENDIAN - hash = BigEndian32.american.hash -diff -u -r abiword-extras-2.6.0.orig/templates/Makefile.am abiword-extras-2.6.0/templates/Makefile.am ---- abiword-extras-2.6.0.orig/templates/Makefile.am 2008-03-18 23:18:49.000000000 +0100 -+++ abiword-extras-2.6.0/templates/Makefile.am 2008-03-26 13:43:51.000000000 +0100 -@@ -1,5 +1,5 @@ - --templatesdir = $(DESTDIR)/$(ABIWORD_EXTRAS_PKGDATADIR)/templates -+templatesdir = $(ABIWORD_EXTRAS_PKGDATADIR)/templates - templates_DATA = \ - A4.awt \ - Business-Letter.awt \ diff --git a/abiword-plugins-2.6.0-no-libboost-thread.patch b/abiword-plugins-2.6.0-no-libboost-thread.patch deleted file mode 100644 index 34d1aea..0000000 --- a/abiword-plugins-2.6.0-no-libboost-thread.patch +++ /dev/null @@ -1,214 +0,0 @@ -diff -N -u -r abiword-plugins-2.6.0.orig/tools/abicollab/backends/tcp/xp/IOClientHandler.h abiword-plugins-2.6.0/tools/abicollab/backends/tcp/xp/IOClientHandler.h ---- abiword-plugins-2.6.0.orig/tools/abicollab/backends/tcp/xp/IOClientHandler.h 2008-03-18 23:18:08.000000000 +0100 -+++ abiword-plugins-2.6.0/tools/abicollab/backends/tcp/xp/IOClientHandler.h 2008-03-29 01:53:52.000000000 +0100 -@@ -20,7 +20,6 @@ - #define __IO_CLIENT_HANDLER__ - - #include --#include - #include - #include - -@@ -69,7 +68,7 @@ - UT_return_if_fail(work == NULL); - - work = new asio::io_service::work(io_service); -- thread = new boost::thread(IOServiceThread(io_service)); -+ thread = new asio::thread(IOServiceThread(io_service)); - - // TODO: catch exceptions - asio::ip::tcp::resolver::iterator iterator(resolver.resolve(query)); -@@ -79,7 +78,7 @@ - - private: - asio::io_service io_service; -- boost::thread* thread; -+ asio::thread* thread; - asio::io_service::work* work; - asio::ip::tcp::resolver resolver; - asio::ip::tcp::resolver::query query; -diff -N -u -r abiword-plugins-2.6.0.orig/tools/abicollab/backends/tcp/xp/IOServerHandler.h abiword-plugins-2.6.0/tools/abicollab/backends/tcp/xp/IOServerHandler.h ---- abiword-plugins-2.6.0.orig/tools/abicollab/backends/tcp/xp/IOServerHandler.h 2008-03-18 23:18:08.000000000 +0100 -+++ abiword-plugins-2.6.0/tools/abicollab/backends/tcp/xp/IOServerHandler.h 2008-03-29 01:53:52.000000000 +0100 -@@ -22,7 +22,6 @@ - #include "ut_debugmsg.h" - - #include --#include - #include - #include - -@@ -47,7 +46,7 @@ - { - work = new asio::io_service::work(io_service); - m_pAcceptor = new asio::ip::tcp::acceptor(io_service, endpoint); -- boost::thread thread(iot); -+ asio::thread thread(iot); - } - - virtual ~IOServerHandler() -diff -N -u -r abiword-plugins-2.6.0.orig/tools/abicollab/backends/tcp/xp/Session.h abiword-plugins-2.6.0/tools/abicollab/backends/tcp/xp/Session.h ---- abiword-plugins-2.6.0.orig/tools/abicollab/backends/tcp/xp/Session.h 2008-03-18 23:18:08.000000000 +0100 -+++ abiword-plugins-2.6.0/tools/abicollab/backends/tcp/xp/Session.h 2008-03-29 01:53:52.000000000 +0100 -@@ -20,6 +20,7 @@ - #define __SESSION__ - - #include -+#include - - class TCPAccountHandler; - -@@ -48,7 +49,7 @@ - void push(int size, char* data) - { - { -- boost::mutex::scoped_lock lock(queue_protector); -+ abicollab::scoped_lock lock(queue_protector); - incoming.push_back( std::pair(size, data) ); - } - signal(); -@@ -62,7 +63,7 @@ - if (incoming.size() == 0) - return false; - { -- boost::mutex::scoped_lock lock(queue_protector); -+ abicollab::scoped_lock lock(queue_protector); - std::pair p = incoming.front(); - size = p.first; - *data = p.second; -@@ -218,7 +219,7 @@ - } - - asio::ip::tcp::socket socket; -- boost::mutex queue_protector; -+ abicollab::mutex queue_protector; - std::deque< std::pair > incoming; - std::deque< std::pair > outgoing; - -diff -N -u -r abiword-plugins-2.6.0.orig/tools/abicollab/backends/xp/lock.h abiword-plugins-2.6.0/tools/abicollab/backends/xp/lock.h ---- abiword-plugins-2.6.0.orig/tools/abicollab/backends/xp/lock.h 1970-01-01 01:00:00.000000000 +0100 -+++ abiword-plugins-2.6.0/tools/abicollab/backends/xp/lock.h 2008-03-29 01:53:52.000000000 +0100 -@@ -0,0 +1,94 @@ -+/* Copyright (C) 2008 by Marc Maurer -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+ -+#ifndef WIN32 -+#include -+#endif -+ -+namespace abicollab -+{ -+ -+class scoped_lock; -+ -+class mutex -+{ -+friend class scoped_lock; -+ -+public: -+ mutex() -+ { -+#ifdef WIN32 -+ repr = CreateMutex(0, FALSE, 0); -+#else -+ pthread_mutex_init(&repr, NULL); -+#endif -+ } -+ -+ ~mutex() -+ { -+#ifdef WIN32 -+ CloseHandle(repr); -+#else -+ pthread_mutex_destroy(&repr); -+#endif -+ } -+ -+private: -+ // we are noncopyable -+ mutex( const mutex& ); -+ const mutex& operator=( const mutex& ); -+ -+#ifdef WIN32 -+ HANDLE repr; -+#else -+ pthread_mutex_t repr; -+#endif -+}; -+ -+class scoped_lock -+{ -+public: -+ scoped_lock(mutex& mutex) -+ : m_mutex(mutex) -+ { -+#ifdef WIN32 -+ WaitForSingleObject(m_mutex.repr, INFINITE); -+#else -+ pthread_mutex_lock(&m_mutex.repr); -+#endif -+ } -+ -+ ~scoped_lock() -+ { -+#ifdef WIN32 -+ ReleaseMutex(m_mutex.repr); -+#else -+ pthread_mutex_unlock(&m_mutex.repr); -+#endif -+ } -+ -+private: -+ // we are noncopyable -+ scoped_lock( const scoped_lock& ); -+ const scoped_lock& operator=( const scoped_lock& ); -+ -+ mutex& m_mutex; -+}; -+ -+} -+ -diff -N -u -r abiword-plugins-2.6.0.orig/tools/abicollab/plugin.m4 abiword-plugins-2.6.0/tools/abicollab/plugin.m4 ---- abiword-plugins-2.6.0.orig/tools/abicollab/plugin.m4 2008-03-18 23:18:08.000000000 +0100 -+++ abiword-plugins-2.6.0/tools/abicollab/plugin.m4 2008-03-29 01:53:52.000000000 +0100 -@@ -75,7 +75,6 @@ - - # check for various boost libs - AX_BOOST_BASE([1.33.1]) --AX_BOOST_THREAD - - # check for asio - AC_LANG_PUSH(C++) -@@ -134,7 +133,7 @@ - ]) - if test "x$abicollab_handler_tcp" = "xyes" ; then - ABICOLLAB_TCP_CPPFLAGS="-DABICOLLAB_HANDLER_TCP $ABICOLLAB_ASIO_CPPFLAGS" -- ABICOLLAB_TCP_LIBS="$BOOST_THREAD_LIB" -+ ABICOLLAB_TCP_LIBS="-lpthread" - fi - CPPFLAGS="$_abi_cppflags_save" - LDFLAGS="$_abi_ldflags_save" -@@ -193,7 +192,7 @@ - ]) - if test "x$abicollab_handler_service" = "xyes" ; then - ABICOLLAB_SERVICE_CPPFLAGS="-DABICOLLAB_HANDLER_SERVICE $ABICOLLAB_ASIO_CPPFLAGS" -- ABICOLLAB_SERVICE_LIBS="$BOOST_THREAD_LIB" -+ ABICOLLAB_SERVICE_LIBS="-lpthread" - fi - AC_SUBST(ABICOLLAB_SERVICE_CPPFLAGS) - AC_SUBST(ABICOLLAB_SERVICE_LIBS) diff --git a/abiword-plugins-2.6.0-regression.patch b/abiword-plugins-2.6.0-regression.patch deleted file mode 100644 index 97282b7..0000000 --- a/abiword-plugins-2.6.0-regression.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r abiword-plugins-2.6.0.orig/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp abiword-plugins-2.6.0/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp ---- abiword-plugins-2.6.0.orig/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp 2008-03-18 23:18:06.000000000 +0100 -+++ abiword-plugins-2.6.0/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp 2008-03-25 21:22:16.000000000 +0100 -@@ -19,6 +19,7 @@ - */ - - #include -+#include - - #include "ut_debugmsg.h" - #include diff --git a/abiword-plugins-2.6.0-xmpp.patch b/abiword-plugins-2.6.0-xmpp.patch deleted file mode 100644 index 8c28dbd..0000000 --- a/abiword-plugins-2.6.0-xmpp.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r abiword-plugins-2.6.0.orig/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h abiword-plugins-2.6.0/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h ---- abiword-plugins-2.6.0.orig/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h 2008-03-18 23:18:07.000000000 +0100 -+++ abiword-plugins-2.6.0/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h 2008-03-25 20:40:10.000000000 +0100 -@@ -21,6 +21,7 @@ - #ifndef __XMPPACCOUNTHANDLER__ - #define __XMPPACCOUNTHANDLER__ - -+#include - #include - #include - diff --git a/abiword.spec b/abiword.spec index 20f9eba..ccbf0f2 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,11 +1,11 @@ %define majorversion 2 %define minorversion 6 -%define microversion 0 +%define microversion 1 Summary: The AbiWord word processor Name: abiword -Version: 2.6.0 -Release: 6%{?dist} +Version: 2.6.1 +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -14,7 +14,6 @@ Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-plugin 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 @@ -51,12 +50,6 @@ Patch0: abiword-2.6.0-windowshelppaths.patch Patch1: abiword-2.6.0-desktop.patch Patch2: abiword-2.6.0-boolean.patch Patch3: abiword-plugins-2.6.0-boolean.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-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, @@ -69,19 +62,13 @@ while still remaining lean. %if 0%{?fedora} >= 9 %patch2 -p1 -b .boolean %endif -%patch8 -p1 -b .textbox # setup abiword-plugins %setup -q -T -b 1 -n abiword-plugins-%{version} %patch3 -p1 -b .boolean -%patch5 -p1 -b .xmpp -%patch6 -p1 -b .regression -%patch10 -p1 -b .no-libboost-thread # setup abiword extras %setup -q -T -b 2 -n abiword-extras-%{version} -%patch7 -p1 -b .destdir -%patch9 -p1 -b .nohash # setup abiword documentation %setup -q -T -b 3 -n abiword-docs-%{version} @@ -96,10 +83,7 @@ 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 -cp %{SOURCE12} $RPM_BUILD_DIR/abiword-plugins-%{version} -./nextgen.sh -%configure --disable-gda --disable-gremlin --disable-abicapi --disable-presentation --with-abiword=../abiword-%{version} +%configure --disable-gda --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 @@ -187,8 +171,12 @@ update-desktop-database %{_datadir}/applications %{_datadir}/icons/*png %ghost %{_includedir}/%{name}-%{majorversion}.%{minorversion} %ghost %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc +%ghost %{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml %changelog +* Sun Apr 06 2008 Marc Maurer - 1:2.6.1-1 +- New upstream release + * Sat Mar 29 2008 Marc Maurer - 1:2.6.0-6 - Don't forget to cvs add nextgen.sh diff --git a/nextgen.sh b/nextgen.sh deleted file mode 100755 index c311922..0000000 --- a/nextgen.sh +++ /dev/null @@ -1,600 +0,0 @@ -#!/bin/sh -# Copyright (C) 2001-2002 Francis James Franklin -# Copyright (C) 2001-2002 AbiSource, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -rm -rf autom4te.cache - -abi_version=2.6.0 - -# abi_plugins is the list of subdirectories that are plugins -# The definition of a plugin is a directory containing a file called "plugin.m4". -# -abi_plugins= - -# abi_subdirs is a list of all directories in the current directory that are plugins or -# which have plugins in subdirectories, i.e., those directories into which make should -# recurse... -# -abi_subdirs= - -# abi_recurse is a subset of abi_subdirs which excludes plugins -# -abi_recurse= - -# abi_local is a subset of abi_subdirs which includes only plugins -# -abi_local= - -# abi_makefiles is the list of makefiles that configure must create -# -abi_makefiles= - -# abi_configs is the list of plugins that autoconf should scan -# -abi_configs= - -# abi_files is the list of files that plugins need configure to create -# -abi_files= - -if test "x$CONFIG_SHELL" = "x"; then - CONFIG_SHELL=/bin/sh - export CONFIG_SHELL -fi - -abi_mode=abi_build - -# option to append plugin.m4 to $abi_topdir/acinclude.m4 -# -abi_m4_append="" - -# option to list files plugins require to be configured -# -abi_list_files="" - -# option to echo plugin descriptions and defaults -# -abi_script_defaults="" - -# option to echo configure plugin options -# -abi_script_options="" - -# option to echo spec's plugin options -# -abi_spec_options="" - -# option to echo spec's configure options -# -abi_spec_configs="" - -# option to echo spec's summary -# -abi_spec_summary="" - -# Parse our command line options once, thoroughly. -while test "$#" -gt 0 -do - arg="$1" - shift - - case $arg in - --query) - abi_mode=abi_query - ;; - --config) - abi_mode=abi_config - ;; - --script) - abi_mode=abi_script - ;; - --spec) - abi_mode=abi_spec - ;; - --m4-append) - abi_m4_append="--m4-append" - ;; - --list-files) - abi_list_files="--list-files" - ;; - --script-defaults) - abi_script_defaults="--script-defaults" - ;; - --script-options) - abi_script_options="--script-options" - ;; - --spec-options) - abi_spec_options="--spec-options" - ;; - --spec-configs) - abi_spec_configs="--spec-configs" - ;; - --spec-summary) - abi_spec_summary="--spec-summary" - ;; - --help|-h) - echo "Usage:" - echo " --script generate wrapper-script for configure" - echo " --spec generate spec templates" - echo " --query list plugin subdirs" - echo " -h, --help print this help and exit" - exit 1 - ;; - *) - echo 'Option `'$arg"' not recognized. Try --help for more information." - exit 1 - ;; - esac -done - -if test "x$abi_topdir" = "x"; then - abi_topdir=`pwd` - export abi_topdir - if test $abi_mode = abi_build; then - abi_mode=abi_all - echo "Searching for AbiWord plugins. Please wait..." - fi -fi -if test "x$abi_dir" = "x"; then - abi_dir=. - abi_am=abi_ -else - abi_am=abi_`echo $abi_dir | sed 's@/@_@g'` -fi - -# Find plugins -# -_abi_dir=$abi_dir -for i in *; do - if test -d $i; then - if test -r $i/plugin.m4; then - # Found a plugin! - abi_plugins="$abi_plugins $i" - abi_subdirs="$abi_subdirs $i" - abi_local="$abi_local $i" - if test "x$abi_list_files" != "x"; then - . $i/plugin.m4 - for j in $abi_plugin_files; do - abi_files="$abi_files $i/$j" - done - fi - else - abi_subquery=`(cd $i > /dev/null && $CONFIG_SHELL $abi_topdir/nextgen.sh --query $abi_list_files)` - if test "x$abi_subquery" != "x"; then - for j in $abi_subquery; do - abi_plugins="$abi_plugins $i/$j" - if test "x$abi_list_files" != "x"; then - abi_files="$abi_files $i/$j" - fi - done - abi_subdirs="$abi_subdirs $i" - abi_recurse="$abi_recurse $i" - if test $abi_mode = abi_config; then - if test $_abi_dir = .; then - abi_dir=$i - else - abi_dir=$_abi_dir/$i - fi - export abi_dir - (cd $i > /dev/null && $CONFIG_SHELL $abi_topdir/nextgen.sh --config $abi_m4_append $abi_script_defaults $abi_script_options $abi_spec_options $abi_spec_configs $abi_spec_summary) - fi - fi - fi - fi -done -abi_dir=$_abi_dir - -if test $abi_mode = abi_script; then - echo '#!/bin/sh' - echo '# This script auto-generated by abiword-plugins/nextgen.sh' - echo '' - echo '# Add any --with-* options to config_opts here:' - echo '# ' - echo 'config_opts="--disable-all"' - echo '' - echo '# --------------------------------------------------------- #' - echo '' - ($CONFIG_SHELL $abi_topdir/nextgen.sh --config --script-defaults) - echo '' - echo '# ---------------- Don't edit this section ---------------- #' - echo '' - ($CONFIG_SHELL $abi_topdir/nextgen.sh --config --script-options) - echo '' - echo '# --------------------------------------------------------- #' - echo '' - echo $CONFIG_SHELL' ./configure $config_opts' - - # The rest is build stuff, so quit here. - # - exit 0 -elif test $abi_mode = abi_spec; then - echo '# PLUGIN OPTIONS: 1 for yes, 0 for no' - ($CONFIG_SHELL $abi_topdir/nextgen.sh --config --spec-options) - echo '' - ($CONFIG_SHELL $abi_topdir/nextgen.sh --config --spec-configs) - echo '' - ($CONFIG_SHELL $abi_topdir/nextgen.sh --config --spec-summary) - echo '' - configure_line='./configure --prefix=$RPM_BUILD_ROOT%{ABIPREFIX}/AbiSuite --disable-all' - for i in $abi_plugins; do - configure_line="$configure_line %{plugin_`basename $i`}" - done - echo $configure_line - - # The rest is build stuff, so quit here. - # - exit 0 -elif test $abi_mode = abi_config; then - if test "x$abi_local" != "x"; then - if test "x$abi_script_defaults" != "x"; then - for i in $abi_local; do - . $i/plugin.m4 - echo '# '$i': '$abi_plugin_desc - echo '# ' - if test "x$abi_plugin_enable" = "xyes"; then - echo 'enable_'`echo $i | sed 's/-/_/g'`'=yes' - else - echo 'enable_'`echo $i | sed 's/-/_/g'`'=no' - fi - echo '' - done - elif test "x$abi_script_options" != "x"; then echo "" - for i in $abi_local; do - echo 'if test "x$enable_'`echo $i | sed 's/-/_/g'`'" = "xyes"; then' - echo ' config_opts="$config_opts --enable-'$i'"' - echo 'else' - echo ' config_opts="$config_opts --disable-'$i'"' - echo 'fi' - done - elif test "x$abi_spec_options" != "x"; then echo "" - for i in $abi_local; do - . $i/plugin.m4 - if test "x$abi_plugin_enable" = "xyes"; then - echo '%define enable_'$i' 1' - else - echo '%define enable_'$i' 0' - fi - done - elif test "x$abi_spec_configs" != "x"; then echo "" - for i in $abi_local; do - echo '%if %{enable_'$i'}' - echo '%define plugin_'$i' --enable-'$i - echo '%else' - echo '%define plugin_'$i' --disable-'$i - echo '%endif' - echo '' - done - elif test "x$abi_spec_summary" != "x"; then echo "" - for i in $abi_local; do - abi_plugin_requires="" - abi_plugin_buildreq="" - . $i/plugin.m4 - echo '%if %{enable_'$i'}' - echo '%package plugin-'$i - echo 'Summary: '$abi_plugin_desc - echo 'Group: Applications/Productivity' - if test "x$abi_plugin_requires" != "x"; then - echo 'Requires: '$abi_plugin_requires - else - echo 'Requires: abiword' - fi - if test "x$abi_plugin_buildreq" != "x"; then - echo 'BuildRequires: '$abi_plugin_buildreq - fi - echo '' - echo '%description plugin-'$i - echo $abi_plugin_desc - echo '%endif' - echo '' - done - else - echo "$abi_am=" - for i in $abi_local; do - echo 'abi_plugin_add=yes' - echo 'AC_ARG_ENABLE('$i',[ --disable-'$i'],[' - echo ' if test "x$enableval" = "xno"; then' - echo ' abi_plugin_add=no' - echo ' fi' - echo '],[ abi_plugin_add=$abi_plugin_opt' - echo '])' - echo 'AC_ARG_WITH('$i',[ --without-'$i'],[' - echo ' if test "x$withval" = "xno"; then' - echo ' abi_plugin_add=no' - echo ' else' - echo ' abi_plugin_add=yes' - echo ' fi' - echo '])' - - abi_plugin_macro_init="" - abi_plugin_macro_end="" - - . $i/plugin.m4 - - if test "$abi_plugin_macro_init" != ""; then - echo $abi_plugin_macro_init - fi - - echo 'if test $abi_plugin_add = yes; then' - echo ' abi_plugin_disable=no' - - if test "$abi_plugin_macro" != ""; then - if test "x$abi_m4_append" != "x"; then - cat $i/plugin.m4 >> $abi_topdir/acinclude.m4 - fi - echo ' '$abi_plugin_macro - fi - - echo ' if test $abi_plugin_disable = no; then' - echo ' '$abi_am'="$'$abi_am $i'"' - echo ' fi' - - echo 'fi' - - if test "$abi_plugin_macro_end" != ""; then - echo $abi_plugin_macro_end - fi - done - echo "AC_SUBST($abi_am)" - echo '' - fi - fi - - # The rest is build stuff, so quit here. - # - exit 0 -elif test $abi_mode = abi_query; then - if test "x$abi_list_files" != "x"; then - if test "x$abi_files" != "x"; then - for i in $abi_files; do - echo $i - done - fi - else - if test "x$abi_plugins" != "x"; then - for i in $abi_plugins; do - echo $i - done - fi - fi - - # The rest is build stuff, so quit here. - # - exit 0 -else - if test $abi_mode = abi_all; then - if test "x$abi_subdirs" = "x"; then - echo "Sorry. No AbiWord plugins found." - exit 0 - fi - if test -f "ac-helpers/abi-plugin-init.m4"; then - echo "Creating build system for AbiWord plugins" - else - echo "This script creates a build system for AbiWord plugins. It deletes and creates a number" - echo "of files, so it must be run from the top directory of the plugin source tree." - exit 1 - fi - else - if test "x$abi_subdirs" = "x"; then - echo "Glitch! Shouldn't be building when there are no subdirectories!" - exit 1 - fi - fi - - # Create GNUmakefile.am. - # - if test $abi_dir = .; then - abi_makefiles="GNUmakefile" - else - abi_makefiles="$abi_dir/GNUmakefile" - fi - rm -f GNUmakefile.am - echo "# autogenerated by nextgen.sh" > GNUmakefile.am - if test "x$abi_local" = "x"; then - echo "SUBDIRS = $abi_recurse" >> GNUmakefile.am - else - echo "SUBDIRS = @$abi_am@ $abi_recurse" >> GNUmakefile.am - fi - - echo "DIST_SUBDIRS = $abi_subdirs" >> GNUmakefile.am - - echo "DISTCLEANFILES = plugin.status" >> GNUmakefile.am - - echo "EXTRA_DIST = Makefile" >> GNUmakefile.am - - # and recurse into subdirectories... - # - _abi_dir=$abi_dir - for i in $abi_recurse; do - if test $_abi_dir = .; then - abi_dir=$i - else - abi_dir=$_abi_dir/$i - fi - export abi_dir - abi_subbuild=`(cd $i > /dev/null && $CONFIG_SHELL $abi_topdir/nextgen.sh)` - for j in $abi_subbuild; do - abi_makefiles="$abi_makefiles $j" - done - done - abi_dir=$_abi_dir - - # Standard build just creates GNUmakefile.am, so quit here. - # - if test $abi_mode = abi_build; then - for i in $abi_makefiles; do - echo $i - done - exit 0 - fi -fi - -# Create configure.ac -# -rm -f configure.ac -cat > configure.ac << EOF -AC_INIT([abiword-plugins], $abi_version, [http://bugzilla.abisource.com/]) -AC_CONFIG_SRCDIR([ac-helpers/abi-plugin-init.m4]) - -dnl First of all AbiWord plugin macros: -dnl -ABI_PLUGIN_INIT($abi_version) -ABI_PLUGIN_CONFIG - -# Checks for programs. -AC_PROG_CC -AC_PROG_CPP -AC_PROG_CXX -AC_PROG_AWK -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET - -AM_INIT_AUTOMAKE - -AC_DISABLE_STATIC -AC_PROG_LIBTOOL - -AC_C_CONST -AC_C_INLINE - -dnl Configure plugin sources -dnl -dnl AC_CONFIG_SUBDIRS($abi_configs) - -abi_plugin_extra= -abi_plugin_opt=yes -AC_ARG_ENABLE(all,[ --disable-all disable all plugins by default],[ - if test "x\$enableval" = "xno"; then - abi_plugin_opt=no - fi -]) - -EOF -rm -f $abi_topdir/acinclude.m4 -($CONFIG_SHELL $abi_topdir/nextgen.sh --config --m4-append) >> configure.ac -cat >> configure.ac << EOF -AC_CONFIG_FILES([ -$abi_makefiles -]) -AC_CONFIG_FILES([ -EOF -($CONFIG_SHELL $abi_topdir/nextgen.sh --query --list-files) | grep "^tools/" >> configure.ac -cat >> configure.ac << EOF -]) -AC_CONFIG_FILES([ -EOF -($CONFIG_SHELL $abi_topdir/nextgen.sh --query --list-files) | grep "^wp/impexp/" | grep -v "/graphics/" >> configure.ac -cat >> configure.ac << EOF -]) -AC_CONFIG_FILES([ -EOF -($CONFIG_SHELL $abi_topdir/nextgen.sh --query --list-files) | grep "^wp/impexp/" | grep "/graphics/" >> configure.ac -cat >> configure.ac << EOF -]) -AC_CONFIG_FILES([ -EOF -($CONFIG_SHELL $abi_topdir/nextgen.sh --query --list-files) | grep -v "^wp/impexp/" | grep -v "^tools/" >> configure.ac -cat >> configure.ac << EOF -]) -AC_OUTPUT - -if test -f plugin.status; then - echo "" - echo "Plugin reports:" - echo "" - cat plugin.status - echo "" -fi -EOF - -# And, finally, call in the big boys... -# -rm -f autogen.out -rm -f autogen.err - -if test "x`uname`" = "xDarwin"; then - echo "Running glibtoolize -f -c" - (glibtoolize -f -c >> $abi_topdir/autogen.out 2>> $abi_topdir/autogen.err) || { - echo "glibtoolize failed! Unable to continue." - exit 1 - } -else - echo "Running libtoolize -f -c" - (libtoolize -f -c >> $abi_topdir/autogen.out 2>> $abi_topdir/autogen.err) || { - echo "libtoolize failed! Unable to continue." - exit 1 - } -fi - -echo "Running aclocal -I ac-helpers $ACLOCAL_FLAGS" -(aclocal -I ac-helpers $ACLOCAL_FLAGS >> $abi_topdir/autogen.out 2>> $abi_topdir/autogen.err) || { - echo "aclocal failed! Unable to continue." - exit 1 -} - -if test -f autom4te.cache/requests; then - echo "Checking for PKG_CHECK_MODULES in autom4te.cache/requests ..." - pkgcheckdef=`grep PKG_CHECK_MODULES autom4te.cache/requests` -else - echo "Checking for PKG_CHECK_MODULES in aclocal.m4 ..." - pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN` -fi - -if test "x$pkgcheckdef" = "x"; then - echo "Running aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS" - (aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS >> $abi_topdir/autogen.out 2>> $abi_topdir/autogen.err) || { - echo "aclocal failed! Unable to continue." - exit 1 - } - if test -f autom4te.cache/requests; then - echo "Checking for PKG_CHECK_MODULES in autom4te.cache/requests ..." - pkgcheckdef=`grep PKG_CHECK_MODULES autom4te.cache/requests` - else - echo "Checking for PKG_CHECK_MODULES in aclocal.m4 ..." - pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN` - fi - if test "x$pkgcheckdef" = "x"; then - echo "" - echo "error: PKG_CHECK_MODULES isn't defined" - echo "" - echo " Either pkg.m4 wasn't in aclocal's search path or pkgconfig" - echo " (or pkgconfig-devel?) isn't installed." - echo "" - echo " If pkg-config is installed in then re-run nextgen.sh:" - echo "" - echo " ACLOCAL_FLAGS=\"-I /share/aclocal\" ./nextgen.sh" - echo "" - exit - fi -fi - -echo "Running automake -a -c --foreign" -(automake -a -c --foreign >> $abi_topdir/autogen.out 2>> $abi_topdir/autogen.err) || { - echo ">automake failed! Oh, well, trying again (you never know): automake -a --foreign" - (automake -a --foreign >> $abi_topdir/autogen.out 2>> $abi_topdir/autogen.err) || { - echo ">automake failed again! Damn. Look, I'll try autoconf anyway, but don't blame me" - echo " if it all goes horribly wrong. (This ain't easy!) Here goes:" - } -} - -echo "Running autoconf" -(autoconf >> $abi_topdir/autogen.out 2>> $abi_topdir/autogen.err) || { - echo ">autoconf failed! Sorry - I'm unable to continue." - exit 1 -} - -rm -rf autom4ate.cache diff --git a/sources b/sources index 86c0476..005eac6 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -d627a5d1061160c683f2257da498355b abiword-2.6.0.tar.gz -ebdc165d1b6c3c69f11148cf7841f257 abiword-plugins-2.6.0.tar.gz -3daf3cbd59621fab0326512bf663d2d9 abiword-extras-2.6.0.tar.gz -7403e74ee977e16fcaa7bcb24be16d23 abiword-docs-2.6.0.tar.gz +01450e5389fdb7d36bc37c6d17091e5c abiword-2.6.1.tar.gz +1e2fc2a4d88d5f7408ada0607d9ae62a abiword-docs-2.6.1.tar.gz +589b34f80746883f46a9a77956400794 abiword-extras-2.6.1.tar.gz +7e5bd0eb1777bd5420ae1d446d3b25ca abiword-plugins-2.6.1.tar.gz